fix: [BPM 工作流]修复审批人节点校验的问题

pull/120/head
jason 2025-05-29 08:51:48 +08:00
parent db63d80338
commit 54d1471d43
4 changed files with 21 additions and 18 deletions

View File

@ -64,11 +64,11 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
<Row :gutter="8" v-for="(item, index) in props.header" :key="index"> <Row :gutter="8" v-for="(item, index) in props.header" :key="index">
<Col :span="7"> <Col :span="7">
<FormItem <FormItem
:name="`${bind}.header.${index}.key`" :name="[bind, 'header', index, 'key']"
:rules="{ :rules="{
required: true, required: true,
message: '参数名不能为空', message: '参数名不能为空',
trigger: 'blur', trigger: ['blur', 'change'],
}" }"
> >
<Input placeholder="参数名不能为空" v-model:value="item.key" /> <Input placeholder="参数名不能为空" v-model:value="item.key" />
@ -88,18 +88,18 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
</Col> </Col>
<Col :span="10"> <Col :span="10">
<FormItem <FormItem
:name="`${bind}.header.${index}.value`" :name="[bind, 'header', index, 'value']"
:rules="{ :rules="{
required: true, required: true,
message: '参数值不能为空', message: '参数值不能为空',
trigger: 'blur', trigger: ['blur', 'change'],
}" }"
v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE" v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
> >
<Input placeholder="请求头" v-model:value="item.value" /> <Input placeholder="请求头" v-model:value="item.value" />
</FormItem> </FormItem>
<FormItem <FormItem
:name="`${bind}.header.${index}.value`" :name="[bind, 'header', index, 'value']"
:rules="{ :rules="{
required: true, required: true,
message: '参数值不能为空', message: '参数值不能为空',
@ -148,11 +148,11 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
<Row :gutter="8" v-for="(item, index) in props.body" :key="index"> <Row :gutter="8" v-for="(item, index) in props.body" :key="index">
<Col :span="7"> <Col :span="7">
<FormItem <FormItem
:name="`${bind}.body.${index}.key`" :name="[bind, 'body', index, 'key']"
:rules="{ :rules="{
required: true, required: true,
message: '参数名不能为空', message: '参数名不能为空',
trigger: 'blur', trigger: ['blur', 'change'],
}" }"
> >
<Input placeholder="参数名" v-model:value="item.key" /> <Input placeholder="参数名" v-model:value="item.key" />
@ -172,18 +172,18 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
</Col> </Col>
<Col :span="10"> <Col :span="10">
<FormItem <FormItem
:name="`${bind}.body.${index}.value`" :name="[bind, 'body', index, 'value']"
:rules="{ :rules="{
required: true, required: true,
message: '参数值不能为空', message: '参数值不能为空',
trigger: 'blur', trigger: ['blur', 'change'],
}" }"
v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE" v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
> >
<Input placeholder="参数值" v-model:value="item.value" /> <Input placeholder="参数值" v-model:value="item.value" />
</FormItem> </FormItem>
<FormItem <FormItem
:name="`${bind}.body.${index}.value`" :name="[bind, 'body', index, 'value']"
:rules="{ :rules="{
required: true, required: true,
message: '参数值不能为空', message: '参数值不能为空',

View File

@ -89,7 +89,7 @@ defineExpose({ validate });
:rules="{ :rules="{
required: true, required: true,
message: '请求地址不能为空', message: '请求地址不能为空',
trigger: 'blur', trigger: ['blur', 'change'],
}" }"
> >
<Input <Input

View File

@ -253,14 +253,18 @@ const saveConfig = async () => {
if (!formRef.value) return false; if (!formRef.value) return false;
if (!userTaskListenerRef.value) return false; if (!userTaskListenerRef.value) return false;
// , TODO Tab //
if (!(await userTaskListenerRef.value.validate())) { const userFormValid = await formRef.value.validate().catch(() => false);
const listenerValid = await userTaskListenerRef.value.validate().catch(() => {
return false;
});
// Tab
if (!listenerValid) {
activeTabName.value = 'listener'; activeTabName.value = 'listener';
return false; return false;
} }
// // Tab
if (!(await formRef.value.validate())) { if (!userFormValid) {
// TODO
activeTabName.value = 'user'; activeTabName.value = 'user';
return false; return false;
} }
@ -1221,7 +1225,7 @@ onMounted(() => {
</div> </div>
</div> </div>
</TabPane> </TabPane>
<TabPane tab="监听器" key="listener"> <TabPane tab="监听器" key="listener" :force-render="true">
<UserTaskListener <UserTaskListener
ref="userTaskListenerRef" ref="userTaskListenerRef"
v-model="configForm" v-model="configForm"

View File

@ -338,7 +338,6 @@ const handleDeploy = async () => {
/** 步骤切换处理 */ /** 步骤切换处理 */
const handleStepClick = async (index: number) => { const handleStepClick = async (index: number) => {
try { try {
console.warn('handleStepClick', index);
if (index !== 0) { if (index !== 0) {
await validateBasic(); await validateBasic();
} }