From 76d42b4fb2b0bc068c115bf9737aa221c1360be2 Mon Sep 17 00:00:00 2001
From: zhangyahui <yhzhang@aidlab.hk>
Date: Tue, 31 Mar 2026 15:53:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=B0=8F=E8=B1=A1=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/closeAssistant.svg           |  3 +++
 src/components/Assistant/assistant.vue        | 21 ++++++++++++-------
 .../Canvas/FlowCanvas/flow-canvas.vue         |  2 --
 .../Canvas/components/fullscreen-dialog.vue   |  2 ++
 src/views/home/agent/components/Agent.vue     | 10 +--------
 5 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/icons/closeAssistant.svg

diff --git a/src/assets/icons/closeAssistant.svg b/src/assets/icons/closeAssistant.svg
new file mode 100644
index 0000000..8c57f20
--- /dev/null
+++ b/src/assets/icons/closeAssistant.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.263992 0.263993C0.615983 -0.0879974 1.18667 -0.0879971 1.53866 0.263993L6 4.72533L10.4613 0.263993C10.8133 -0.087998 11.384 -0.0879971 11.736 0.263993C12.088 0.615983 12.088 1.18667 11.736 1.53866L7.27467 6L11.736 10.4613C12.088 10.8133 12.088 11.384 11.736 11.736C11.384 12.088 10.8133 12.088 10.4613 11.736L6 7.27467L1.53866 11.736C1.18667 12.088 0.615983 12.088 0.263992 11.736C-0.0879975 11.384 -0.0879975 10.8133 0.263992 10.4613L4.72533 6L0.263992 1.53866C-0.0879975 1.18667 -0.0879975 0.615983 0.263992 0.263993Z" fill="#D58C4D"/>
+</svg>
diff --git a/src/components/Assistant/assistant.vue b/src/components/Assistant/assistant.vue
index 386e134..a2c100f 100644
--- a/src/components/Assistant/assistant.vue
+++ b/src/components/Assistant/assistant.vue
@@ -23,7 +23,13 @@
 			@mousedown="handleContainerMouseDown"
 		>
 			<div class="assistant-header-title">AI Assistant</div>
-			<SvgIcon name="canvas-assistant-menu" class="menu-icon" color="#D58C4D" />
+			<SvgIcon
+				name="closeAssistant"
+				class="menu-icon"
+				size="12"
+				color="#D58C4D"
+				@click="showAssistant = false"
+			/>
 		</div>
 		<div class="assistant-body flex-1">
 			<List :messageList="messageList" />
