From cdc2c33c47acaa0940a824a491ca0eb676906465 Mon Sep 17 00:00:00 2001 From: v_xugzhou <941071842@qq.com> Date: Thu, 23 Nov 2023 16:15:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?optimization:=20=E5=85=AC=E5=85=B1=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=88=9B=E5=BB=BA=E5=BC=B9=E6=A1=86=E7=BB=9F=E4=B8=80?= =?UTF-8?q?title&&=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=85=AC=E5=85=B1=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktop/src/pages/commonManage/CommonTplList.vue | 2 +- .../desktop/src/pages/home/SelectCreateTaskDialog.vue | 2 +- .../src/pages/template/TemplateEdit/TemplateHeader.vue | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/desktop/src/pages/commonManage/CommonTplList.vue b/frontend/desktop/src/pages/commonManage/CommonTplList.vue index 6e4746d2d3..bd8a2a2573 100644 --- a/frontend/desktop/src/pages/commonManage/CommonTplList.vue +++ b/frontend/desktop/src/pages/commonManage/CommonTplList.vue @@ -251,7 +251,7 @@ :type="exportType"> Date: Thu, 23 Nov 2023 16:33:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?optimization:=20=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=B0=8F=E7=94=BB=E5=B8=83=E5=88=86=E6=94=AF=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=94=AF=E6=8C=81=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/task/TaskExecute/ExecuteInfo.vue | 10 +++++++++- .../src/pages/task/TaskExecute/NodeTree.vue | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue index 87cadc8558..6d48dfde7d 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue @@ -42,6 +42,7 @@ :show-tool="false" :editable="false" :canvas-data="canvasData" + @onConditionClick="onOpenConditionEdit" @onNodeClick="onNodeClick">
@@ -986,9 +987,16 @@ if (nodeInfo) { nodeInfo && this.onSelectNode(nodeInfo) const parentInstance = this.$parent.$parent - parentInstance.defaultActiveId = node + '-' + nodeInfo.parentId + if (nodeInfo.conditionType) { + parentInstance.defaultActiveId = node + '-' + nodeInfo.parentId + '-condition' + } else { + parentInstance.defaultActiveId = node + '-' + nodeInfo.parentId + } } }, + onOpenConditionEdit (data) { + this.onNodeClick(`${data.nodeId}-${data.id}`) + }, onZoomOut () { const jsFlowInstance = this.$refs.subProcessCanvas jsFlowInstance.onZoomOut() diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue index 08f9e27e5b..59253fbb90 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue @@ -50,14 +50,18 @@ handler (val) { this.activeId = val let nodeId = val.split('-')[0] + let parentId = [] // 分支条件默认选中特殊处理 - if (val.split('-').pop() === 'condition') { - nodeId = val.split('-').slice(0, -1).join('-') - this.activeId = nodeId + if (val.match('condition')) { + // 小画布默认id会携带parentId + const nodes = val.split('-').slice(0, -1) + nodeId = nodes.slice(0, 2).join('-') + this.activeId = nodes.join('-') + parentId = nodes.slice(2) } // 根据父节点过滤节点树 let nodes = this.treeData - const parentId = val.split('-').slice(1) + parentId = parentId.length ? parentId : val.split('-').slice(1) if (parentId.length) { parentId.forEach(id => { nodes.some(item => { @@ -82,9 +86,12 @@ setDefaultActiveId (treeData = [], id) { return treeData.some(item => { if (item.id === id) { - item.expanded = !!item.isSubProcess + item.expanded = !!item.isSubProcess || !!item.conditionType return true } else if (item.children?.length) { + if (item.expanded) { + return this.setDefaultActiveId(item.children, id) + } item.expanded = this.setDefaultActiveId(item.children, id) return item.expanded } From f5da1892d891c1a95b1f493addc25034d005090a Mon Sep 17 00:00:00 2001 From: v_xugzhou <941071842@qq.com> Date: Thu, 23 Nov 2023 16:35:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bugfix:=20=E8=8A=82=E7=82=B9=E6=A0=91-?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9C=AA=E6=90=BA=E5=B8=A6=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1id=E5=AF=BC=E8=87=B4=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue index c16267ed86..f3d361c7ae 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue @@ -1748,7 +1748,8 @@ parentId, independentId, gatewayId: id, - lastId: item.id + lastId: item.id, + taskId }, ordered, item.children