From 9bd1252dd63316029baba4d9c4b387d3be7a8005 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 24 Sep 2025 20:45:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90antd=E3=80=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20bpmn-process-designer=20penal=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/flow-condition/FlowCondition.vue    |  6 +--
 .../package/penal/form/ElementForm.vue        |  2 +-
 .../penal/listeners/ElementListeners.vue      | 46 +++++++---------
 .../penal/listeners/ProcessListenerDialog.vue |  2 +-
 .../penal/listeners/UserTaskListeners.vue     | 31 +++++------
 .../multi-instance/ElementMultiInstance.vue   |  2 +-
 .../penal/properties/ElementProperties.vue    | 24 ++-------
 .../penal/signal-message/SignalAndMessage.vue | 54 +++++--------------
 .../package/penal/task/ElementTask.vue        |  2 +-
 .../task/task-components/CallActivity.vue     |  9 +---
 .../task/task-components/ReceiveTask.vue      |  2 +-
 .../penal/task/task-components/UserTask.vue   |  2 +-
 12 files changed, 59 insertions(+), 123 deletions(-)

diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/flow-condition/FlowCondition.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/flow-condition/FlowCondition.vue
index bd1ef7aa..3fb375b0 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/flow-condition/FlowCondition.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/flow-condition/FlowCondition.vue
@@ -153,11 +153,7 @@ watch(
 
 <template>
   <div class="panel-tab__content">
-    <Form
-      :model="flowConditionForm"
-      :label-col="{ span: 6 }"
-      :wrapper-col="{ span: 18 }"
-    >
+    <Form :model="flowConditionForm">
       <Form.Item label="流转类型">
         <Select v-model:value="flowConditionForm.type" @change="updateFlowType">
           <Select.Option value="normal">普通流转路径</Select.Option>
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/form/ElementForm.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/form/ElementForm.vue
index 5b907314..2041beaa 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/form/ElementForm.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/form/ElementForm.vue
@@ -305,7 +305,7 @@ watch(
 
 <template>
   <div class="panel-tab__content">
-    <Form :label-col="{ style: { width: '80px' } }">
+    <Form>
       <FormItem label="流程表单">
         <!--        <Input v-model:value="formKey" @change="updateElementFormKey" />-->
         <Select
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue
index 859642da..fc66c9b8 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue
@@ -309,12 +309,7 @@ watch(
       :width="width as any"
       :destroy-on-close="true"
     >
-      <Form
-        :model="listenerForm"
-        ref="listenerFormRef"
-        :label-col="{ span: 6 }"
-        :wrapper-col="{ span: 18 }"
-      >
+      <Form :model="listenerForm" ref="listenerFormRef">
         <FormItem
           label="事件类型"
           name="event"
@@ -462,20 +457,23 @@ watch(
         </template>
       </Form>
       <Divider />
-      <p class="listener-filed__title">
-        <span><IconifyIcon icon="ep:menu" />注入字段：</span>
-        <Button type="primary" @click="openListenerFieldForm(null, -1)">
+      <div class="mb-2 flex justify-between">
+        <span class="flex items-center">
+          <IconifyIcon icon="ep:menu" class="mr-2 text-gray-600" />
+          注入字段
+        </span>
+        <Button
+          type="primary"
+          title="添加字段"
+          @click="openListenerFieldForm(null, -1)"
+        >
+          <template #icon>
+            <IconifyIcon icon="ep:plus" />
+          </template>
           添加字段
         </Button>
-      </p>
-      <Table
-        :data-source="fieldsListOfListener"
-        size="small"
-        :scroll="{ y: 240 }"
-        :pagination="false"
-        bordered
-        style="flex: none"
-      >
+      </div>
+      <Table :data-source="fieldsListOfListener" size="small" bordered>
         <TableColumn title="序号" width="50px">
           <template #default="{ index }">
             {{ index + 1 }}
@@ -492,12 +490,12 @@ watch(
         />
         <TableColumn
           title="字段值/表达式"
-          width="100px"
+          width="120px"
           :custom-render="
             ({ record }: any) => record.string || record.expression
           "
         />
-        <TableColumn title="操作" width="130px">
+        <TableColumn title="操作" width="80px" fixed="right">
           <template #default="{ record, index }">
             <Button
               size="small"
@@ -532,13 +530,7 @@ watch(
       width="600px"
       :destroy-on-close="true"
     >
-      <Form
-        :model="listenerFieldForm"
-        ref="listenerFieldFormRef"
-        :label-col="{ span: 6 }"
-        :wrapper-col="{ span: 18 }"
-        style="height: 136px"
-      >
+      <Form :model="listenerFieldForm" ref="listenerFieldFormRef">
         <FormItem
           label="字段名称："
           name="name"
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
index 5bdb51c9..db9a33be 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
@@ -89,7 +89,7 @@ const select = async (row: BpmProcessListenerApi.ProcessListener) => {
           </template>
         </Table.Column>
         <Table.Column title="值" align="center" data-index="value" />
-        <Table.Column title="操作" align="center">
+        <Table.Column title="操作" align="center" fixed="right">
           <template #default="{ record }">
             <Button type="primary" @click="select(record)"> 选择 </Button>
           </template>
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
index 77e80912..bd67404a 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { inject, nextTick, ref, watch } from 'vue';
 
-import { MenuOutlined, PlusOutlined, SelectOutlined } from '@vben/icons';
+import { IconifyIcon, PlusOutlined, SelectOutlined } from '@vben/icons';
 import { cloneDeep } from '@vben/utils';
 
 import {
@@ -316,12 +316,7 @@ watch(
       :width="width"
       :destroy-on-close="true"
     >
-      <Form
-        :model="listenerForm"
-        :label-col="{ span: 8 }"
-        :wrapper-col="{ span: 16 }"
-        ref="listenerFormRef"
-      >
+      <Form :model="listenerForm" ref="listenerFormRef">
         <FormItem
           label="事件类型"
           name="event"
@@ -458,16 +453,22 @@ watch(
       </Form>
 
       <Divider />
-      <p class="listener-filed__title">
-        <span><MenuOutlined />注入字段：</span>
+      <div class="mb-2 flex justify-between">
+        <span class="flex items-center">
+          <IconifyIcon icon="ep:menu" class="mr-2 text-gray-600" />
+          注入字段
+        </span>
         <Button
-          size="small"
           type="primary"
+          title="添加字段"
           @click="openListenerFieldForm(null)"
         >
+          <template #icon>
+            <IconifyIcon icon="ep:plus" />
+          </template>
           添加字段
         </Button>
-      </p>
+      </div>
       <Table
         :data="fieldsListOfListener"
         size="small"
@@ -533,13 +534,7 @@ watch(
       :width="600"
       :destroy-on-close="true"
     >
-      <Form
-        :model="listenerFieldForm"
-        :label-col="{ span: 8 }"
-        :wrapper-col="{ span: 16 }"
-        ref="listenerFieldFormRef"
-        style="height: 136px"
-      >
+      <Form :model="listenerFieldForm" ref="listenerFieldFormRef">
         <FormItem
           label="字段名称："
           name="name"
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/multi-instance/ElementMultiInstance.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/multi-instance/ElementMultiInstance.vue
index e33d1086..600868b3 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/multi-instance/ElementMultiInstance.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/multi-instance/ElementMultiInstance.vue
@@ -421,7 +421,7 @@ watch(
     </RadioGroup>
     <div v-else>除了UserTask以外节点的多实例待实现</div>
     <!-- 与Simple设计器配置合并，保留以前的代码 -->
-    <Form :label-col="{ span: 6 }" style="display: none">
+    <Form style="display: none">
       <FormItem label="快捷配置">
         <Button size="small" @click="() => changeConfig('依次审批')">
           依次审批
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/properties/ElementProperties.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/properties/ElementProperties.vue
index 11dde6a4..26a4267f 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/properties/ElementProperties.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/properties/ElementProperties.vue
@@ -161,25 +161,15 @@ watch(
 
 <template>
   <div class="panel-tab__content">
-    <Table :data="elementPropertyList" :scroll="{ y: 240 }" bordered>
+    <Table :data="elementPropertyList" size="small" bordered>
       <TableColumn title="序号" width="50">
         <template #default="{ index }">
           {{ index + 1 }}
         </template>
       </TableColumn>
-      <TableColumn
-        title="属性名"
-        data-index="name"
-        :min-width="100"
-        :ellipsis="{ showTitle: true }"
-      />
-      <TableColumn
-        title="属性值"
-        data-index="value"
-        :min-width="100"
-        :ellipsis="{ showTitle: true }"
-      />
-      <TableColumn title="操作" width="110">
+      <TableColumn title="属性名" data-index="name" />
+      <TableColumn title="属性值" data-index="value" />
+      <TableColumn title="操作">
         <template #default="{ record, index }">
           <Button
             type="link"
@@ -215,11 +205,7 @@ watch(
       :width="600"
       :destroy-on-close="true"
     >
-      <Form
-        :model="propertyForm"
-        ref="attributeFormRef"
-        :label-col="{ span: 6 }"
-      >
+      <Form :model="propertyForm" ref="attributeFormRef">
         <FormItem label="属性名：" name="name">
           <Input v-model:value="propertyForm.name" allow-clear />
         </FormItem>
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/signal-message/SignalAndMessage.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/signal-message/SignalAndMessage.vue
index df06d928..ad28bf71 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/signal-message/SignalAndMessage.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/signal-message/SignalAndMessage.vue
@@ -84,8 +84,8 @@ onMounted(() => {
 <template>
   <div class="panel-tab__content">
     <div class="panel-tab__content--title">
-      <span>
-        <IconifyIcon icon="ep:menu" style="margin-right: 8px; color: #555" />
+      <span class="flex items-center">
+        <IconifyIcon icon="ep:menu" class="mr-2 text-gray-600" />
         消息列表
       </span>
       <Button type="primary" title="创建新消息" @click="openModel('message')">
@@ -95,33 +95,19 @@ onMounted(() => {
         创建新消息
       </Button>
     </div>
-    <Table :data-source="messageList" :bordered="true" :pagination="false">
+    <Table :data-source="messageList" size="small" bordered>
       <TableColumn title="序号" width="60px">
         <template #default="{ index }">
           {{ index + 1 }}
         </template>
       </TableColumn>
-      <TableColumn
-        title="消息ID"
-        data-index="id"
-        :width="300"
-        :ellipsis="{ showTitle: true }"
-      />
-      <TableColumn
-        title="消息名称"
-        data-index="name"
-        :width="300"
-        :ellipsis="{ showTitle: true }"
-      />
+      <TableColumn title="消息ID" data-index="id" />
+      <TableColumn title="消息名称" data-index="name" />
     </Table>
-    <div
-      class="panel-tab__content--title"
-      style="padding-top: 8px; margin-top: 8px; border-top: 1px solid #eee"
-    >
-      <span>
-        <IconifyIcon icon="ep:menu" style="margin-right: 8px; color: #555">
-          信号列表
-        </IconifyIcon>
+    <div class="panel-tab__content--title mt-2 border-t border-gray-200 pt-2">
+      <span class="flex items-center">
+        <IconifyIcon icon="ep:menu" class="mr-2 text-gray-600" />
+        信号列表
       </span>
       <Button type="primary" title="创建新信号" @click="openModel('signal')">
         <template #icon>
@@ -130,24 +116,14 @@ onMounted(() => {
         创建新信号
       </Button>
     </div>
-    <Table :data-source="signalList" :bordered="true" :pagination="false">
+    <Table :data-source="signalList" size="small" bordered>
       <TableColumn title="序号" width="60px">
         <template #default="{ index }">
           {{ index + 1 }}
         </template>
       </TableColumn>
-      <TableColumn
-        title="信号ID"
-        data-index="id"
-        :width="300"
-        :ellipsis="{ showTitle: true }"
-      />
-      <TableColumn
-        title="信号名称"
-        data-index="name"
-        :width="300"
-        :ellipsis="{ showTitle: true }"
-      />
+      <TableColumn title="信号ID" data-index="id" />
+      <TableColumn title="信号名称" data-index="name" />
     </Table>
 
     <Modal
@@ -157,11 +133,7 @@ onMounted(() => {
       width="400px"
       :destroy-on-close="true"
     >
-      <Form
-        :model="modelObjectForm"
-        :label-col="{ span: 9 }"
-        :wrapper-col="{ span: 15 }"
-      >
+      <Form :model="modelObjectForm">
         <FormItem :label="modelConfig.idLabel">
           <Input v-model:value="modelObjectForm.id" allow-clear />
         </FormItem>
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/ElementTask.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/ElementTask.vue
index d3294b5a..b2ea9bd2 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/ElementTask.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/ElementTask.vue
@@ -63,7 +63,7 @@ watch(
 
 <template>
   <div class="panel-tab__content">
-    <Form :label-col="{ span: 9 }" :wrapper-col="{ span: 15 }">
+    <Form>
       <!-- add by 芋艿：由于「异步延续」暂时用不到，所以这里 display 为 none -->
       <FormItem label="异步延续" style="display: none">
         <Checkbox
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/CallActivity.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/CallActivity.vue
index b69680b1..528cd601 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/CallActivity.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/CallActivity.vue
@@ -180,7 +180,7 @@ watch(
 
 <template>
   <div>
-    <Form :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
+    <Form>
       <FormItem label="实例名称">
         <Input
           v-model:value="formData.processInstanceName"
@@ -341,12 +341,7 @@ watch(
       @ok="saveVariable"
       @cancel="variableDialogVisible = false"
     >
-      <Form
-        :model="varialbeFormData"
-        :label-col="{ span: 6 }"
-        :wrapper-col="{ span: 18 }"
-        ref="varialbeFormRef"
-      >
+      <Form :model="varialbeFormData" ref="varialbeFormRef">
         <FormItem label="源：" name="source">
           <Input v-model:value="varialbeFormData.source" allow-clear />
         </FormItem>
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue
index aafeca53..12e2204c 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue
@@ -143,7 +143,7 @@ watch(
       width="400px"
       :destroy-on-close="true"
     >
-      <Form :model="newMessageForm" size="small" :label-col="{ span: 6 }">
+      <Form :model="newMessageForm" size="small">
         <Form.Item label="消息ID">
           <Input v-model:value="newMessageForm.id" allow-clear />
         </Form.Item>
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue
index 81347a18..90d23db5 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue
@@ -344,7 +344,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <Form :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
+  <Form>
     <FormItem label="规则类型" name="candidateStrategy">
       <Select
         v-model:value="userTaskForm.candidateStrategy"