From 672db903f37d6efe5675f851b66c5ead3dc0dde6 Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Wed, 8 May 2024 20:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E9=92=89=E9=92=89=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8-=20=E5=AE=A1=E6=89=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=8A=84=E9=80=81=E8=8A=82=E7=82=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/NodeHandler.vue | 12 ++- .../src/ProcessNodeTree.vue | 11 ++- .../src/SimpleProcessDesigner.vue | 4 +- .../src/nodes-config/CopyTaskNodeConfig.vue | 62 +++++++++++---- .../src/nodes-config/UserTaskNodeConfig.vue | 72 +++++++++++++----- .../src/nodes/CopyTaskNode.vue | 12 +-- .../src/nodes/ExclusiveNode.vue | 1 - .../src/nodes/StartEventNode.vue | 18 +++-- .../src/nodes/UserTaskNode.vue | 17 ++--- .../SimpleProcessDesignerV2/src/utils.ts | 16 ++++ .../theme/simple-process-designer.scss | 76 +++++++++++++++++++ 11 files changed, 237 insertions(+), 64 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index 73183b14..efd7ac41 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -52,11 +52,13 @@ const props = defineProps({ const emits = defineEmits(['update:childNode']) + const addNode = (type: number) => { popoverShow.value = false if (type === NodeType.USER_TASK_NODE) { + const id = 'Activity_'+ generateUUID(); const data: SimpleFlowNode = { - id: 'Activity_'+ generateUUID(), + id: id, name: NODE_DEFAULT_NAME.get(NodeType.USER_TASK_NODE) as string, showText: '', type: NodeType.USER_TASK_NODE, @@ -64,11 +66,12 @@ const addNode = (type: number) => { attributes: { approveMethod: 1, candidateStrategy: CandidateStrategy.USER, - candidateParam: undefined + candidateParam: undefined, + fieldsPermission: undefined, }, childNode: props.childNode } - emits('update:childNode', data) + emits('update:childNode', data); } if (type === NodeType.COPY_TASK_NODE) { const data: SimpleFlowNode = { @@ -79,7 +82,8 @@ const addNode = (type: number) => { // 审批节点配置 attributes: { candidateStrategy: CandidateStrategy.USER, - candidateParam: undefined + candidateParam: undefined, + fieldsPermission: undefined }, childNode: props.childNode } diff --git a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue index 1d8e612a..a40ebc27 100644 --- a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue +++ b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue @@ -1,6 +1,9 @@