From c304d456c3be1f3992b223cf1479380f252a51d1 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Fri, 28 Feb 2025 09:29:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimpleProcessDesignerV2/src/consts.ts | 12 ++++----- .../nodes-config/ChildProcessNodeConfig.vue | 25 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 7f3e3530..c5404f18 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -838,7 +838,7 @@ export type TimeoutSetting = { export type MultiInstanceSetting = { enable: boolean sequential?: boolean - completeRatio?: number + approveRatio?: number sourceType?: ChildProcessMultiInstanceSourceTypeEnum source?: string } @@ -883,14 +883,14 @@ export enum ChildProcessMultiInstanceSourceTypeEnum { /** * 数字表单 */ - DIGITAL_FORM = 2, + NUMBER_FORM = 2, /** - * 多项表单 + * 多选表单 */ - MULTI_FORM = 3 + MULTIPLE_FORM = 3 } export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [ { label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY }, - { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM }, // TODO @lesan：DIGITAL 改成 NUMBER，和 Element plus 更接近？ - { label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM } // TODO @lesan：多选表单？multiple 是这个解释。另外 MULTI => MULTIPLE + { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM }, + { label: '多选表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM } ] diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue index abd3a310..7ec382fc 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue @@ -270,11 +270,11 @@ inactive-text="并行" /> - + 完成比例(%) - - + - + - + ({ dateTime: '', multiInstanceEnable: false, sequential: false, - completeRatio: 100, + approveRatio: 100, multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY, multiInstanceSource: '' }) @@ -490,8 +489,8 @@ const saveConfig = async () => { if (configForm.value.multiInstanceEnable) { currentNode.value.childProcessSetting.multiInstanceSetting.sequential = configForm.value.sequential - currentNode.value.childProcessSetting.multiInstanceSetting.completeRatio = - configForm.value.completeRatio + currentNode.value.childProcessSetting.multiInstanceSetting.approveRatio = + configForm.value.approveRatio currentNode.value.childProcessSetting.multiInstanceSetting.sourceType = configForm.value.multiInstanceSourceType currentNode.value.childProcessSetting.multiInstanceSetting.source = @@ -520,7 +519,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { configForm.value.outVariables = node.childProcessSetting.outVariables // 6. 发起人设置 configForm.value.startUserType = node.childProcessSetting.startUserSetting.type - configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? 1 + configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER configForm.value.startUserFormField = node.childProcessSetting.startUserSetting.formField ?? '' // 7. 超时设置 configForm.value.timeoutEnable = node.childProcessSetting.timeoutSetting.enable ?? false @@ -546,8 +545,8 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { if (configForm.value.multiInstanceEnable) { configForm.value.sequential = node.childProcessSetting.multiInstanceSetting.sequential ?? false - configForm.value.completeRatio = - node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100 + configForm.value.approveRatio = + node.childProcessSetting.multiInstanceSetting.approveRatio ?? 100 configForm.value.multiInstanceSourceType = node.childProcessSetting.multiInstanceSetting.sourceType ?? ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY From afca393cac6cb2dad4ec0e990e324fd8a68c431f Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Fri, 28 Feb 2025 09:34:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20bpmn=E8=AE=BE=E8=AE=A1=E5=99=A8User?= =?UTF-8?q?Task=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/UserTaskCustomConfig.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue index a735419d..b0249307 100644 --- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue +++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue @@ -127,9 +127,9 @@
字段名称
- 只读 - 可编辑 - 隐藏 + 只读 + 可编辑 + 隐藏
@@ -486,6 +486,18 @@ function useButtonsSetting() { } } +/** 批量更新权限 */ +const updatePermission = (type: string) => { + fieldsPermissionEl.value.forEach((field) => { + field.permission = + type === 'READ' + ? FieldPermissionType.READ + : type === 'WRITE' + ? FieldPermissionType.WRITE + : FieldPermissionType.NONE + }) +} + const userOptions = ref([]) // 用户列表 onMounted(async () => { // 获得用户列表 From 5258c7b81aa512af7f1f0d480c9c289d1e9a3af8 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Fri, 28 Feb 2025 09:37:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20bpmn=E8=AE=BE=E8=AE=A1=E5=99=A8User?= =?UTF-8?q?Task=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/nodes-config/CopyTaskNodeConfig.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue index 8274e314..aec32da3 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue @@ -375,7 +375,6 @@ const showCopyTaskNodeConfig = (node: SimpleFlowNode) => { } /** 批量更新权限 */ -// TODO @lesan：要不要 bpmn 也加下？ const updatePermission = (type: string) => { fieldsPermissionConfig.value.forEach((field) => { field.permission =