Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/FiDA_Front

src/components/Canvas/DepthCanvas/components/depth-header-tools.vue

@@ -20,8 +20,9 @@
 					v-if="v.child"
 					class="child"
 					v-show="v.showChild"
-					:bind-id="v.name"
 					v-clidk-besides="() => (v.showChild = false)"
+					:bind-id="v.name"
+					:stop-besides="!v.showChild"
 				>
 					<div v-for="(v_, i_) in v.child" :key="i_" @click="onClickTool(v_, v)">
 						<span v-show="tool === v_.name" class="dui">

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/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/directives/clidk-besides.js

@@ -1,16 +1,18 @@
 // 点击外部区域触发事件
-// 用法：v-clidk-besides="() => {}"
 // 说明：点击外部区域触发事件，不包括点击元素本身
-// 注意：点击元素本身或者属性bind-id相同元素不会触发事件
+// 用法：v-clidk-besides="() => {}"
+// 属性：bind-id，点击元素的id，用于判断是否点击了元素本身
+// 属性：stop-besides="true"，"true"时候点击不触发事件
 export default {
 	name: 'clidk-besides',
 	mounted(el, binding) {
-		console.log("mounted", el, binding);
 		const call = binding.value
 		const id = el.getAttribute("bind-id");
 		window.addEventListener("touchstart", fun, true);
 		window.addEventListener("mousedown", fun, true);
+		el.clidkBesidesFun = fun
 		function fun(e) {
+			if (el.getAttribute("stop-besides") == "true") return
 			var k = true;
 			iterator(e.target);
 			if (k) call && call();
@@ -24,4 +26,8 @@ export default {
 			}
 		}
 	},
+	unmounted(el) {
+		window.removeEventListener("touchstart", el.clidkBesidesFun, true);
+		window.removeEventListener("mousedown", el.clidkBesidesFun, true);
+	}
 };