From a097560f81a04faaa64548187b62cca21e243536 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 2 Nov 2024 09:11:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=9D=A1=E4=BB=B6=E5=88=86=E6=94=AF=E3=80=81=E5=8C=85?= =?UTF-8?q?=E5=AE=B9=E5=88=86=E6=94=AF=E5=90=8E=E9=9D=A2=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E7=9B=B4=E6=8E=A5=E6=B7=BB=E5=8A=A0=E5=B9=B6=E8=A1=8C?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/NodeHandler.vue | 24 +-- .../src/nodes/CopyTaskNode.vue | 11 +- .../src/nodes/ExclusiveNode.vue | 22 ++- .../src/nodes/InclusiveNode.vue | 37 ++++- .../src/nodes/ParallelNode.vue | 22 ++- .../src/nodes/StartUserNode.vue | 140 +++++++++-------- .../src/nodes/UserTaskNode.vue | 142 +++++++++--------- 7 files changed, 227 insertions(+), 171 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index c7707a1c..853a0aa6 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -27,14 +27,7 @@
条件分支
-
+
@@ -70,8 +63,10 @@ import { generateUUID } from '@/utils' defineOptions({ name: 'NodeHandler' }) -const popoverShow = ref(false) +const message = useMessage() // 消息弹窗 + +const popoverShow = ref(false) const props = defineProps({ childNode: { type: Object as () => SimpleFlowNode, @@ -87,6 +82,17 @@ const emits = defineEmits(['update:childNode']) const readonly = inject('readonly') // 是否只读 const addNode = (type: number) => { + // 校验:条件分支、包容分支后面,不允许直接添加并行分支 + if ( + type === NodeType.PARALLEL_BRANCH_NODE && + [NodeType.CONDITION_BRANCH_NODE, NodeType.INCLUSIVE_BRANCH_NODE].includes( + props.currentNode?.type + ) + ) { + message.error('条件分支、包容分支后面,不允许直接添加并行分支') + return + } + popoverShow.value = false if (type === NodeType.USER_TASK_NODE) { const id = 'Activity_' + generateUUID() diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue index 0c627b0a..8b97ee5b 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue @@ -3,7 +3,10 @@
@@ -37,7 +40,11 @@
- +
-
+
-
+
- +
@@ -120,7 +134,7 @@ const emits = defineEmits<{ ] }>() // 是否只读 -const readonly = inject('readonly') +const readonly = inject('readonly') const currentNode = ref(props.flowNode) watch( () => props.flowNode, diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue index cd06b358..f1445d83 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue @@ -1,10 +1,16 @@ diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue index ca711707..7aa67933 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue @@ -1,10 +1,16 @@ @@ -98,7 +108,7 @@ const emits = defineEmits<{ const currentNode = ref(props.flowNode) // 是否只读 -const readonly = inject('readonly') +const readonly = inject('readonly') watch( () => props.flowNode, diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue index 0ae8e1e29..89a57d04 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue @@ -3,7 +3,10 @@
- +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue index 10eb678b..761a6743 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue @@ -3,7 +3,10 @@
@@ -36,7 +39,11 @@
- +
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +