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

src/components/Canvas/FlowCanvas/components/nodes/result-image.vue

@@ -122,7 +122,7 @@
 		{ immediate: true }
 	)
 	const menus = ref([
-		{ label: 'Copy', tip: 'Ctrl+C', on: () => emit('copy-node', clickTaskId.value) },
+		{ label: 'Copy', tip: 'Ctrl+C', on: () => emit('copy-node') },
 		{
 			label: 'Delete',
 			tip: 'Del',
@@ -228,6 +228,7 @@
 					...options,
 				}
 				depthCanvasWorkbench(workbenchData)
+				depthCanvasClose()
 			},
 			onClose:depthCanvasClose 
 		}

src/components/Canvas/FlowCanvas/flow-canvas.vue

@@ -38,7 +38,7 @@
 						:data="node.data.data"
 						v-bind="node.data"
 						@delete-node="deleteNode(node.id)"
-						@copy-node="copyNode($event, node.id)"
+						@copy-node="copyNode(node.id)"
 						@update-data="(v) => (node.data.data = v)"
 						@bring-to-font="bringToFont(node.id)"
 						@send-to-back="sendToBack(node.id)"
@@ -179,8 +179,8 @@
 		nodeManager.deleteNode(id)
 	}
 	/** 复制节点 */
-	const copyNode = (clickTaskId, id) => {
-		nodeManager.copyNodeById(clickTaskId, id)
+	const copyNode = (id) => {
+		nodeManager.copyNodeById(id)
 	}
 	/** 节点zIndex设置最大 */
 	const bringToFont = (id) => {

src/components/Canvas/FlowCanvas/manager/NodeManager.ts

@@ -139,10 +139,9 @@ export class NodeManager {
 		return this.createNode(options_)
 	}
 
-	copyNodeById(clickTaskId:string, id: string) {
+	copyNodeById(id: string) {
 		const node = this.stateManager.getNodeById(id)
 		let copyNode = JSON.parse(JSON.stringify(node))
-		copyNode.data.data.imageProcessTasks = copyNode.data.data.imageProcessTasks.filter((item:any)=>item.taskId == clickTaskId)
 		const flowNode = this.stateManager.flowManager.getNodeById(id)
 		if (!node) return console.warn(`${id}找不到对应节点`)
 		if (node.data?.disableCopy) return console.warn(`${id}节点已禁用复制`)
@@ -156,6 +155,9 @@ export class NodeManager {
 		}
 		delete node_.data?.superiorID
 		delete node_.data?.disableDelete
+		node_.data.data.imageProcessTasks.forEach((item) => {
+			item.canvasId = null
+		})
 		this.stateManager.addNode(node_)
 	}
 	dispose() {}