diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue index 945e8d6..e64bc60 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue @@ -175,26 +175,43 @@ NODE_DATATIER.COLOR_PALETTE, ] let tier = (tritList.includes(currentComponent.value.tier) && typeList.includes(currentComponent.value.type))?currentComponent.value.tier - 1:currentComponent.value.tier - taskList.forEach((item,index) => { + if(NODE_DATATYPE.TO_REAL_STYLE == currentComponent.value.type && false){ + let imageProcessTasks = taskList nodeManager.createResultNode({ data: { superiorID: attrs.node.id, superiorNodeType: attrs.node?.data?.type, - createIndexPosition: index + subordNodes.length, + createIndexPosition: subordNodes.length, tier: tier, - isActive: index == 0 && subordNodes.length == 0, + isActive: subordNodes.length == 0, data: { - imageProcessTasks:[item], - selectTaskId:item.taskId, + imageProcessTasks, + selectTaskId:imageProcessTasks[0].taskId, } } }) - }) + }else{ + taskList.forEach((item,index) => { + nodeManager.createResultNode({ + data: { + superiorID: attrs.node.id, + superiorNodeType: attrs.node?.data?.type, + createIndexPosition: index + subordNodes.length, + tier: tier, + isActive: index == 0 && subordNodes.length == 0, + data: { + imageProcessTasks:[item], + selectTaskId:item.taskId, + } + } + }) + }) + } } //删除功能卡片 const onDeleteClick = async ()=>{ console.log(stateManager.nodes) - stateManager.getSubordinateAllNodes(attrs.node.id,{ isElMessageBox: true }) + stateManager.deleteSubordinateAllNodes(attrs.node.id,{ isElMessageBox: true }) } const setDate = () => { for (const key in props.data) { diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index 82a74db..757ad4b 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -4,10 +4,10 @@
-
+
@@ -114,10 +114,12 @@ watch( () => props.data.status, (newVal) => { - let selectNode = data.imageProcessTasks.find((item) => item.taskId === data.selectTaskId) - if(selectNode.status !== 'RETURNED'){ - generateManager.addTaskId(selectNode,props.node.id) - } + data.imageProcessTasks.forEach((item) => { + if(item.status !== 'RETURNED'){ + generateManager.addTaskId(item,props.node.id) + } + }) + }, { immediate: true } ) @@ -127,14 +129,7 @@ label: 'Delete', tip: 'Del', on: () => { - if(data.imageProcessTasks.length > 1){ - if(clickTaskId.value){ - data.imageProcessTasks = data.imageProcessTasks.filter((item) => item.taskId !== clickTaskId.value) - clickTaskId.value = '' - } - }else{ - emit('delete-node', props.node.id) - } + emit('delete-node', props.node.id) }, disabled: !!props.config?.disableDelete }, @@ -159,10 +154,12 @@ tip: '', on: () => { data.imageProcessTasks.forEach((item) => { - if(!item.scale){ - item.scale = { x: 1, y: 1 } + if(item.taskId == data.selectTaskId){ + if(!item.scale){ + item.scale = { x: 1, y: 1 } + } + item.scale.x = -item.scale.x } - item.scale.x = -item.scale.x }) stateManager.recordState() stateManager.exportFlow(stateManager.saveCanvasTimeInterval) @@ -173,10 +170,12 @@ tip: '', on: () => { data.imageProcessTasks.forEach((item) => { - if(!item.scale){ - item.scale = { x: 1, y: 1 } + if(item.taskId == data.selectTaskId){ + if(!item.scale){ + item.scale = { x: 1, y: 1 } + } + item.scale.y = -item.scale.y } - item.scale.y = -item.scale.y }) stateManager.recordState() stateManager.exportFlow(stateManager.saveCanvasTimeInterval) diff --git a/src/components/Canvas/FlowCanvas/manager/EventManager.ts b/src/components/Canvas/FlowCanvas/manager/EventManager.ts index 1ae4bc4..b13c305 100644 --- a/src/components/Canvas/FlowCanvas/manager/EventManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/EventManager.ts @@ -94,7 +94,7 @@ export class EventManager { handleDelete(event: any, activeNodeID: string) { event.preventDefault() if (!activeNodeID) return console.warn('没有选中节点') - this.stateManager.getSubordinateAllNodes(activeNodeID, { isElMessageBox: true }) + this.stateManager.deleteSubordinateAllNodes(activeNodeID, { isElMessageBox: true }) } /** 处理键盘事件 */ _handleKeyDown: any diff --git a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts index 37f84d4..9f2b9ed 100644 --- a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts @@ -34,7 +34,7 @@ export class NodeManager { /** 删除节点 */ deleteNode(id: string) { - this.stateManager.getSubordinateAllNodes(id, { isElMessageBox: true }) + this.stateManager.deleteSubordinateAllNodes(id, { isElMessageBox: true }) } /** 添加节点 */ addNode(node: any) { @@ -146,6 +146,7 @@ export class NodeManager { const flowNode = this.stateManager.flowManager.getNodeById(id) if (!node) return console.warn(`${id}找不到对应节点`) if (node.data?.disableCopy) return console.warn(`${id}节点已禁用复制`) + copyNode.data.data.imageProcessTasks = copyNode.data.data.imageProcessTasks.filter((item) => item.taskId === copyNode.data.data.selectTaskId) const node_ = { ...copyNode, id: createId(), diff --git a/src/components/Canvas/FlowCanvas/manager/StateManager.ts b/src/components/Canvas/FlowCanvas/manager/StateManager.ts index 0334718..00298a0 100644 --- a/src/components/Canvas/FlowCanvas/manager/StateManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/StateManager.ts @@ -176,7 +176,7 @@ export class StateManager { return superiorNodeUrl } /** 获取下级所有子级节点 */ - async getSubordinateAllNodes(id: string,{ isElMessageBox } = { isElMessageBox: false }) { + async deleteSubordinateAllNodes(id: string,{ isElMessageBox } = { isElMessageBox: false }) { const node = this.getNodeById(id) if (!node) return console.warn(`没有找到指定id:${id}`) if (node.data.disableDelete) return ElMessage.error(t('flowCanvas.initialNodeProhibited')) @@ -210,6 +210,11 @@ export class StateManager { }) } if(!deletePromise) return console.log('删除操作被取消') + + if(node.data.data.imageProcessTasks.length > 1){ + node.data.data.imageProcessTasks = node.data.data.imageProcessTasks.filter((item) => item.taskId !== node.data.data.selectTaskId) + return + } this.deleteNode(id) result.forEach(item => { diff --git a/src/lang/en.ts b/src/lang/en.ts index b9d2efa..440e464 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -166,7 +166,7 @@ export default { delete: 'Delete', edit: 'Edit', generatingReport: - 'We are generating your report. This may take a few minutes, but you can continue with other tasks while it’s being generated.', + 'We’re generating your report. This may take a few minutes.', deleteSketchTip: 'Are you sure you want to delete this sketch? This action cannot be undone.', confirm: 'Confirm', diff --git a/src/views/home/left-nav.vue b/src/views/home/left-nav.vue index c4531fa..9e2a850 100644 --- a/src/views/home/left-nav.vue +++ b/src/views/home/left-nav.vue @@ -16,7 +16,7 @@ {{ $t('Home.home') }}
-->