Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/views/home/agent/components/Agent.vue

@@ -26,7 +26,7 @@
 	import Input from '../../components/Input.vue'
 	import { fetchAgentReply } from '@/api/agent'
 	import type { AgentParamsType } from '@/api/agent'
-	import { useUserInfoStore, useProjectStore, } from '@/stores'
+	import { useUserInfoStore, useProjectStore } from '@/stores'
 	import { useAgentStore } from '@/stores/agent'
 
 	const userStore = useUserInfoStore()
@@ -252,7 +252,7 @@
 						// console.log('dataLInes', dataLines)
 						if (isNodeIdEvent) {
 							params.versionID = dataLines[0]
-							projectStore.setProject({nodeId:dataLines[0]})
+							projectStore.setProject({ nodeId: dataLines[0] })
 						}
 
 						if (dataLines.length === 0) continue
@@ -367,31 +367,34 @@
 		const ancestorsList = []
 		if (ancestors) {
 			ancestors.forEach((item) => {
-				const list = item.dialogue.map((el, index) => {
-					if (el.image_url) {
-						imgList.push(el.image_url)
-					}
-					return {
-						...el,
-						text: el.content,
-						isUser: el.role === 'user',
-						id: index + 1
-					}
-				})
+				const list =
+					item.dialogue?.map((el, index) => {
+						if (el.image_url) {
+							imgList.push(el.image_url)
+						}
+						return {
+							...el,
+							text: el.content,
+							isUser: el.role === 'user',
+							id: index + 1
+						}
+					}) || []
 				ancestorsList.push(...list)
 			})
 		}
-		const currentList = current.dialogue.map((item, index) => {
-			if (item.image_url) {
-				imgList.push(item.image_url)
-			}
-			return {
-				...item,
-				text: item.content,
-				isUser: item.role === 'user',
-				id: index + 1 + ancestorsList.length
-			}
-		})
+		const currentList =
+			current?.dialogue?.map((item, index) => {
+				if (item.image_url) {
+					imgList.push(item.image_url)
+				}
+				return {
+					...item,
+					text: item.content,
+					isUser: item.role === 'user',
+					id: index + 1 + ancestorsList.length
+				}
+			}) || []
+
 		messageList.value = [...ancestorsList, ...currentList]
 		params.versionID = current.id
 		sketchList.value = imgList

src/views/home/agent/index.vue

@@ -49,7 +49,9 @@
 	const handleRestore = () => {
 		// agentRef.value?.inputRef?.addReportTag('Restore')
 		clearNodeChat({ projectId: projectStore.state.id, id: projectStore.state.nodeId }).then(
-			(res) => {}
+			(res) => {
+				agentRef.value.setChatInfo(res)
+			}
 		)
 	}
 	const handleSelectNode = () => {
@@ -64,11 +66,11 @@
 
 	const handleGetProjectInfoAndHistory = () => {
 		getProjectInfo({ id: route.params.id }).then((res) => {
-			if(res?.conversation)agentRef.value.setChatInfo(res.conversation)
+			if (res?.conversation) agentRef.value.setChatInfo(res.conversation)
 			let data = res?.project || res
-			if(data?.latestNodeId)data.nodeId = data.latestNodeId
+			if (data?.latestNodeId) data.nodeId = data.latestNodeId
 			projectStore.setProject({
-				...data,
+				...data
 			})
 		})
 	}