Skip to content

Commit c304d45

Browse files
committedFeb 28, 2025
fix: 代码评审修改
1 parent d0b0c8d commit c304d45

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed
 

‎src/components/SimpleProcessDesignerV2/src/consts.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ export type TimeoutSetting = {
838838
export type MultiInstanceSetting = {
839839
enable: boolean
840840
sequential?: boolean
841-
completeRatio?: number
841+
approveRatio?: number
842842
sourceType?: ChildProcessMultiInstanceSourceTypeEnum
843843
source?: string
844844
}
@@ -883,14 +883,14 @@ export enum ChildProcessMultiInstanceSourceTypeEnum {
883883
/**
884884
* 数字表单
885885
*/
886-
DIGITAL_FORM = 2,
886+
NUMBER_FORM = 2,
887887
/**
888-
* 多项表单
888+
* 多选表单
889889
*/
890-
MULTI_FORM = 3
890+
MULTIPLE_FORM = 3
891891
}
892892
export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [
893893
{ label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY },
894-
{ label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM }, // TODO @lesan:DIGITAL 改成 NUMBER,和 Element plus 更接近?
895-
{ label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM } // TODO @lesan:多选表单?multiple 是这个解释。另外 MULTI => MULTIPLE
894+
{ label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM },
895+
{ label: '多选表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM }
896896
]

‎src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue

+12-13
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@
270270
inactive-text="并行"
271271
/>
272272
</el-form-item>
273-
<el-form-item prop="completeRatio">
273+
<el-form-item prop="approveRatio">
274274
<el-text>完成比例(%)</el-text>
275275
<el-input-number
276276
class="ml-10px"
277-
v-model="configForm.completeRatio"
277+
v-model="configForm.approveRatio"
278278
:min="10"
279279
:max="100"
280280
:step="10"
@@ -295,11 +295,10 @@
295295
/>
296296
</el-select>
297297
</el-form-item>
298-
<!-- TODO @lesan:枚举 -->
299-
<el-form-item v-if="configForm.multiInstanceSourceType === 1">
298+
<el-form-item v-if="configForm.multiInstanceSourceType === ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY">
300299
<el-input-number v-model="configForm.multiInstanceSource" :min="1" />
301300
</el-form-item>
302-
<el-form-item v-if="configForm.multiInstanceSourceType === 2">
301+
<el-form-item v-if="configForm.multiInstanceSourceType === ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM">
303302
<el-select class="w-200px!" v-model="configForm.multiInstanceSource">
304303
<el-option
305304
v-for="(field, fIdx) in digitalFormFieldOptions"
@@ -309,7 +308,7 @@
309308
/>
310309
</el-select>
311310
</el-form-item>
312-
<el-form-item v-if="configForm.multiInstanceSourceType === 3">
311+
<el-form-item v-if="configForm.multiInstanceSourceType === ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM">
313312
<el-select class="w-200px!" v-model="configForm.multiInstanceSource">
314313
<el-option
315314
v-for="(field, fIdx) in multiFormFieldOptions"
@@ -407,7 +406,7 @@ type ChildProcessFormType = {
407406
dateTime: string
408407
multiInstanceEnable: boolean
409408
sequential: boolean
410-
completeRatio: number
409+
approveRatio: number
411410
multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum
412411
multiInstanceSource: string
413412
}
@@ -427,7 +426,7 @@ const configForm = ref<ChildProcessFormType>({
427426
dateTime: '',
428427
multiInstanceEnable: false,
429428
sequential: false,
430-
completeRatio: 100,
429+
approveRatio: 100,
431430
multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY,
432431
multiInstanceSource: ''
433432
})
@@ -490,8 +489,8 @@ const saveConfig = async () => {
490489
if (configForm.value.multiInstanceEnable) {
491490
currentNode.value.childProcessSetting.multiInstanceSetting.sequential =
492491
configForm.value.sequential
493-
currentNode.value.childProcessSetting.multiInstanceSetting.completeRatio =
494-
configForm.value.completeRatio
492+
currentNode.value.childProcessSetting.multiInstanceSetting.approveRatio =
493+
configForm.value.approveRatio
495494
currentNode.value.childProcessSetting.multiInstanceSetting.sourceType =
496495
configForm.value.multiInstanceSourceType
497496
currentNode.value.childProcessSetting.multiInstanceSetting.source =
@@ -520,7 +519,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
520519
configForm.value.outVariables = node.childProcessSetting.outVariables
521520
// 6. 发起人设置
522521
configForm.value.startUserType = node.childProcessSetting.startUserSetting.type
523-
configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? 1
522+
configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER
524523
configForm.value.startUserFormField = node.childProcessSetting.startUserSetting.formField ?? ''
525524
// 7. 超时设置
526525
configForm.value.timeoutEnable = node.childProcessSetting.timeoutSetting.enable ?? false
@@ -546,8 +545,8 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
546545
if (configForm.value.multiInstanceEnable) {
547546
configForm.value.sequential =
548547
node.childProcessSetting.multiInstanceSetting.sequential ?? false
549-
configForm.value.completeRatio =
550-
node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100
548+
configForm.value.approveRatio =
549+
node.childProcessSetting.multiInstanceSetting.approveRatio ?? 100
551550
configForm.value.multiInstanceSourceType =
552551
node.childProcessSetting.multiInstanceSetting.sourceType ??
553552
ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY

0 commit comments

Comments
 (0)