Skip to content

phsl / admin

Go to a project
Commit c304d456 by Lesan
Options

fix: 代码评审修改

parent d0b0c8d5
Showing with 18 additions and 19 deletions
src/components/SimpleProcessDesignerV2/src/consts.ts
...@@ -838,7 +838,7 @@ export type TimeoutSetting = { ...@@ -838,7 +838,7 @@ export type TimeoutSetting = {
export type MultiInstanceSetting = { export type MultiInstanceSetting = {
enable: boolean enable: boolean
sequential?: boolean sequential?: boolean
completeRatio?: number approveRatio?: number
sourceType?: ChildProcessMultiInstanceSourceTypeEnum sourceType?: ChildProcessMultiInstanceSourceTypeEnum
source?: string source?: string
} }
...@@ -883,14 +883,14 @@ export enum ChildProcessMultiInstanceSourceTypeEnum { ...@@ -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 = [ export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [
{ label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY }, { label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY },
{ label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM }, // TODO @lesan：DIGITAL 改成 NUMBER，和 Element plus 更接近？ { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM },
{ label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM } // TODO @lesan：多选表单？multiple 是这个解释。另外 MULTI => MULTIPLE { label: '多选表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM }
] ]
src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
...@@ -270,11 +270,11 @@ ...@@ -270,11 +270,11 @@
inactive-text="并行" inactive-text="并行"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="completeRatio"> <el-form-item prop="approveRatio">
<el-text>完成比例(%)</el-text> <el-text>完成比例(%)</el-text>
<el-input-number <el-input-number
class="ml-10px" class="ml-10px"
v-model="configForm.completeRatio" v-model="configForm.approveRatio"
:min="10" :min="10"
:max="100" :max="100"
:step="10" :step="10"
...@@ -295,11 +295,10 @@ ...@@ -295,11 +295,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- TODO @lesan：枚举 --> <el-form-item v-if="configForm.multiInstanceSourceType === ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY">
<el-form-item v-if="configForm.multiInstanceSourceType === 1">
<el-input-number v-model="configForm.multiInstanceSource" :min="1" /> <el-input-number v-model="configForm.multiInstanceSource" :min="1" />
</el-form-item> </el-form-item>
<el-form-item v-if="configForm.multiInstanceSourceType === 2"> <el-form-item v-if="configForm.multiInstanceSourceType === ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM">
<el-select class="w-200px!" v-model="configForm.multiInstanceSource"> <el-select class="w-200px!" v-model="configForm.multiInstanceSource">
<el-option <el-option
v-for="(field, fIdx) in digitalFormFieldOptions" v-for="(field, fIdx) in digitalFormFieldOptions"
...@@ -309,7 +308,7 @@ ...@@ -309,7 +308,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="configForm.multiInstanceSourceType === 3"> <el-form-item v-if="configForm.multiInstanceSourceType === ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM">
<el-select class="w-200px!" v-model="configForm.multiInstanceSource"> <el-select class="w-200px!" v-model="configForm.multiInstanceSource">
<el-option <el-option
v-for="(field, fIdx) in multiFormFieldOptions" v-for="(field, fIdx) in multiFormFieldOptions"
...@@ -407,7 +406,7 @@ type ChildProcessFormType = { ...@@ -407,7 +406,7 @@ type ChildProcessFormType = {
dateTime: string dateTime: string
multiInstanceEnable: boolean multiInstanceEnable: boolean
sequential: boolean sequential: boolean
completeRatio: number approveRatio: number
multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum
multiInstanceSource: string multiInstanceSource: string
} }
...@@ -427,7 +426,7 @@ const configForm = ref<ChildProcessFormType>({ ...@@ -427,7 +426,7 @@ const configForm = ref<ChildProcessFormType>({
dateTime: '', dateTime: '',
multiInstanceEnable: false, multiInstanceEnable: false,
sequential: false, sequential: false,
completeRatio: 100, approveRatio: 100,
multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY, multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY,
multiInstanceSource: '' multiInstanceSource: ''
}) })
...@@ -490,8 +489,8 @@ const saveConfig = async () => { ...@@ -490,8 +489,8 @@ const saveConfig = async () => {
if (configForm.value.multiInstanceEnable) { if (configForm.value.multiInstanceEnable) {
currentNode.value.childProcessSetting.multiInstanceSetting.sequential = currentNode.value.childProcessSetting.multiInstanceSetting.sequential =
configForm.value.sequential configForm.value.sequential
currentNode.value.childProcessSetting.multiInstanceSetting.completeRatio = currentNode.value.childProcessSetting.multiInstanceSetting.approveRatio =
configForm.value.completeRatio configForm.value.approveRatio
currentNode.value.childProcessSetting.multiInstanceSetting.sourceType = currentNode.value.childProcessSetting.multiInstanceSetting.sourceType =
configForm.value.multiInstanceSourceType configForm.value.multiInstanceSourceType
currentNode.value.childProcessSetting.multiInstanceSetting.source = currentNode.value.childProcessSetting.multiInstanceSetting.source =
...@@ -520,7 +519,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { ...@@ -520,7 +519,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
configForm.value.outVariables = node.childProcessSetting.outVariables configForm.value.outVariables = node.childProcessSetting.outVariables
// 6. 发起人设置 // 6. 发起人设置
configForm.value.startUserType = node.childProcessSetting.startUserSetting.type 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 ?? '' configForm.value.startUserFormField = node.childProcessSetting.startUserSetting.formField ?? ''
// 7. 超时设置 // 7. 超时设置
configForm.value.timeoutEnable = node.childProcessSetting.timeoutSetting.enable ?? false configForm.value.timeoutEnable = node.childProcessSetting.timeoutSetting.enable ?? false
...@@ -546,8 +545,8 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { ...@@ -546,8 +545,8 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
if (configForm.value.multiInstanceEnable) { if (configForm.value.multiInstanceEnable) {
configForm.value.sequential = configForm.value.sequential =
node.childProcessSetting.multiInstanceSetting.sequential ?? false node.childProcessSetting.multiInstanceSetting.sequential ?? false
configForm.value.completeRatio = configForm.value.approveRatio =
node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100 node.childProcessSetting.multiInstanceSetting.approveRatio ?? 100
configForm.value.multiInstanceSourceType = configForm.value.multiInstanceSourceType =
node.childProcessSetting.multiInstanceSetting.sourceType ?? node.childProcessSetting.multiInstanceSetting.sourceType ??
ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment