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