From 6606dfd40a6b941392f4504b7a955b15610fe58a Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Mon, 29 Dec 2025 00:09:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20[bpm][ele]=20todo=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nodes-config/condition-node-config.vue      | 2 +-
 .../components/nodes-config/trigger-node-config.vue        | 2 +-
 .../components/nodes-config/condition-node-config.vue      | 1 -
 .../components/nodes-config/modules/condition.vue          | 2 +-
 .../components/nodes-config/trigger-node-config.vue        | 1 -
 .../src/views/bpm/model/form/modules/extra-setting.vue     | 6 +++---
 .../bpm/processInstance/detail/modules/bpm-viewer.vue      | 7 +++----
 .../processInstance/detail/modules/operation-button.vue    | 3 +--
 8 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue
index 2ccd91699..bd7c9e80b 100644
--- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue
+++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue
@@ -158,7 +158,7 @@ function changeNodeName() {
 defineExpose({ open }); // 提供 open 方法，用于打开弹窗
 </script>
 <template>
-  <Drawer class="w-1/3">
+  <Drawer class="w-2/5">
     <template #title>
       <div class="flex items-center">
         <Input
diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index 421fce968..81b3650bc 100644
--- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -383,7 +383,7 @@ onMounted(() => {
 });
 </script>
 <template>
-  <Drawer class="w-1/3">
+  <Drawer class="w-2/5">
     <template #title>
       <div class="config-header">
         <Input
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue
index 6ea32ca63..d51eb5722 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue
@@ -158,7 +158,6 @@ function changeNodeName() {
 defineExpose({ open }); // 提供 open 方法，用于打开弹窗
 </script>
 <template>
-  <!-- TODO @jason：antd 是 1/3，这里要统一么？ -->
   <Drawer class="w-2/5">
     <template #title>
       <div class="flex items-center">
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/condition.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/condition.vue
index c2812f4a9..88171bc54 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/condition.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/condition.vue
@@ -40,7 +40,7 @@ defineOptions({
 const props = defineProps({
   modelValue: {
     type: Object,
-    // TODO @jason：这里 required: false,
+    required: false,
     default: () => ({}),
   },
 });
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index 105b53ff6..916edce29 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -383,7 +383,6 @@ onMounted(() => {
 });
 </script>
 <template>
-  <!-- TODO @jason：antd 这里是 1/3，需要保持一致么？ -->
   <Drawer class="w-2/5">
     <template #title>
       <div class="config-header">
diff --git a/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue b/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue
index 248b6d0f1..99f0c1e3a 100644
--- a/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue
+++ b/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue
@@ -30,12 +30,12 @@ import {
 } from 'element-plus';
 
 import { getForm } from '#/api/bpm/form';
+import { parseFormFields } from '#/components/form-create';
 // TODO @jason：这里要迁移下么？
 // import {
 //   HttpRequestSetting,
 //   parseFormFields,
 // } from '#/views/bpm/components/simple-process-design';
-import { parseFormFields } from '#/components/form-create';
 
 import PrintTemplate from './custom-print-template.vue';
 
@@ -516,11 +516,11 @@ defineExpose({ initData, validate });
       </ElRow>
       <ElRow v-if="processBeforeTriggerEnable">
         <ElCol :span="24" class="mt-6">
-          <!-- <HttpRequestSetting
+          <HttpRequestSetting
             v-model:setting="modelData.processBeforeTriggerSetting"
             :response-enable="true"
             form-item-prefix="processBeforeTriggerSetting"
-          /> -->
+          />
         </ElCol>
       </ElRow>
     </ElFormItem>
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue
index e69a06ab4..0055df174 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
 
-// TODO @jason：这个貌似暂时还没迁移的样子？
-// import { MyProcessViewer } from '#/views/bpm/components/bpmn-process-designer/package';
+import { MyProcessViewer } from '#/views/bpm/components/bpmn-process-designer/package';
 
 defineOptions({ name: 'ProcessInstanceBpmnViewer' });
 
@@ -50,11 +49,11 @@ watch(
     v-loading="loading"
     class="h-full w-full overflow-auto rounded-lg border border-gray-200 bg-white p-4"
   >
-    <!-- <MyProcessViewer
+    <MyProcessViewer
       key="processViewer"
       :xml="view.bpmnXml"
       :view="view"
       class="h-full min-h-[500px] w-full"
-    /> -->
+    />
   </div>
 </template>
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
index 4fbb1e2bf..28f1fe4a2 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -275,8 +275,7 @@ async function openPopover(type: string) {
     }
   }
   Object.keys(popOverVisible.value).forEach((item) => {
-    // TODO @jason：这里是不是保持和 antd 一致？
-    popOverVisible.value[item] = item === type;
+    if (popOverVisible.value[item]) popOverVisible.value[item] = item === type;
   });
 }
 

From 2ba2c8e9869635373e502dea994a85b3a6f6a305 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Mon, 29 Dec 2025 11:51:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20[bpm]=20[ele,antd]=20todo=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96,=20=E6=9B=B4=E5=A4=9A=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bpm/model/form/index.vue        |  2 +-
 .../bpm/model/form/modules/extra-setting.vue  |  6 +-
 .../modules/http-request-param-setting.vue    |  4 +-
 .../modules/http-request-setting.vue          |  6 +-
 .../src/views/bpm/model/form/index.vue        |  2 +-
 .../form/modules/custom-print-template.vue    |  4 +-
 .../bpm/model/form/modules/extra-setting.vue  | 82 +++++++++----------
 7 files changed, 53 insertions(+), 53 deletions(-)

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 49e9e8999..8ac2c8dd3 100644
--- a/apps/web-antd/src/views/bpm/model/form/index.vue
+++ b/apps/web-antd/src/views/bpm/model/form/index.vue
@@ -497,7 +497,7 @@ onBeforeUnmount(() => {
           />
 
           <!-- 第四步：更多设置 -->
-          <div v-if="currentStep === 3" class="mx-auto w-4/6">
+          <div v-show="currentStep === 3" class="mx-auto w-4/6">
             <ExtraSetting v-model="formData" ref="extraSettingRef" />
           </div>
         </div>
diff --git a/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue b/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue
index 166e51382..18ae5c1bd 100644
--- a/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue
@@ -29,10 +29,8 @@ import {
 import dayjs from 'dayjs';
 
 import { getForm } from '#/api/bpm/form';
-import {
-  HttpRequestSetting,
-  parseFormFields,
-} from '#/views/bpm/components/simple-process-design';
+import { parseFormFields } from '#/components/form-create';
+import { HttpRequestSetting } from '#/views/bpm/components/simple-process-design';
 
 import PrintTemplate from './custom-print-template.vue';
 
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
index c8501824c..5a20d14aa 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
@@ -54,7 +54,7 @@ function deleteHttpRequestParam(arr: HttpRequestParam[], index: number) {
 }
 </script>
 <template>
-  <ElFormItem label="请求头">
+  <ElFormItem label="请求头" label-position="top">
     <div
       v-for="(item, index) in props.header"
       :key="index"
@@ -144,7 +144,7 @@ function deleteHttpRequestParam(arr: HttpRequestParam[], index: number) {
       添加一行
     </ElButton>
   </div>
-  <ElFormItem label="请求体">
+  <ElFormItem label="请求体" label-position="top">
     <div
       v-for="(item, index) in props.body"
       :key="index"
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-setting.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-setting.vue
index 2446effd2..156117476 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-setting.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/modules/http-request-setting.vue
@@ -65,7 +65,7 @@ function deleteHttpResponseSetting(
 }
 </script>
 <template>
-  <ElFormItem>
+  <ElFormItem label-position="top">
     <ElAlert
       title="仅支持 POST 请求，以请求体方式接收参数"
       type="warning"
@@ -75,6 +75,7 @@ function deleteHttpResponseSetting(
   </ElFormItem>
   <!-- 请求地址-->
   <ElFormItem
+    label-position="top"
     label="请求地址"
     :prop="`${formItemPrefix}.url`"
     :rules="{
@@ -93,7 +94,7 @@ function deleteHttpResponseSetting(
   />
   <!-- 返回值设置-->
   <div v-if="responseEnable">
-    <ElFormItem label="返回值">
+    <ElFormItem label="返回值" label-position="top">
       <ElAlert
         title="通过请求返回值, 可以修改流程表单的值"
         type="warning"
@@ -101,6 +102,7 @@ function deleteHttpResponseSetting(
         :closable="false"
       />
     </ElFormItem>
+    <!-- todo jason 更多设置排版需要优化一下-->
     <ElRow
       :gutter="8"
       v-for="(item, index) in setting.response"
diff --git a/apps/web-ele/src/views/bpm/model/form/index.vue b/apps/web-ele/src/views/bpm/model/form/index.vue
index 25201f4d4..3a73cae10 100644
--- a/apps/web-ele/src/views/bpm/model/form/index.vue
+++ b/apps/web-ele/src/views/bpm/model/form/index.vue
@@ -497,7 +497,7 @@ onBeforeUnmount(() => {
           />
 
           <!-- 第四步：更多设置 -->
-          <div v-if="currentStep === 3" class="mx-auto w-4/6">
+          <div v-show="currentStep === 3" class="mx-auto w-4/6">
             <ExtraSetting v-model="formData" ref="extraSettingRef" />
           </div>
         </div>
diff --git a/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue b/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue
index 3a75ed61d..0f5821523 100644
--- a/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue
+++ b/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue
@@ -102,8 +102,8 @@ onBeforeUnmount(() => {
   <Modal class="w-3/4" title="自定义模板">
     <div class="mb-3">
       <ElAlert
-        message="输入 @ 可选择插入流程选项和表单选项"
-        type="info"
+        title="输入 @ 可选择插入流程选项和表单选项"
+        type="primary"
         show-icon
       />
     </div>
diff --git a/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue b/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue
index 99f0c1e3a..853ea5427 100644
--- a/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue
+++ b/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue
@@ -31,11 +31,7 @@ import {
 
 import { getForm } from '#/api/bpm/form';
 import { parseFormFields } from '#/components/form-create';
-// TODO @jason：这里要迁移下么？
-// import {
-//   HttpRequestSetting,
-//   parseFormFields,
-// } from '#/views/bpm/components/simple-process-design';
+import { HttpRequestSetting } from '#/views/bpm/components/simple-process-design';
 
 import PrintTemplate from './custom-print-template.vue';
 
@@ -514,16 +510,17 @@ defineExpose({ initData, validate });
           </div>
         </ElCol>
       </ElRow>
-      <ElRow v-if="processBeforeTriggerEnable">
-        <ElCol :span="24" class="mt-6">
-          <HttpRequestSetting
-            v-model:setting="modelData.processBeforeTriggerSetting"
-            :response-enable="true"
-            form-item-prefix="processBeforeTriggerSetting"
-          />
-        </ElCol>
-      </ElRow>
     </ElFormItem>
+    <ElRow v-if="processBeforeTriggerEnable">
+      <ElCol :span="2" />
+      <ElCol :span="22" class="mt-2">
+        <HttpRequestSetting
+          v-model:setting="modelData.processBeforeTriggerSetting"
+          :response-enable="true"
+          form-item-prefix="processBeforeTriggerSetting"
+        />
+      </ElCol>
+    </ElRow>
     <ElFormItem class="mb-5" label="流程后置通知">
       <ElRow class="mt-1">
         <ElCol :span="24">
@@ -536,16 +533,17 @@ defineExpose({ initData, validate });
           </div>
         </ElCol>
       </ElRow>
-      <ElRow v-if="processAfterTriggerEnable" class="mt-2">
-        <ElCol :span="24">
-          <HttpRequestSetting
-            v-model:setting="modelData.processAfterTriggerSetting"
-            :response-enable="true"
-            form-item-prefix="processAfterTriggerSetting"
-          />
-        </ElCol>
-      </ElRow>
     </ElFormItem>
+    <ElRow v-if="processAfterTriggerEnable" class="mt-1">
+      <ElCol :span="2" />
+      <ElCol :span="22">
+        <HttpRequestSetting
+          v-model:setting="modelData.processAfterTriggerSetting"
+          :response-enable="true"
+          form-item-prefix="processAfterTriggerSetting"
+        />
+      </ElCol>
+    </ElRow>
     <ElFormItem class="mb-5" label="任务前置通知">
       <ElRow class="mt-1">
         <ElCol :span="24">
@@ -558,16 +556,17 @@ defineExpose({ initData, validate });
           </div>
         </ElCol>
       </ElRow>
-      <ElRow v-if="taskBeforeTriggerEnable" class="mt-2">
-        <ElCol :span="24">
-          <HttpRequestSetting
-            v-model:setting="modelData.taskBeforeTriggerSetting"
-            :response-enable="true"
-            form-item-prefix="taskBeforeTriggerSetting"
-          />
-        </ElCol>
-      </ElRow>
     </ElFormItem>
+    <ElRow v-if="taskBeforeTriggerEnable" class="mt-1">
+      <ElCol :span="2" />
+      <ElCol :span="22">
+        <HttpRequestSetting
+          v-model:setting="modelData.taskBeforeTriggerSetting"
+          :response-enable="true"
+          form-item-prefix="taskBeforeTriggerSetting"
+        />
+      </ElCol>
+    </ElRow>
     <ElFormItem class="mb-5" label="任务后置通知">
       <ElRow class="mt-1">
         <ElCol :span="24">
@@ -580,16 +579,17 @@ defineExpose({ initData, validate });
           </div>
         </ElCol>
       </ElRow>
-      <ElRow v-if="taskAfterTriggerEnable" class="mt-2">
-        <ElCol :span="24">
-          <HttpRequestSetting
-            v-model:setting="modelData.taskAfterTriggerSetting"
-            :response-enable="true"
-            form-item-prefix="taskAfterTriggerSetting"
-          />
-        </ElCol>
-      </ElRow>
     </ElFormItem>
+    <ElRow v-if="taskAfterTriggerEnable" class="mt-1">
+      <ElCol :span="2" />
+      <ElCol :span="22">
+        <HttpRequestSetting
+          v-model:setting="modelData.taskAfterTriggerSetting"
+          :response-enable="true"
+          form-item-prefix="taskAfterTriggerSetting"
+        />
+      </ElCol>
+    </ElRow>
     <ElFormItem class="mb-5" label="自定义打印模板">
       <div class="flex w-full flex-col">
         <div class="flex items-center">