From eb79ee1b77353185c1dd9e429542dba6a9fee71b Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Wed, 21 Aug 2024 21:00:38 +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=E6=96=B0=E5=A2=9E=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E8=8A=82=E7=82=B9=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/NodeHandler.vue | 12 +- .../src/ProcessNodeTree.vue | 18 ++- .../src/SimpleProcessDesigner.vue | 15 +- .../SimpleProcessDesignerV2/src/consts.ts | 82 +++++++---- .../SimpleProcessDesignerV2/src/node.ts | 11 +- .../src/nodes-config/CopyTaskNodeConfig.vue | 34 ++++- .../src/nodes-config/StartUserNodeConfig.vue | 136 ++++++++++++++++++ .../src/nodes-config/UserTaskNodeConfig.vue | 30 +++- .../src/nodes/StartEventNode.vue | 43 ------ .../src/nodes/StartUserNode.vue | 79 ++++++++++ 10 files changed, 355 insertions(+), 105 deletions(-) create mode 100644 src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue delete mode 100644 src/components/SimpleProcessDesignerV2/src/nodes/StartEventNode.vue create mode 100644 src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index c330c261..dd0f001b 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -20,13 +20,13 @@
抄送
-
+
条件分支
-
+
@@ -107,10 +107,10 @@ const addNode = (type: number) => { } emits('update:childNode', data) } - if (type === NodeType.EXCLUSIVE_NODE) { + if (type === NodeType.CONDITION_BRANCH_NODE) { const data: SimpleFlowNode = { name: '条件分支', - type: NodeType.EXCLUSIVE_NODE, + type: NodeType.CONDITION_BRANCH_NODE, id: 'GateWay_' + generateUUID(), childNode: props.childNode, conditionNodes: [ @@ -140,10 +140,10 @@ const addNode = (type: number) => { } emits('update:childNode', data) } - if (type === NodeType.PARALLEL_NODE_FORK) { + if (type === NodeType.PARALLEL_BRANCH_NODE) { const data: SimpleFlowNode = { name: '并行分支', - type: NodeType.PARALLEL_NODE_FORK, + type: NodeType.PARALLEL_BRANCH_NODE, id: 'GateWay_' + generateUUID(), childNode: props.childNode, conditionNodes: [ diff --git a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue index 440e574a..be2bc955 100644 --- a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue +++ b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue @@ -1,7 +1,7 @@ + + diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index 01ed75ce..e72b1117 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -25,7 +25,7 @@
- 审批类型 : + 审批类型 : {{ item.title }}
- +
- +
- +
@@ -435,7 +450,8 @@ import { ASSIGN_START_USER_HANDLER_TYPES, TimeoutHandlerType, ASSIGN_EMPTY_HANDLER_TYPES, - AssignEmptyHandlerType + AssignEmptyHandlerType, + FieldPermissionType } from '../consts' import { @@ -479,7 +495,9 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.USER_ // 激活的 Tab 标签页 const activeTabName = ref('user') // 表单字段权限设置 -const { formType, fieldsPermissionConfig, getNodeConfigFormFields } = useFormFieldsPermission() +const { formType, fieldsPermissionConfig, getNodeConfigFormFields } = useFormFieldsPermission( + FieldPermissionType.READ +) // 操作按钮设置 const { buttonsSetting, btnDisplayNameEdit, changeBtnDisplayName, btnDisplayNameBlurEvent } = useButtonsSetting() diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartEventNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartEventNode.vue deleted file mode 100644 index a26a4935..00000000 --- a/src/components/SimpleProcessDesignerV2/src/nodes/StartEventNode.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue new file mode 100644 index 00000000..23e1dd3e --- /dev/null +++ b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue @@ -0,0 +1,79 @@ + + +