diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 7f3e3530a96498ba7880b981ce4562b3e55f1f44..c5404f18f7eceaf458fef0bf77c402e489c6de6a 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 abd3a3100436121c536f8b028cead44b922a77a6..7ec382fca0dacf10ce8457e006d51f667bc1731c 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 diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue index 8274e3147f5c3c631ad62c463e711526eb4c18aa..aec32da358682c4c9636ee575e6d6cbdd29ac71e 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 = 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 a735419d998e419f8883a794ce74dca02b403ddd..b0249307def4b7fca379e02d925aed08fb93db0c 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 () => { // 获得用户列表