oneos-v5/frontend
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

feat: [bpm][ele] 仿钉钉流程设计器子流程迁移问题修复

Browse Source
This commit is contained in:
jason
2025-11-23 17:40:08 +08:00
parent c9fc450d74
commit 82b787188b
1 changed files with 59 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
View File

@@ -175,7 +175,6 @@ const childFormFieldOptions = ref<any[]>([]);
const saveConfig = async () => { const saveConfig = async () => {
activeTabName.value = 'child'; activeTabName.value = 'child';
if (!formRef.value) return false; if (!formRef.value) return false;
const valid = await formRef.value.validate().catch(() => false); const valid = await formRef.value.validate().catch(() => false);
if (!valid) return false; if (!valid) return false;
@@ -400,13 +399,7 @@ onMounted(async () => {
label-position="top" label-position="top"
:rules="formRules" :rules="formRules"
> >
<ElFormItem <ElFormItem label="是否异步执行" prop="async">
label="是否异步执行"
name="async"
label-align="left"
:label-col="{ span: 8 }"
:wrapper-col="{ span: 4 }"
>
<ElSwitch <ElSwitch
v-model="configForm.async" v-model="configForm.async"
active-text="是" active-text="是"
@@ -423,9 +416,8 @@ onMounted(async () => {
v-for="(item, index) in childProcessOptions" v-for="(item, index) in childProcessOptions"
:key="index" :key="index"
:value="item.key" :value="item.key"
> :label="item.name"
{{ item.name }} />
</ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="是否自动跳过子流程发起节点" prop="skipStartUserNode"> <ElFormItem label="是否自动跳过子流程发起节点" prop="skipStartUserNode">
@@ -441,9 +433,9 @@ onMounted(async () => {
v-for="(item, index) in configForm.inVariables" v-for="(item, index) in configForm.inVariables"
:key="index" :key="index"
> >
<div class="mr-2"> <div class="mr-2 mt-1">
<ElFormItem <ElFormItem
:name="['inVariables', index, 'source']" :prop="['inVariables', index, 'source']"
:rules="{ :rules="{
required: true, required: true,
message: '变量不能为空', message: '变量不能为空',
@@ -455,15 +447,14 @@ onMounted(async () => {
v-for="(field, fIdx) in formFieldOptions" v-for="(field, fIdx) in formFieldOptions"
:key="fIdx" :key="fIdx"
:value="field.field" :value="field.field"
> :label="field.title"
{{ field.title }} />
</ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
</div> </div>
<div class="mr-2"> <div class="mr-2 mt-1">
<ElFormItem <ElFormItem
:name="['inVariables', index, 'target']" :prop="['inVariables', index, 'target']"
:rules="{ :rules="{
required: true, required: true,
message: '变量不能为空', message: '变量不能为空',
@@ -475,13 +466,12 @@ onMounted(async () => {
v-for="(field, fIdx) in childFormFieldOptions" v-for="(field, fIdx) in childFormFieldOptions"
:key="fIdx" :key="fIdx"
:value="field.field" :value="field.field"
> :label="field.title"
{{ field.title }} />
</ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
</div> </div>
<div class="mr-1 flex h-8 items-center"> <div class="mr-1 mt-1 flex h-8 items-center">
<IconifyIcon <IconifyIcon
icon="lucide:trash-2" icon="lucide:trash-2"
:size="18" :size="18"
@@ -493,7 +483,7 @@ onMounted(async () => {
<ElButton <ElButton
link link
@click="addVariable(configForm.inVariables)" @click="addVariable(configForm.inVariables)"
class="flex items-center" class="mt-1 flex items-center"
> >
<template #icon> <template #icon>
<IconifyIcon class="size-4" icon="lucide:plus" /> <IconifyIcon class="size-4" icon="lucide:plus" />
@@ -511,9 +501,9 @@ onMounted(async () => {
v-for="(item, index) in configForm.outVariables" v-for="(item, index) in configForm.outVariables"
:key="index" :key="index"
> >
<div class="mr-2"> <div class="mr-2 mt-1">
<ElFormItem <ElFormItem
:name="['outVariables', index, 'source']" :prop="['outVariables', index, 'source']"
:rules="{ :rules="{
required: true, required: true,
message: '变量不能为空', message: '变量不能为空',
@@ -525,15 +515,14 @@ onMounted(async () => {
v-for="(field, fIdx) in childFormFieldOptions" v-for="(field, fIdx) in childFormFieldOptions"
:key="fIdx" :key="fIdx"
:value="field.field" :value="field.field"
> :label="field.title"
{{ field.title }} />
</ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
</div> </div>
<div class="mr-2"> <div class="mr-2 mt-1">
<ElFormItem <ElFormItem
:name="['outVariables', index, 'target']" :prop="['outVariables', index, 'target']"
:rules="{ :rules="{
required: true, required: true,
message: '变量不能为空', message: '变量不能为空',
@@ -545,13 +534,12 @@ onMounted(async () => {
v-for="(field, fIdx) in formFieldOptions" v-for="(field, fIdx) in formFieldOptions"
:key="fIdx" :key="fIdx"
:value="field.field" :value="field.field"
> :label="field.title"
{{ field.title }} />
</ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
</div> </div>
<div class="mr-1 flex h-8 items-center"> <div class="mr-1 mt-1 flex h-8 items-center">
<IconifyIcon <IconifyIcon
icon="lucide:trash-2" icon="lucide:trash-2"
:size="18" :size="18"
@@ -563,7 +551,7 @@ onMounted(async () => {
<ElButton <ElButton
link link
@click="addVariable(configForm.outVariables)" @click="addVariable(configForm.outVariables)"
class="flex items-center" class="mt-1 flex items-center"
> >
<template #icon> <template #icon>
<IconifyIcon class="size-4" icon="lucide:plus" /> <IconifyIcon class="size-4" icon="lucide:plus" />
@@ -571,7 +559,7 @@ onMounted(async () => {
添加一个 添加一个
</ElButton> </ElButton>
</ElFormItem> </ElFormItem>
<ElFormItem label="子流程发起人" name="startUserType"> <ElFormItem label="子流程发起人" prop="startUserType">
<ElRadioGroup v-model="configForm.startUserType"> <ElRadioGroup v-model="configForm.startUserType">
<ElRadio <ElRadio
v-for="item in CHILD_PROCESS_START_USER_TYPE" v-for="item in CHILD_PROCESS_START_USER_TYPE"
@@ -587,7 +575,7 @@ onMounted(async () => {
configForm.startUserType === ChildProcessStartUserTypeEnum.FROM_FORM configForm.startUserType === ChildProcessStartUserTypeEnum.FROM_FORM
" "
label="子流程发起人字段" label="子流程发起人字段"
name="startUserFormField" prop="startUserFormField"
> >
<ElSelect v-model="configForm.startUserFormField" clearable> <ElSelect v-model="configForm.startUserFormField" clearable>
<ElOption <ElOption
@@ -595,9 +583,7 @@ onMounted(async () => {
:key="fIdx" :key="fIdx"
:label="field.title" :label="field.title"
:value="field.field" :value="field.field"
> />
{{ field.title }}
</ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem
@@ -605,7 +591,7 @@ onMounted(async () => {
configForm.startUserType === ChildProcessStartUserTypeEnum.FROM_FORM configForm.startUserType === ChildProcessStartUserTypeEnum.FROM_FORM
" "
label="当子流程发起人为空时" label="当子流程发起人为空时"
name="startUserEmptyType" prop="startUserEmptyType"
> >
<ElRadioGroup v-model="configForm.startUserEmptyType"> <ElRadioGroup v-model="configForm.startUserEmptyType">
<ElRadio <ElRadio
@@ -627,7 +613,7 @@ onMounted(async () => {
/> />
</ElFormItem> </ElFormItem>
<div v-if="configForm.timeoutEnable"> <div v-if="configForm.timeoutEnable">
<ElFormItem name="timeoutType"> <ElFormItem prop="timeoutType">
<ElRadioGroup v-model="configForm.timeoutType"> <ElRadioGroup v-model="configForm.timeoutType">
<ElRadioButton <ElRadioButton
v-for="item in DELAY_TYPE" v-for="item in DELAY_TYPE"
@@ -641,22 +627,18 @@ onMounted(async () => {
<ElFormItem <ElFormItem
v-if="configForm.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION" v-if="configForm.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION"
> >
<ElRow :gutter="8"> <div class="flex items-center gap-2">
<ElCol> <span>当超过</span>
<span class="inline-flex h-8 items-center"> 当超过</span> <ElFormItem prop="timeDuration" class="!mb-0">
</ElCol> <ElInputNumber
<ElCol> class="!w-24"
<ElFormItem name="timeDuration"> v-model="configForm.timeDuration"
<ElInputNumber :min="1"
class="w-24" controls-position="right"
v-model="configForm.timeDuration" />
:min="1" </ElFormItem>
controls-position="right" <ElFormItem class="!mb-0">
/> <ElSelect v-model="configForm.timeUnit" class="!w-24">
</ElFormItem>
</ElCol>
<ElCol>
<ElSelect v-model="configForm.timeUnit" class="w-24">
<ElOption <ElOption
v-for="item in TIME_UNIT_TYPES" v-for="item in TIME_UNIT_TYPES"
:key="item.value" :key="item.value"
@@ -666,32 +648,23 @@ onMounted(async () => {
{{ item.label }} {{ item.label }}
</ElOption> </ElOption>
</ElSelect> </ElSelect>
</ElCol> </ElFormItem>
<ElCol> <span>后进入下一节点</span>
<span class="inline-flex h-8 items-center">后进入下一节点</span> </div>
</ElCol>
</ElRow>
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem
v-if="configForm.timeoutType === DelayTypeEnum.FIXED_DATE_TIME" v-if="configForm.timeoutType === DelayTypeEnum.FIXED_DATE_TIME"
name="dateTime" prop="dateTime"
> >
<ElRow :gutter="8"> <div class="flex items-center gap-2">
<ElCol> <ElDatePicker
<ElDatePicker v-model="configForm.dateTime"
class="mr-2" type="datetime"
v-model="configForm.dateTime" placeholder="请选择日期和时间"
type="datetime" value-format="YYYY-MM-DDTHH:mm:ss"
placeholder="请选择日期和时间" />
value-format="YYYY-MM-DDTHH:mm:ss" <span>后进入下一节点</span>
/> </div>
</ElCol>
<ElCol>
<span class="inline-flex h-8 items-center">
后进入下一节点
</span>
</ElCol>
</ElRow>
</ElFormItem> </ElFormItem>
</div> </div>
@@ -704,26 +677,14 @@ onMounted(async () => {
/> />
</ElFormItem> </ElFormItem>
<div v-if="configForm.multiInstanceEnable"> <div v-if="configForm.multiInstanceEnable">
<ElFormItem <ElFormItem prop="sequential" label="是否串行">
name="sequential"
label="是否串行"
label-align="left"
:label-col="{ span: 5 }"
:wrapper-col="{ span: 4 }"
>
<ElSwitch <ElSwitch
v-model="configForm.sequential" v-model="configForm.sequential"
active-text="是" active-text="是"
inactive-text="否" inactive-text="否"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem prop="approveRatio" label="完成比例(%)">
name="approveRatio"
label="完成比例(%)"
label-align="left"
:label-col="{ span: 6 }"
:wrapper-col="{ span: 4 }"
>
<ElInputNumber <ElInputNumber
v-model="configForm.approveRatio" v-model="configForm.approveRatio"
:min="10" :min="10"
@@ -731,13 +692,7 @@ onMounted(async () => {
:step="10" :step="10"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem prop="multiInstanceSourceType" label="实例数量">
name="multiInstanceSourceType"
label="实例数量"
label-align="left"
:label-col="{ span: 6 }"
:wrapper-col="{ span: 12 }"
>
<ElSelect <ElSelect
v-model="configForm.multiInstanceSourceType" v-model="configForm.multiInstanceSourceType"
@change="handleMultiInstanceSourceTypeChange" @change="handleMultiInstanceSourceTypeChange"
@@ -757,11 +712,8 @@ onMounted(async () => {
configForm.multiInstanceSourceType === configForm.multiInstanceSourceType ===
ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY
" "
name="multiInstanceSource" prop="multiInstanceSource"
label="固定数量" label="固定数量"
label-align="left"
:label-col="{ span: 6 }"
:wrapper-col="{ span: 12 }"
:rules="{ :rules="{
required: true, required: true,
message: '固定数量不能为空', message: '固定数量不能为空',
@@ -775,11 +727,8 @@ onMounted(async () => {
configForm.multiInstanceSourceType === configForm.multiInstanceSourceType ===
ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM
" "
name="multiInstanceSource" prop="multiInstanceSource"
label="数字表单" label="数字表单"
label-align="left"
:label-col="{ span: 6 }"
:wrapper-col="{ span: 12 }"
:rules="{ :rules="{
required: true, required: true,
message: '数字表单字段不能为空', message: '数字表单字段不能为空',
@@ -802,7 +751,7 @@ onMounted(async () => {
configForm.multiInstanceSourceType === configForm.multiInstanceSourceType ===
ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM
" "
name="multiInstanceSource" prop="multiInstanceSource"
label="多选表单" label="多选表单"
:rules="{ :rules="{
required: true, required: true,