From c7b62fdf88e29d363faaafa20eb093d97121cc77 Mon Sep 17 00:00:00 2001
From: "X1627315083@163.com" <1627315083@qq.com>
Date: Mon, 23 Mar 2026 14:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=B8=83=E6=B7=BB=E5=8A=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=92=8C=E9=80=89=E6=8B=A9=E8=8A=82=E7=82=B9=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E4=B8=AD=E5=90=8E=E5=B0=B1=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E7=94=9F=E6=88=90=E5=A4=9A=E5=BC=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Canvas/FlowCanvas/components/node-el.vue  | 57 +----------------
 .../components/nodes/cards/cards-select.vue   | 13 ++--
 .../components/nodes/cards/index.vue          |  1 -
 .../components/nodes/result-image.vue         | 63 ++++++++++++++++++-
 .../Canvas/FlowCanvas/manager/NodeManager.ts  | 14 +++--
 .../Canvas/FlowCanvas/manager/StateManager.ts |  5 +-
 .../agent/components/versionTree/index.vue    |  7 +--
 7 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/src/components/Canvas/FlowCanvas/components/node-el.vue b/src/components/Canvas/FlowCanvas/components/node-el.vue
index 16d7155..76f85c9 100644
--- a/src/components/Canvas/FlowCanvas/components/node-el.vue
+++ b/src/components/Canvas/FlowCanvas/components/node-el.vue
@@ -11,15 +11,12 @@
 		<div class="item" @mousedown="(e) => stateManager.setActiveNodeID(node.id)">
 			<slot></slot>
 		</div>
-		<div class="add" @mousedown.stop v-if="isAdd" @click="onAdd">
-			<svg-icon name="add" size="14" size-unit="px" />
-		</div>
 		<div class="mask" v-show="mask"></div>
 	</div>
 </template>
 <script lang="ts" setup>
 	import { Handle, Position } from '@vue-flow/core'
-	import { NODE_DATATYPE, NODE_DATATIER, NODE_TYPE } from '../tools/index.d'
+	import { NODE_DATATYPE, NODE_TYPE } from '../tools/index.d'
 	import { computed, ref, inject } from 'vue'
 	const handles = ref({
 		[NODE_TYPE.INPUT]: [{ id: 'Right', type: 'source', position: Position.Right }],
@@ -48,39 +45,6 @@
 			default: false
 		}
 	})
-	const stateManager = inject('stateManager') as any
-	const nodes = computed(() => props.stateManager.nodes.value)
-	const isSubord = computed(() => nodes.value.some((v) => v.data.superiorID === props.node.id))
-	const tier = computed(() => Number(props.node?.data?.tier || 0))
-	//只有3d模型才有三级菜单,目前三级菜单内容少直接禁用按钮
-	const isAdd3d = computed(() => (tier.value === 2 && props.node?.data?.superiorNodeType === NODE_DATATYPE.TO_3D_MODEL) || props.node?.data?.superiorNodeType !== NODE_DATATYPE.TO_3D_MODEL)
-	const isReturned = computed(() => {
-		return (
-			props.node.data.type == NODE_DATATYPE.RESULT_IMAGE &&
-			props.node.data.data.imageProcessTasks[0].status == 'RETURNED'
-		)
-	})
-	const isAdd = computed(
-		() =>
-			!isSubord.value &&
-			NODE_DATATYPE.RESULT_IMAGE === props.node.data.type &&
-			!(tier.value === NODE_DATATIER.TO_3VIEW) &&
-			isReturned.value && 
-			isAdd3d.value
-	)
-	const onAdd = () => {
-		const tier_ = tier.value + 1
-		// 从data中获取originalImage
-		let nodeData = props.node?.data?.data.imageProcessTasks.filter(
-			(v) => v.taskId === props.node?.data?.data.selectTaskId
-		)
-		const originalImage = nodeData[0]?.url
-		if (!originalImage) console.log('originalImage 找不到原始图片')
-		props.stateManager.nodeManager.createCardsSelect({
-			data: { tier: tier_, superiorID: props.node.id, originalImage }
-		})
-		stateManager.setActiveNodeID('')
-	}
 	const posCenter = computed(() => {
 		const arr = [NODE_DATATYPE.RESULT_IMAGE]
 		return arr.includes(props.node?.data?.type)
@@ -106,25 +70,6 @@
 		> .item {
 			position: relative;
 		}
-		> .add {
-			position: absolute;
-			width: 32px;
-			height: 32px;
-			border: 2px solid #fff;
-			top: var(--top);
-			right: -16px;
-			transform: translateY(-50%);
-			background-color: #ed8936;
-			border-radius: 50%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: #fff;
-			font-size: 25px;
-			box-shadow: 0 8px 20px 0 #71809633;
-			cursor: pointer;
-			z-index: 20;
-		}
 		&.center {
 			--top: 50%;
 		}
diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue
index b811b92..04ba1aa 100644
--- a/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue
+++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue
@@ -69,28 +69,31 @@
 	const onClickItem = (v) => {
 		const id = props.node.id
 		if (!id) return
-		stateManager.deleteNode(id)
-		console.log(props.node)
+		const superiorID = props.node.data.superiorID
 		if(v.secondaryMenu){
 			nodeManager.createCardsSelect({
 				data: { 
 					tier: props.node.data?.tier, 
-					superiorID: props.node.data?.superiorID, 
+					superiorID, 
+					isActive: props.node.data?.isActive,
 					originalImage: props.node.data?.originalImage,
-					secondaryMenu: v.secondaryMenu
+					secondaryMenu: v.secondaryMenu,
+					createIndexPosition: props.node.data.createIndexPosition,
 				}
 			})
 		}else{
-			const superiorID = props.node.data.superiorID
 			nodeManager.createCardNode({
 				data: {
 					tier: v.tier,
 					type: v.type,
 					superiorID,
+					isActive: props.node.data?.isActive,
+					createIndexPosition: props.node.data.createIndexPosition,
 					originalImage: props.node.data?.originalImage,
 				}
 			})
 		}
+		stateManager.deleteNode(id)
 	}
 
 	defineExpose({})
diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue
index 5957efa..0010e63 100644
--- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue
+++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue
@@ -143,7 +143,6 @@
 	
 	const onGenerateClick = async () => {
 		const data = componentRef.value?.getApiData?.() || {}
-		const subordNode = stateManager.getSubordNodeById(attrs.node.id)
 		const subordNodes = stateManager.getSubordNodes(attrs.node.id)
 		emit('update-data', componentRef.value?.data)
 		if(!attrs.node?.data?.originalImage)console.log('originalImage 找不到原始图片')
diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue
index 75c304c..4579c29 100644
--- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue
+++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue
@@ -53,6 +53,9 @@
 				</div>
 			</div>
 		</div>
+		<div class="add" @mousedown.stop v-if="isAdd" @click="onAdd">
+			<svg-icon name="add" size="14" size-unit="px" />
+		</div>
 	 </div>
 </template>
 
@@ -61,7 +64,7 @@
 	import { downloadImage } from '../../../tools/tools'
 	import { reactive, ref, onBeforeUnmount, useAttrs, inject, watch, computed, onMounted } from 'vue'
 	import HighlightAdmin from '@/components/highlightAdmin.vue'
-	import { NODE_DATATYPE } from '../../tools/index.d'
+	import { NODE_DATATIER, NODE_DATATYPE } from '../../tools/index.d'
 	const openImagePreview = inject('openImagePreview') as (url: string) => void
 	const openThreeModelPreview = inject('openThreeModelPreview') as (url: string) => void
 	const props = defineProps({
@@ -229,6 +232,45 @@
 		eventManager.removeEvents()
 		myEvent.emit('openDepthCanvas', data)
 	}
+
+	const isSubord = computed(() => props.node.id == stateManager.activeNodeID.value)
+	const tier = computed(() => Number(props.node?.data?.tier || 0))
+	//只有3d模型才有三级菜单,目前三级菜单内容少直接禁用按钮
+	const isAdd3d = computed(() => (tier.value === 2 && props.node?.data?.superiorNodeType === NODE_DATATYPE.TO_3D_MODEL) || props.node?.data?.superiorNodeType !== NODE_DATATYPE.TO_3D_MODEL)
+	const isReturned = computed(() => {
+		return (
+			props.node.data.type == NODE_DATATYPE.RESULT_IMAGE &&
+			props.node.data.data.imageProcessTasks[0].status == 'RETURNED'
+		)
+	})
+	const isAdd = computed(
+		() =>
+			NODE_DATATYPE.RESULT_IMAGE === props.node.data.type &&
+			!(tier.value === NODE_DATATIER.TO_3VIEW) &&
+			isReturned.value && 
+			isAdd3d.value && 
+			isSubord.value
+	)
+	const onAdd = () => {
+		const tier_ = tier.value + 1
+		// 从data中获取originalImage
+		let nodeData = props.node?.data?.data.imageProcessTasks.filter(
+			(v) => v.taskId === props.node?.data?.data.selectTaskId
+		)
+		const subordNodes = stateManager.getSubordNodes(props.node.id)
+		const originalImage = nodeData[0]?.url
+		if (!originalImage) console.log('originalImage 找不到原始图片')
+		stateManager.nodeManager.createCardsSelect({
+			data: { 
+				tier: tier_, 
+				superiorID: props.node.id, 
+				originalImage, 
+				createIndexPosition: subordNodes.length + 1,
+				isActive: subordNodes.length == 0
+			}
+		})
+		stateManager.setActiveNodeID('')
+	}
 	document.addEventListener('mousedown', hideMenu)
 	onBeforeUnmount(() => {
 		document.removeEventListener('mousedown', hideMenu)
@@ -250,6 +292,25 @@
 			gap: 8px;
 		}
 	}
+	.add {
+		position: absolute;
+		width: 32px;
+		height: 32px;
+		border: 2px solid #fff;
+		top: var(--top);
+		right: -16px;
+		transform: translateY(-50%);
+		background-color: #ed8936;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #fff;
+		font-size: 25px;
+		box-shadow: 0 8px 20px 0 #71809633;
+		cursor: pointer;
+		z-index: 20;
+	}
 	.result-image {
 		width: 244px;
 		border-radius: 16px;
diff --git a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts
index 231d638..cd10929 100644
--- a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts
+++ b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts
@@ -45,24 +45,27 @@ export class NodeManager {
 	/** 创建节点 */
 	createNode(options: NodeOptions) {
 		const superiorID = options?.data?.superiorID
-		const snode = superiorID ? this.stateManager.flowManager.getNodeById(superiorID) : this.stateManager.flowManager.getLastNode();
 		//获取上级节点所生成的最后一个node，设置位置为最后一个节点的xy 加上 节点间距
 		const superiorGenerateNodes = this.stateManager.getSubordNodes(superiorID)
+		const currentNode = superiorGenerateNodes.find((node) => {
+			return node.data.createIndexPosition === options?.data?.createIndexPosition
+		})
 		const endGenerateNode = superiorGenerateNodes.reduce((max, current) => {
 			return current.data.createIndexPosition > max.data.createIndexPosition ? current : max
 		}, superiorGenerateNodes[0])
+		const snode = superiorID ? this.stateManager.flowManager.getNodeById(superiorID) : this.stateManager.flowManager.getLastNode();
 		const id = options.id || createId()
 		const positionX = options.positionX || 0
 		const positionY = options.positionY || 0
 		const position = options.position ||
 			(
-				endGenerateNode?
+				currentNode ?
+				currentNode.position :
+				endGenerateNode ?
 				{
 					x: endGenerateNode.position.x + positionX,
 					y: endGenerateNode.position.y + positionY + this.ranksep + 200
 				} :
-				!snode ?
-				{ x: positionX, y: positionY } :
 				{
 					x: snode.position.x + snode.dimensions.width + this.nodesep + positionX,
 					y: snode.position.y + positionY
@@ -103,6 +106,7 @@ export class NodeManager {
 			data: {
 				tier: NODE_DATATIER.CARDS_SELECT,
 				type: NODE_DATATYPE.CARDS_SELECT,
+				createIndexPosition: options?.data?.createIndexPosition || 1,
 				...(options?.data || {}),
 			},
 		}
@@ -113,7 +117,7 @@ export class NodeManager {
 		const options_ = {
 			...(options ? options : {}),
 			component: NODE_COMPONENT.CARD,
-			data: {
+				data: {
 				...(options?.data || {}),
 			}
 		}
diff --git a/src/components/Canvas/FlowCanvas/manager/StateManager.ts b/src/components/Canvas/FlowCanvas/manager/StateManager.ts
index 891d17c..30d8c9c 100644
--- a/src/components/Canvas/FlowCanvas/manager/StateManager.ts
+++ b/src/components/Canvas/FlowCanvas/manager/StateManager.ts
@@ -101,7 +101,7 @@ export class StateManager {
 						source: source,
 						target: target,
 						selectable: false,
-						visible: (node.data.type !== NODE_DATATYPE.RESULT_IMAGE || node.data.isActive),
+						visible: (node.data.isActive),
 						type: 'default'
 					})
 				}
@@ -223,8 +223,7 @@ export class StateManager {
 	/** 显示指定子节点和父节点连接线，隐藏父节点和其他子节点链接线， */
 	showNodeConnections(id: string) {
 		const node = this.getNodeById(id)
-		if(node.data.component != NODE_DATATYPE.RESULT_IMAGE && node.data.superiorID) return
-		let edges_ = JSON.parse(JSON.stringify(this.edges.value))
+		if(!node.data.superiorID) return
 		this.nodes.value.forEach((nodeItem) => {
 			if(node.data.superiorID === nodeItem.data.superiorID && nodeItem.id == id) {
 				nodeItem.data.isActive = true
diff --git a/src/views/home/agent/components/versionTree/index.vue b/src/views/home/agent/components/versionTree/index.vue
index 1bfa479..11cb7dd 100644
--- a/src/views/home/agent/components/versionTree/index.vue
+++ b/src/views/home/agent/components/versionTree/index.vue
@@ -58,6 +58,9 @@ const setVersionsList = (res)=>{
 	}
 	traverseArray(res,'',(item,i,father)=>{
 		item.versionId = father?`${father.versionId}-${i+1}`:'1'
+		if(item.id == projectStore.state.nodeId){
+			selectItem.value = {...item}
+		}
 	})
 	versionsList.value = res
 }
@@ -110,10 +113,6 @@ const versionDelete = (versionDetail)=>{
 	treeKey.value++
 }
 
-watch(()=>projectStore.state.nodeId,(newVal,oldVal)=>{
-	if(!newVal || newVal === selectItem?.value?.id)return
-	selectItem.value = {id:newVal}
-})
 
 let data = reactive({})
 // onMounted(() => {setVersionsList('')})