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

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;
 			}
 		}
 

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(() => {

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'

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)
 	}
 
 	/** 创建节点 */

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'),

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 },