@@ -81,7 +87,7 @@
 	)
 
 	const listenAssistantPushChat = (message: Message) => {
-		// console.log('有新消息--');
+		console.log('有新消息--');
 
 		const exist = messageList.value.find((item: Message) => item.nodeType === message.nodeType)
 		if (!exist) {
@@ -98,10 +104,10 @@
 <style lang="less" scoped>
 	.trigger {
 		position: absolute;
-		right: 0;
+		right: 3rem;
+		top: 10.3rem;
 		width: 5rem;
 		height: 5rem;
-		bottom: 50%;
 		background-color: #fff;
 		border-radius: 50%;
 		cursor: grab;
@@ -134,8 +140,8 @@
 
 	.assistant-container {
 		position: absolute;
-		right: 6.2rem;
-		bottom: 13.2rem;
+		right: 3rem;
+		top: 16.6rem;
 		width: 46.69rem;
 		height: 56.6rem;
 		flex-shrink: 0;
@@ -169,7 +175,8 @@
 			}
 
 			.menu-icon {
-				width: 1.8rem;
+				cursor: pointer;
+				width: initial;
 			}
 		}
 
diff --git a/src/components/Canvas/FlowCanvas/flow-canvas.vue b/src/components/Canvas/FlowCanvas/flow-canvas.vue
index 3c17154..5f219eb 100644
--- a/src/components/Canvas/FlowCanvas/flow-canvas.vue
+++ b/src/components/Canvas/FlowCanvas/flow-canvas.vue
@@ -62,7 +62,6 @@
 			<threeModel :currentData="currentData" />
 		</template>
 	</baseModal>
-	<Assistant />
 </template>
 
 <script setup lang="ts">
@@ -70,7 +69,6 @@
 	import { computed, ref, watch, onMounted, nextTick, provide, onBeforeUnmount } from 'vue'
 	import { useLayout } from '@/utils/treeDiagram'
 	import { NODE_TYPE, NODE_COMPONENT } from './tools/index.d'
-	import Assistant from '@/components/Assistant/assistant.vue'
 	// 组件
 	import headerTools from './components/header-tools.vue'
 	import zoom from '../components/zoom.vue'
diff --git a/src/components/Canvas/components/fullscreen-dialog.vue b/src/components/Canvas/components/fullscreen-dialog.vue
index f1116dc..862c347 100644
--- a/src/components/Canvas/components/fullscreen-dialog.vue
+++ b/src/components/Canvas/components/fullscreen-dialog.vue
@@ -11,6 +11,7 @@
 	>
 		<slot></slot>
 		<my-info />
+		<Assistant />
 		<div class="close-btn" @click="close">
 			<svg-icon name="back-white" color="#fff" size="18" />
 		</div>
@@ -20,6 +21,7 @@
 <script setup lang="ts">
 	import { ref, watch } from 'vue'
 	import MyInfo from '@/components/MyInfo.vue'
+	import Assistant from '@/components/Assistant/assistant.vue'
 	const props = defineProps({
 		modelValue: { default: false, type: Boolean },
 		transitionTime: { default: 300, type: Number },
diff --git a/src/views/home/agent/components/Agent.vue b/src/views/home/agent/components/Agent.vue
index 482f141..2bb695e 100644
--- a/src/views/home/agent/components/Agent.vue
+++ b/src/views/home/agent/components/Agent.vue
@@ -345,11 +345,7 @@
 
 							if (hasSketch) {
 								hasSketchEvent = true
-								console.log('当前sketchList',sketchList.value);
-								console.log('当前收到的sketch',jsonData,typeof jsonData);
-								// Object.keys(jsonData).forEach((key) => {
-								// 	sketchList.value.push(jsonData[key])
-								// })
+
 								Object.keys(jsonData).forEach((key) => {
 									if (!sketchList.value.some((item) => item[key])) {
 										sketchList.value.push({
@@ -357,9 +353,6 @@
 										})
 									}
 								})
-								// sketchList.value.push({
-								// 	[Object.keys(jsonData)[0]]: jsonData[Object.keys(jsonData)[0]]
-								// })
 								// 通知 Preview 有新 sketch 正在加载，传入 sketch 索引
 								MyEvent.emit('loading-sketch', sketchList.value.length - 1)
 								MyEvent.emit('OpenSketch')
@@ -398,7 +391,6 @@
 						} catch (e) {
 							// 检查是否为纯文本 [DONE]
 							if (jsonText.trim() === '[DONE]') {
-
 								console.log('结束-----------------------')
 								aiMessage.text = contentBody
 								aiMessage.streaming = false

From 836fa1e4480844ba3dbe404c499fd853b49428e4 Mon Sep 17 00:00:00 2001
From: "X1627315083@163.com" <1627315083@qq.com>
Date: Tue, 31 Mar 2026 15:58:40 +0800
Subject: [PATCH 2/2] fix

---
 .../Canvas/FlowCanvas/components/nodes/result-image.vue       | 3 +--
 src/components/Canvas/FlowCanvas/manager/NodeManager.ts       | 1 +
 src/components/Canvas/FlowCanvas/manager/StateManager.ts      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue
index 842f3b2..82a74db 100644
--- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue
+++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue
@@ -17,7 +17,7 @@
 				<span class="icon" @click="onDownload(item)">
 					<svg-icon name="download" size="20" size-unit="px" />
 				</span>
-				<button class="edit" @click="onEdit(item)">
+				<button class="edit" @click="onEdit(item)" v-if="node.data.superiorNodeType !== NODE_DATATYPE.TO_3D_MODEL">
 					<span class="icon"><svg-icon name="edit" size="13" /></span>
 					<span class="text">Edit</span>
 				</button>
@@ -269,7 +269,6 @@
 				isActive: subordNodes.length == 0
 			}
 		})
-		stateManager.setActiveNodeID('')
 	}
 	document.addEventListener('mousedown', hideMenu)
 	onBeforeUnmount(() => {
diff --git a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts
index d975bb3..37f84d4 100644
--- a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts
+++ b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts
@@ -39,6 +39,7 @@ export class NodeManager {
 	/** 添加节点 */
 	addNode(node: any) {
 		this.stateManager.addNode(node)
+		this.stateManager.setActiveNodeID(node.id)
 	}
 
 	/** 创建节点 */
diff --git a/src/components/Canvas/FlowCanvas/manager/StateManager.ts b/src/components/Canvas/FlowCanvas/manager/StateManager.ts
index 3e4f763..0334718 100644
--- a/src/components/Canvas/FlowCanvas/manager/StateManager.ts
+++ b/src/components/Canvas/FlowCanvas/manager/StateManager.ts
@@ -17,9 +17,9 @@ const chatAssistant = {
 		content: t('flowCanvas.surfaceEditCanvasDesignAssistant'),
 		nodeType:NODE_DATATYPE.CANVAS_MODE,
 	},
-	[NODE_DATATYPE.SURFACE_EDIT]:{
+	[NODE_DATATYPE.Fast_MODE]:{
 		content: t('flowCanvas.surfaceEditAIDesignAssistant'),
-		nodeType:NODE_DATATYPE.SURFACE_EDIT,
+		nodeType:NODE_DATATYPE.Fast_MODE,
 	},
 	[NODE_DATATYPE.COLOR_PALETTE]:{
 		content: t('flowCanvas.colorPaletteDesignAssistant'),