From 54d1471d435a675f823e4ab3c09a24f69f76aa7b Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Thu, 29 May 2025 08:51:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[BPM=20=E5=B7=A5=E4=BD=9C=E6=B5=81]?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9=E4=BA=BA=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/http-request-param-setting.vue    | 20 +++++++++----------
 .../modules/user-task-listener.vue            |  2 +-
 .../nodes-config/user-task-node-config.vue    | 16 +++++++++------
 .../src/views/bpm/model/form/index.vue        |  1 -
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
index 1561f7aca..6f18a06dc 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
@@ -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: '参数值不能为空',
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue
index 159c71c03..e071c6d82 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue
@@ -89,7 +89,7 @@ defineExpose({ validate });
           :rules="{
             required: true,
             message: '请求地址不能为空',
-            trigger: 'blur',
+            trigger: ['blur', 'change'],
           }"
         >
           <Input
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue
index dd2693bc1..d76b00ed8 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue
@@ -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"
diff --git a/apps/web-antd/src/views/bpm/model/form/index.vue b/apps/web-antd/src/views/bpm/model/form/index.vue
index 2c2f61fbb..79a698c8e 100644
--- a/apps/web-antd/src/views/bpm/model/form/index.vue
+++ b/apps/web-antd/src/views/bpm/model/form/index.vue
@@ -338,7 +338,6 @@ const handleDeploy = async () => {
 /** 步骤切换处理 */
 const handleStepClick = async (index: number) => {
   try {
-    console.warn('handleStepClick', index);
     if (index !== 0) {
       await validateBasic();
     }