fix: [BPM 工作流]修复审批人节点校验的问题
parent
db63d80338
commit
54d1471d43
|
@ -64,11 +64,11 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
|
|||
<Row :gutter="8" v-for="(item, index) in props.header" :key="index">
|
||||
<Col :span="7">
|
||||
<FormItem
|
||||
:name="`${bind}.header.${index}.key`"
|
||||
:name="[bind, 'header', index, 'key']"
|
||||
:rules="{
|
||||
required: true,
|
||||
message: '参数名不能为空',
|
||||
trigger: 'blur',
|
||||
trigger: ['blur', 'change'],
|
||||
}"
|
||||
>
|
||||
<Input placeholder="参数名不能为空" v-model:value="item.key" />
|
||||
|
@ -88,18 +88,18 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
|
|||
</Col>
|
||||
<Col :span="10">
|
||||
<FormItem
|
||||
:name="`${bind}.header.${index}.value`"
|
||||
:name="[bind, 'header', index, 'value']"
|
||||
:rules="{
|
||||
required: true,
|
||||
message: '参数值不能为空',
|
||||
trigger: 'blur',
|
||||
trigger: ['blur', 'change'],
|
||||
}"
|
||||
v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
|
||||
>
|
||||
<Input placeholder="请求头" v-model:value="item.value" />
|
||||
</FormItem>
|
||||
<FormItem
|
||||
:name="`${bind}.header.${index}.value`"
|
||||
:name="[bind, 'header', index, 'value']"
|
||||
:rules="{
|
||||
required: true,
|
||||
message: '参数值不能为空',
|
||||
|
@ -148,11 +148,11 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
|
|||
<Row :gutter="8" v-for="(item, index) in props.body" :key="index">
|
||||
<Col :span="7">
|
||||
<FormItem
|
||||
:name="`${bind}.body.${index}.key`"
|
||||
:name="[bind, 'body', index, 'key']"
|
||||
:rules="{
|
||||
required: true,
|
||||
message: '参数名不能为空',
|
||||
trigger: 'blur',
|
||||
trigger: ['blur', 'change'],
|
||||
}"
|
||||
>
|
||||
<Input placeholder="参数名" v-model:value="item.key" />
|
||||
|
@ -172,18 +172,18 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
|
|||
</Col>
|
||||
<Col :span="10">
|
||||
<FormItem
|
||||
:name="`${bind}.body.${index}.value`"
|
||||
:name="[bind, 'body', index, 'value']"
|
||||
:rules="{
|
||||
required: true,
|
||||
message: '参数值不能为空',
|
||||
trigger: 'blur',
|
||||
trigger: ['blur', 'change'],
|
||||
}"
|
||||
v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
|
||||
>
|
||||
<Input placeholder="参数值" v-model:value="item.value" />
|
||||
</FormItem>
|
||||
<FormItem
|
||||
:name="`${bind}.body.${index}.value`"
|
||||
:name="[bind, 'body', index, 'value']"
|
||||
:rules="{
|
||||
required: true,
|
||||
message: '参数值不能为空',
|
||||
|
|
|
@ -89,7 +89,7 @@ defineExpose({ validate });
|
|||
:rules="{
|
||||
required: true,
|
||||
message: '请求地址不能为空',
|
||||
trigger: 'blur',
|
||||
trigger: ['blur', 'change'],
|
||||
}"
|
||||
>
|
||||
<Input
|
||||
|
|
|
@ -253,14 +253,18 @@ const saveConfig = async () => {
|
|||
if (!formRef.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';
|
||||
return false;
|
||||
}
|
||||
// 校验审批人页面
|
||||
if (!(await formRef.value.validate())) {
|
||||
// TODO 好像走不到这里
|
||||
// 如果审批人表单有错误,切换到审批人Tab
|
||||
if (!userFormValid) {
|
||||
activeTabName.value = 'user';
|
||||
return false;
|
||||
}
|
||||
|
@ -1221,7 +1225,7 @@ onMounted(() => {
|
|||
</div>
|
||||
</div>
|
||||
</TabPane>
|
||||
<TabPane tab="监听器" key="listener">
|
||||
<TabPane tab="监听器" key="listener" :force-render="true">
|
||||
<UserTaskListener
|
||||
ref="userTaskListenerRef"
|
||||
v-model="configForm"
|
||||
|
|
|
@ -338,7 +338,6 @@ const handleDeploy = async () => {
|
|||
/** 步骤切换处理 */
|
||||
const handleStepClick = async (index: number) => {
|
||||
try {
|
||||
console.warn('handleStepClick', index);
|
||||
if (index !== 0) {
|
||||
await validateBasic();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue