From 981191de058069ea5b6018054adeff4fa47ee68d Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Tue, 10 Jun 2025 15:54:06 +0800
Subject: [PATCH 01/14] =?UTF-8?q?fix:=20[BPM=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?]=20-=20=E6=B5=81=E7=A8=8B=E5=88=97=E8=A1=A8=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/bpm/model/index.vue              | 4 ++--
 .../views/bpm/model/modules/category-draggable-model.vue | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/model/index.vue b/apps/web-antd/src/views/bpm/model/index.vue
index 3259ae92b..882cae7cb 100644
--- a/apps/web-antd/src/views/bpm/model/index.vue
+++ b/apps/web-antd/src/views/bpm/model/index.vue
@@ -178,13 +178,13 @@ async function handleCategorySortSubmit() {
           <template #overlay>
             <Menu @click="(e) => handleCommand(e.key as string)">
               <Menu.Item key="handleCategoryAdd">
-                <div class="flex items-center">
+                <div class="flex items-center gap-1">
                   <IconifyIcon icon="lucide:plus" />
                   新建分类
                 </div>
               </Menu.Item>
               <Menu.Item key="handleCategorySort">
-                <div class="flex items-center">
+                <div class="flex items-center gap-1">
                   <IconifyIcon icon="lucide:align-start-vertical" />
                   分类排序
                 </div>
diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
index 3e96a6c65..f8be5aaba 100644
--- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
+++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
@@ -4,7 +4,7 @@ import type { BpmModelApi, ModelCategoryInfo } from '#/api/bpm/model';
 import { computed, ref, watchEffect } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { confirm, useVbenModal } from '@vben/common-ui';
+import { confirm, EllipsisText, useVbenModal } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
 import { useUserStore } from '@vben/stores';
 import { cloneDeep, formatDateTime, isEqual } from '@vben/utils';
@@ -73,8 +73,7 @@ const columns = [
     dataIndex: 'name',
     key: 'name',
     align: 'left' as const,
-    ellipsis: true,
-    width: 230,
+    width: 250,
   },
   {
     title: '可见范围',
@@ -486,7 +485,9 @@ const handleRenameSuccess = () => {
                     class="mr-2.5 h-9 w-9 rounded"
                     alt="图标"
                   />
-                  {{ record.name }}
+                  <EllipsisText :max-width="160" :tooltip-when-ellipsis="true">
+                    {{ record.name }}
+                  </EllipsisText>
                 </div>
               </template>
 

From c23de9250382fbb9da5a8504ba715f77db3b7115 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Tue, 10 Jun 2025 16:56:59 +0800
Subject: [PATCH 02/14] =?UTF-8?q?feat:=20[BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81]=20-=20=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/category-draggable-model.vue      | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
index f8be5aaba..87625d2bc 100644
--- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
+++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
@@ -33,10 +33,12 @@ import {
 } from '#/api/bpm/model';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
-import { DICT_TYPE } from '#/utils';
+import { BpmModelFormType, DICT_TYPE } from '#/utils';
 
 // 导入重命名表单
 import CategoryRenameForm from '../../category/modules/rename-form.vue';
+// 导入 FormCreate 表单详情
+import FormCreateDetail from '../../form/modules/detail.vue';
 
 const props = defineProps<{
   categoryInfo: ModelCategoryInfo;
@@ -45,12 +47,18 @@ const props = defineProps<{
 
 const emit = defineEmits(['success']);
 
-// 重命名分类对话框
+/** 重命名分类对话框 */
 const [CategoryRenameModal, categoryRenameModalApi] = useVbenModal({
   connectedComponent: CategoryRenameForm,
   destroyOnClose: true,
 });
 
+/** 流程表单详情对话框 */
+const [FormCreateDetailModal, formCreateDetailModalApi] = useVbenModal({
+  connectedComponent: FormCreateDetail,
+  destroyOnClose: true,
+});
+
 const router = useRouter();
 // 获取当前登录用户Id
 const userStore = useUserStore();
@@ -192,8 +200,15 @@ async function handleDeleteCategory() {
 
 /** 处理表单详情点击 */
 function handleFormDetail(row: any) {
-  // TODO 待实现
-  console.warn('待实现', row);
+  if (row.formType === BpmModelFormType.NORMAL) {
+    const data = {
+      id: row.formId,
+    };
+    formCreateDetailModalApi.setData(data).open();
+  } else {
+    // TODO 待实现
+    console.warn('业务表单待实现', row);
+  }
 }
 
 /** 判断是否是流程管理员 */
@@ -544,7 +559,7 @@ const handleRenameSuccess = () => {
               <template v-else-if="column.key === 'formType'">
                 <!-- TODO BpmModelFormType.NORMAL -->
                 <Button
-                  v-if="record.formType === 10"
+                  v-if="record.formType === BpmModelFormType.NORMAL"
                   type="link"
                   @click="handleFormDetail(record)"
                 >
@@ -552,7 +567,7 @@ const handleRenameSuccess = () => {
                 </Button>
                 <!-- TODO BpmModelFormType.CUSTOM -->
                 <Button
-                  v-else-if="record.formType === 20"
+                  v-else-if="record.formType === BpmModelFormType.CUSTOM"
                   type="link"
                   @click="handleFormDetail(record)"
                 >
@@ -658,6 +673,8 @@ const handleRenameSuccess = () => {
 
     <!-- 重命名分类弹窗 -->
     <CategoryRenameModal @success="handleRenameSuccess" />
+    <!-- 流程表单详情对话框 -->
+    <FormCreateDetailModal />
   </div>
 </template>
 

From 47c4931fe1e08225ecdf6ad9bc2244ba4bcd8948 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Tue, 10 Jun 2025 17:17:55 +0800
Subject: [PATCH 03/14] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/system/dict/data.ts     |  9 +++++++++
 .../system/role/modules/assign-menu-form.vue    | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts
index d116f0d28..28586f169 100644
--- a/apps/web-antd/src/views/system/dict/data.ts
+++ b/apps/web-antd/src/views/system/dict/data.ts
@@ -76,6 +76,15 @@ export function useTypeGridFormSchema(): VbenFormSchema[] {
         clearable: true,
       },
     },
+    {
+      fieldName: 'type',
+      label: '字典类型',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入字典类型',
+        clearable: true,
+      },
+    },
     {
       fieldName: 'status',
       label: '状态',
diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
index b4a07b98a..d5ebd483a 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { Recordable } from '@vben/types';
+
 import type { SystemDeptApi } from '#/api/system/dept';
 import type { SystemRoleApi } from '#/api/system/role';
 
@@ -13,6 +15,7 @@ import { useVbenForm } from '#/adapter/form';
 import { getMenuList } from '#/api/system/menu';
 import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission';
 import { $t } from '#/locales';
+import { SystemMenuTypeEnum } from '#/utils';
 
 import { useAssignMenuFormSchema } from '../data';
 
@@ -121,6 +124,18 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   });
   return ids;
 }
+
+function getNodeClass(node: Recordable<any>) {
+  const classes: string[] = [];
+  if (node.value?.type === SystemMenuTypeEnum.BUTTON) {
+    classes.push('inline-flex');
+    if (node.index % 3 >= 1) {
+      classes.push('!pl-0');
+    }
+  }
+
+  return classes.join(' ');
+}
 </script>
 
 <template>
@@ -134,9 +149,11 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
           multiple
           bordered
           :expanded="expandedKeys"
+          :get-node-class="getNodeClass"
           v-bind="slotProps"
           value-field="id"
           label-field="name"
+          icon-field="meta.icon"
         />
       </template>
     </Form>

From f0585cebf7333396313a5586954dad1fad634901 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Tue, 10 Jun 2025 22:35:38 +0800
Subject: [PATCH 04/14] =?UTF-8?q?feat:=20[BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81]=20-=20=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/router/routes/modules/bpm.ts |  12 ++
 .../src/views/bpm/model/definition/data.ts    |  65 ++++++++
 .../src/views/bpm/model/definition/index.vue  | 157 ++++++++++++++++++
 .../modules/category-draggable-model.vue      |  17 +-
 4 files changed, 248 insertions(+), 3 deletions(-)
 create mode 100644 apps/web-antd/src/views/bpm/model/definition/data.ts
 create mode 100644 apps/web-antd/src/views/bpm/model/definition/index.vue

diff --git a/apps/web-antd/src/router/routes/modules/bpm.ts b/apps/web-antd/src/router/routes/modules/bpm.ts
index 0287c1749..5fc572eb2 100644
--- a/apps/web-antd/src/router/routes/modules/bpm.ts
+++ b/apps/web-antd/src/router/routes/modules/bpm.ts
@@ -86,6 +86,18 @@ const routes: RouteRecordRaw[] = [
           keepAlive: true,
         },
       },
+      {
+        path: 'manager/definition',
+        component: () => import('#/views/bpm/model/definition/index.vue'),
+        name: 'BpmProcessDefinition',
+        meta: {
+          title: '流程定义',
+          activePath: '/bpm/manager/model',
+          icon: 'carbon:flow-modeler',
+          hideInMenu: true,
+          keepAlive: true,
+        },
+      },
     ],
   },
 ];
diff --git a/apps/web-antd/src/views/bpm/model/definition/data.ts b/apps/web-antd/src/views/bpm/model/definition/data.ts
new file mode 100644
index 000000000..7a6d93727
--- /dev/null
+++ b/apps/web-antd/src/views/bpm/model/definition/data.ts
@@ -0,0 +1,65 @@
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { BpmProcessDefinitionApi } from '#/api/bpm/definition';
+
+import { DICT_TYPE } from '#/utils';
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<BpmProcessDefinitionApi.ProcessDefinitionVO>['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '定义编号',
+      minWidth: 250,
+    },
+    {
+      field: 'name',
+      title: '流程名称',
+      minWidth: 150,
+    },
+    {
+      field: 'icon',
+      title: '流程图标',
+      minWidth: 100,
+      slots: { default: 'icon' },
+    },
+    {
+      field: 'startUsers',
+      title: '可见范围',
+      minWidth: 100,
+      slots: { default: 'startUsers' },
+    },
+    {
+      field: 'modelType',
+      title: '流程类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.BPM_MODEL_TYPE },
+      },
+    },
+    {
+      field: 'formType',
+      title: '表单信息',
+      minWidth: 150,
+      slots: { default: 'formInfo' },
+    },
+    {
+      field: 'version',
+      title: '流程版本',
+      minWidth: 80,
+      slots: { default: 'version' },
+    },
+    {
+      field: 'deploymentTime',
+      title: '部署时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 120,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/bpm/model/definition/index.vue b/apps/web-antd/src/views/bpm/model/definition/index.vue
new file mode 100644
index 000000000..1555abed9
--- /dev/null
+++ b/apps/web-antd/src/views/bpm/model/definition/index.vue
@@ -0,0 +1,157 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+
+import { onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+import { Page, useVbenModal } from '@vben/common-ui';
+
+import { Button, Image, Tag, Tooltip } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProcessDefinitionPage } from '#/api/bpm/definition';
+import { DocAlert } from '#/components/doc-alert';
+import { BpmModelFormType } from '#/utils/constants';
+
+// 导入 FormCreate 表单详情
+import FormCreateDetail from '../../form/modules/detail.vue';
+import { useGridColumns } from './data';
+
+defineOptions({ name: 'BpmProcessDefinition' });
+
+const [FormCreateDetailModal, formCreateDetailModalApi] = useVbenModal({
+  connectedComponent: FormCreateDetail,
+  destroyOnClose: true,
+});
+
+/** 查看表单详情 */
+function handleFormDetail(row: any) {
+  if (row.formType === BpmModelFormType.NORMAL) {
+    const data = {
+      id: row.formId,
+    };
+    formCreateDetailModalApi.setData(data).open();
+  } else {
+    // TODO 待实现
+    console.warn('业务表单待实现', row);
+  }
+}
+
+const router = useRouter();
+/** 恢复流程模型 */
+async function openModelForm(id?: number) {
+  await router.push({
+    name: 'BpmModelUpdate',
+    params: { id, type: 'definition' },
+  });
+}
+
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
+const route = useRoute();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    pagerConfig: {
+      enabled: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          const params = {
+            pageNo: page?.currentPage,
+            pageSize: page?.pageSize,
+            key: route.query.key,
+          };
+          return await getProcessDefinitionPage(params);
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+    },
+  } as VxeTableGridOptions,
+});
+
+/** 初始化 */
+onMounted(() => {
+  onRefresh();
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert title="工作流手册" url="https://doc.iocoder.cn/bpm/" />
+    </template>
+    <Grid table-title="流程定义列表">
+      <template #icon="{ row }">
+        <Image
+          v-if="row.icon"
+          :src="row.icon"
+          :width="24"
+          :height="24"
+          class="rounded"
+        />
+        <span v-else> 无图标 </span>
+      </template>
+      <template #startUsers="{ row }">
+        <template v-if="!row.startUsers?.length">全部可见</template>
+        <template v-else-if="row.startUsers.length === 1">
+          {{ row.startUsers[0].nickname }}
+        </template>
+        <template v-else>
+          <Tooltip
+            placement="top"
+            :title="row.startUsers.map((user: any) => user.nickname).join(',')"
+          >
+            {{ row.startUsers[0].nickname }}等
+            {{ row.startUsers.length }} 人可见
+          </Tooltip>
+        </template>
+      </template>
+      <template #formInfo="{ row }">
+        <Button
+          v-if="row.formType === BpmModelFormType.NORMAL"
+          type="link"
+          @click="handleFormDetail(row)"
+        >
+          <span>{{ row.formName }}</span>
+        </Button>
+        <Button
+          v-else-if="row.formType === BpmModelFormType.CUSTOM"
+          type="link"
+          @click="handleFormDetail(row)"
+        >
+          <span>{{ row.formCustomCreatePath }}</span>
+        </Button>
+        <span v-else>暂无表单</span>
+      </template>
+      <template #version="{ row }">
+        <Tag>v{{ row.version }}</Tag>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '恢复',
+              type: 'link',
+              auth: ['bpm:model:update'],
+              onClick: openModelForm.bind(null, row.id),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+    <FormCreateDetailModal />
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
index 87625d2bc..a246badf0 100644
--- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
+++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
@@ -257,7 +257,7 @@ function handleModelCommand(command: string, row: any) {
       break;
     }
     case 'handleDefinitionList': {
-      console.warn('历史待实现', row);
+      handleDefinitionList(row);
       break;
     }
     case 'handleDelete': {
@@ -331,6 +331,16 @@ function handleDelete(row: any) {
   });
 }
 
+/** 跳转到指定流程定义列表 */
+function handleDefinitionList(row: any) {
+  router.push({
+    name: 'BpmProcessDefinition',
+    query: {
+      key: row.key,
+    },
+  });
+}
+
 /** 更新 modelList 模型列表 */
 const updateModelList = useDebounceFn(() => {
   const newModelList = props.categoryInfo.modelList;
@@ -620,7 +630,6 @@ const handleRenameSuccess = () => {
                   </Button>
                   <Dropdown placement="bottomRight" arrow>
                     <Button type="link" size="small" class="px-1">更多</Button>
-                    <!-- TODO 待实现 -->
                     <template #overlay>
                       <Menu
                         @click="
@@ -629,12 +638,14 @@ const handleRenameSuccess = () => {
                       >
                         <Menu.Item key="handleCopy"> 复制 </Menu.Item>
                         <Menu.Item key="handleDefinitionList"> 历史 </Menu.Item>
+
+                        <!-- TODO 待实现报表
                         <Menu.Item
                           key="handleReport"
                           :disabled="!isManagerUser(record)"
                         >
                           报表
-                        </Menu.Item>
+                        </Menu.Item> -->
                         <Menu.Item
                           key="handleChangeState"
                           v-if="record.processDefinition"

From 41f816483bf6c48707444b7edf5a19d71671ec49 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 11 Jun 2025 09:23:29 +0800
Subject: [PATCH 05/14] fix: error

---
 apps/web-antd/src/views/bpm/model/definition/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/model/definition/index.vue b/apps/web-antd/src/views/bpm/model/definition/index.vue
index 1555abed9..6410ccd31 100644
--- a/apps/web-antd/src/views/bpm/model/definition/index.vue
+++ b/apps/web-antd/src/views/bpm/model/definition/index.vue
@@ -4,13 +4,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 
 import { Button, Image, Tag, Tooltip } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProcessDefinitionPage } from '#/api/bpm/definition';
-import { DocAlert } from '#/components/doc-alert';
 import { BpmModelFormType } from '#/utils/constants';
 
 // 导入 FormCreate 表单详情

From 355a2056f4d393febe70a74e1571a2ab5f99f4e0 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 11 Jun 2025 18:07:25 +0800
Subject: [PATCH 06/14] =?UTF-8?q?fix:=20=E9=87=91=E9=A2=9D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=20&&=20utils=20=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nodes-config/modules/condition.vue      |  2 +-
 apps/web-antd/src/views/bpm/model/definition/index.vue |  2 +-
 .../src/views/bpm/model/form/modules/extra-setting.vue |  7 +++++--
 apps/web-antd/src/views/crm/business/data.ts           |  2 +-
 .../src/views/crm/business/modules/detail-data.ts      |  2 +-
 apps/web-antd/src/views/crm/contract/data.ts           |  7 +++----
 .../src/views/crm/contract/modules/detail-data.ts      |  4 ++--
 apps/web-antd/src/views/crm/customer/pool/data.ts      |  2 +-
 apps/web-antd/src/views/crm/product/data.ts            |  6 +++---
 .../src/views/crm/product/modules/detail-data.ts       |  6 +++---
 apps/web-antd/src/views/crm/receivable/data.ts         |  6 +++---
 .../src/views/crm/receivable/modules/detail-data.ts    |  2 +-
 apps/web-antd/src/views/crm/receivable/plan/data.ts    | 10 +++++-----
 .../views/crm/receivable/plan/modules/detail-data.ts   |  2 +-
 apps/web-antd/src/views/pay/app/data.ts                |  3 +--
 apps/web-antd/src/views/pay/app/index.vue              |  2 +-
 apps/web-antd/src/views/pay/app/modules/data.ts        |  2 +-
 apps/web-antd/src/views/pay/demo/order/data.ts         |  4 ++--
 apps/web-antd/src/views/pay/demo/withdraw/data.ts      |  2 +-
 apps/web-antd/src/views/pay/order/data.ts              |  6 +++---
 apps/web-antd/src/views/pay/order/modules/detail.vue   |  2 +-
 21 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue
index 06cb93495..6a39cce2f 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue
@@ -25,7 +25,7 @@ import {
   Tooltip,
 } from 'ant-design-vue';
 
-import { BpmModelFormType } from '#/utils/constants';
+import { BpmModelFormType } from '#/utils';
 
 import {
   COMPARISON_OPERATORS,
diff --git a/apps/web-antd/src/views/bpm/model/definition/index.vue b/apps/web-antd/src/views/bpm/model/definition/index.vue
index 6410ccd31..000a3c138 100644
--- a/apps/web-antd/src/views/bpm/model/definition/index.vue
+++ b/apps/web-antd/src/views/bpm/model/definition/index.vue
@@ -10,7 +10,7 @@ import { Button, Image, Tag, Tooltip } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProcessDefinitionPage } from '#/api/bpm/definition';
-import { BpmModelFormType } from '#/utils/constants';
+import { BpmModelFormType } from '#/utils';
 
 // 导入 FormCreate 表单详情
 import FormCreateDetail from '../../form/modules/detail.vue';
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 10bbfed01..ee42d6801 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
@@ -26,8 +26,11 @@ import {
   HttpRequestSetting,
   parseFormFields,
 } from '#/components/simple-process-design';
-import { ProcessVariableEnum } from '#/utils';
-import { BpmAutoApproveType, BpmModelFormType } from '#/utils/constants';
+import {
+  BpmAutoApproveType,
+  BpmModelFormType,
+  ProcessVariableEnum,
+} from '#/utils';
 
 const modelData = defineModel<any>();
 
diff --git a/apps/web-antd/src/views/crm/business/data.ts b/apps/web-antd/src/views/crm/business/data.ts
index 0cfd32130..34b04a094 100644
--- a/apps/web-antd/src/views/crm/business/data.ts
+++ b/apps/web-antd/src/views/crm/business/data.ts
@@ -167,7 +167,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalPrice',
       title: '商机金额（元）',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'dealTime',
diff --git a/apps/web-antd/src/views/crm/business/modules/detail-data.ts b/apps/web-antd/src/views/crm/business/modules/detail-data.ts
index cab0f65be..0e16a01fe 100644
--- a/apps/web-antd/src/views/crm/business/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/business/modules/detail-data.ts
@@ -97,7 +97,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalPrice',
       title: '商机金额（元）',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'dealTime',
diff --git a/apps/web-antd/src/views/crm/contract/data.ts b/apps/web-antd/src/views/crm/contract/data.ts
index 2c20e7a71..062823c63 100644
--- a/apps/web-antd/src/views/crm/contract/data.ts
+++ b/apps/web-antd/src/views/crm/contract/data.ts
@@ -6,8 +6,7 @@ import { getSimpleBusinessList } from '#/api/crm/business';
 import { getSimpleContactList } from '#/api/crm/contact';
 import { getCustomerSimpleList } from '#/api/crm/customer';
 import { getSimpleUserList } from '#/api/system/user';
-import { erpPriceMultiply, floatToFixed2 } from '#/utils';
-import { DICT_TYPE } from '#/utils/dict';
+import { DICT_TYPE, erpPriceMultiply, floatToFixed2 } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -242,7 +241,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '合同金额（元）',
       field: 'totalPrice',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '下单时间',
@@ -277,7 +276,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '已回款金额（元）',
       field: 'totalReceivablePrice',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '未回款金额（元）',
diff --git a/apps/web-antd/src/views/crm/contract/modules/detail-data.ts b/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
index cffb31427..5090cd3ed 100644
--- a/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
@@ -120,7 +120,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
       title: '合同金额（元）',
       field: 'totalPrice',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '合同开始时间',
@@ -138,7 +138,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
       title: '已回款金额（元）',
       field: 'totalReceivablePrice',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '未回款金额（元）',
diff --git a/apps/web-antd/src/views/crm/customer/pool/data.ts b/apps/web-antd/src/views/crm/customer/pool/data.ts
index 177742ea4..fe7b22f9a 100644
--- a/apps/web-antd/src/views/crm/customer/pool/data.ts
+++ b/apps/web-antd/src/views/crm/customer/pool/data.ts
@@ -1,7 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { DICT_TYPE, getDictOptions } from '#/utils';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/crm/product/data.ts b/apps/web-antd/src/views/crm/product/data.ts
index fa56e96b6..2ccfe6dfd 100644
--- a/apps/web-antd/src/views/crm/product/data.ts
+++ b/apps/web-antd/src/views/crm/product/data.ts
@@ -134,7 +134,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'price',
       title: '价格（元）',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'description',
@@ -203,7 +203,7 @@ export function useProductEditTableColumns(): VxeTableGridOptions['columns'] {
       field: 'productPrice',
       title: '价格（元）',
       minWidth: 100,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'sellingPrice',
@@ -221,7 +221,7 @@ export function useProductEditTableColumns(): VxeTableGridOptions['columns'] {
       field: 'totalPrice',
       title: '合计',
       minWidth: 100,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '操作',
diff --git a/apps/web-antd/src/views/crm/product/modules/detail-data.ts b/apps/web-antd/src/views/crm/product/modules/detail-data.ts
index a8c0a10e1..c317444a9 100644
--- a/apps/web-antd/src/views/crm/product/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/product/modules/detail-data.ts
@@ -94,12 +94,12 @@ export function useDetailListColumns(
     {
       field: 'productPrice',
       title: '产品价格（元）',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'businessPrice',
       title: '商机价格（元）',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       visible: showBussinePrice,
     },
     {
@@ -110,7 +110,7 @@ export function useDetailListColumns(
     {
       field: 'totalPrice',
       title: '合计金额（元）',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
   ];
 }
diff --git a/apps/web-antd/src/views/crm/receivable/data.ts b/apps/web-antd/src/views/crm/receivable/data.ts
index 1c33d1aec..c8c5d981e 100644
--- a/apps/web-antd/src/views/crm/receivable/data.ts
+++ b/apps/web-antd/src/views/crm/receivable/data.ts
@@ -5,7 +5,7 @@ import { getContractSimpleList } from '#/api/crm/contract';
 import { getCustomerSimpleList } from '#/api/crm/customer';
 import { getReceivablePlanSimpleList } from '#/api/crm/receivable/plan';
 import { getSimpleUserList } from '#/api/system/user';
-import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { DICT_TYPE, getDictOptions } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -199,7 +199,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '回款金额（元）',
       field: 'price',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '回款方式',
@@ -219,7 +219,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '合同金额（元）',
       field: 'contract.totalPrice',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '负责人',
diff --git a/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts b/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
index 744a74e0b..7468b6c2d 100644
--- a/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
@@ -108,7 +108,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
       title: '回款金额（元）',
       field: 'price',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '回款方式',
diff --git a/apps/web-antd/src/views/crm/receivable/plan/data.ts b/apps/web-antd/src/views/crm/receivable/plan/data.ts
index 519c41f13..6f6eec23a 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/data.ts
+++ b/apps/web-antd/src/views/crm/receivable/plan/data.ts
@@ -2,7 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { getCustomerSimpleList } from '#/api/crm/customer';
-import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { DICT_TYPE, floatToFixed2, getDictOptions } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -141,7 +141,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '计划回款金额（元）',
       field: 'price',
       minWidth: 160,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '计划回款日期',
@@ -183,7 +183,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '实际回款金额（元）',
       field: 'receivable.price',
       minWidth: 160,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '实际回款日期',
@@ -197,9 +197,9 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       minWidth: 160,
       formatter: ({ row }) => {
         if (row.receivable) {
-          return row.price - row.receivable.price;
+          return floatToFixed2(row.price - row.receivable.price);
         }
-        return row.price;
+        return floatToFixed2(row.price);
       },
     },
     {
diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
index 8947dcef0..d74100f07 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
@@ -101,7 +101,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
       title: '计划回款(元)',
       field: 'price',
       minWidth: 150,
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '计划回款日期',
diff --git a/apps/web-antd/src/views/pay/app/data.ts b/apps/web-antd/src/views/pay/app/data.ts
index 50fc87eb6..a132eea05 100644
--- a/apps/web-antd/src/views/pay/app/data.ts
+++ b/apps/web-antd/src/views/pay/app/data.ts
@@ -2,8 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayAppApi } from '#/api/pay/app';
 
-import { CommonStatusEnum } from '#/utils/constants';
-import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils';
 
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/pay/app/index.vue b/apps/web-antd/src/views/pay/app/index.vue
index a2ccc4e53..f909a0583 100644
--- a/apps/web-antd/src/views/pay/app/index.vue
+++ b/apps/web-antd/src/views/pay/app/index.vue
@@ -10,7 +10,7 @@ import { message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { changeAppStatus, deleteApp, getAppPage } from '#/api/pay/app';
 import { $t } from '#/locales';
-import { CommonStatusEnum, PayChannelEnum } from '#/utils/constants';
+import { CommonStatusEnum, PayChannelEnum } from '#/utils';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import appFrom from './modules/app-form.vue';
diff --git a/apps/web-antd/src/views/pay/app/modules/data.ts b/apps/web-antd/src/views/pay/app/modules/data.ts
index 424dc4524..56188df2c 100644
--- a/apps/web-antd/src/views/pay/app/modules/data.ts
+++ b/apps/web-antd/src/views/pay/app/modules/data.ts
@@ -3,7 +3,7 @@ import type { VbenFormSchema } from '#/adapter/form';
 import { h } from 'vue';
 
 import { InputUpload } from '#/components/upload';
-import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { DICT_TYPE, getDictOptions } from '#/utils';
 
 export function channelSchema(formType: string): VbenFormSchema[] {
   if (formType.includes('alipay_')) {
diff --git a/apps/web-antd/src/views/pay/demo/order/data.ts b/apps/web-antd/src/views/pay/demo/order/data.ts
index f38050df5..9dde3e144 100644
--- a/apps/web-antd/src/views/pay/demo/order/data.ts
+++ b/apps/web-antd/src/views/pay/demo/order/data.ts
@@ -50,12 +50,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'price',
       title: '支付价格',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'refundPrice',
       title: '退款金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'createTime',
diff --git a/apps/web-antd/src/views/pay/demo/withdraw/data.ts b/apps/web-antd/src/views/pay/demo/withdraw/data.ts
index 7fcfb6055..bd2ee6169 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/data.ts
+++ b/apps/web-antd/src/views/pay/demo/withdraw/data.ts
@@ -78,7 +78,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'price',
       title: '提现金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       field: 'userName',
diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts
index 9a05cc0cd..5f69fc3b3 100644
--- a/apps/web-antd/src/views/pay/order/data.ts
+++ b/apps/web-antd/src/views/pay/order/data.ts
@@ -78,17 +78,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       title: '支付金额',
       field: 'price',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '退款金额',
       field: 'refundPrice',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '手续金额',
       field: 'channelFeePrice',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
     },
     {
       title: '订单号',
diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue
index 8da61c918..3d9b6e539 100644
--- a/apps/web-antd/src/views/pay/order/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/order/modules/detail.vue
@@ -10,7 +10,7 @@ import { Descriptions, Divider, Tag } from 'ant-design-vue';
 
 import { getOrder } from '#/api/pay/order';
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '#/utils/dict';
+import { DICT_TYPE } from '#/utils';
 
 const detailData = ref<PayOrderApi.Order>();
 

From 23a25cb52141fa15d84b67e4c56868e066cf1fa5 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Wed, 11 Jun 2025 18:08:48 +0800
Subject: [PATCH 07/14] =?UTF-8?q?fix:=20[BPM=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?]=20=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9?=
 =?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

---
 .../nodes-config/condition-node-config.vue    | 18 ++++++++---
 .../nodes-config/copy-task-node-config.vue    |  3 +-
 .../nodes-config/delay-timer-node-config.vue  |  3 +-
 .../nodes-config/router-node-config.vue       |  3 +-
 .../nodes-config/start-user-node-config.vue   |  4 +--
 .../nodes-config/trigger-node-config.vue      |  3 +-
 .../nodes-config/user-task-node-config.vue    |  3 +-
 .../components/nodes/copy-task-node.vue       |  5 ++--
 .../components/nodes/delay-timer-node.vue     |  5 ++--
 .../components/nodes/exclusive-node.vue       | 30 +++++++++++++++++--
 .../components/nodes/inclusive-node.vue       | 29 ++++++++++++++++--
 .../components/nodes/parallel-node.vue        | 29 ++++++++++++++++--
 .../components/nodes/router-node.vue          |  5 ++--
 .../components/nodes/start-user-node.vue      |  3 +-
 .../components/nodes/trigger-node.vue         |  5 ++--
 .../components/nodes/user-task-node.vue       |  5 ++--
 .../simple-process-design/helpers.ts          | 28 ++++++++++++++++-
 17 files changed, 149 insertions(+), 32 deletions(-)

diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue
index ffa494726..cc4376efc 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SimpleFlowNode } from '../../consts';
 
-import { ref, watch } from 'vue';
+import { nextTick, ref, watch } from 'vue';
 
 import { useVbenDrawer } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
@@ -53,8 +53,6 @@ const condition = ref<any>({
   },
 });
 
-// 显示名称输入框
-const showInput = ref(false);
 const conditionRef = ref();
 const fieldOptions = useFormFieldsAndStartUser(); // 流程表单字段和发起人字段
 
@@ -130,7 +128,18 @@ watch(
     currentNode.value = newValue;
   },
 );
-
+// 显示名称输入框
+const showInput = ref(false);
+// 输入框的引用
+const inputRef = ref<HTMLInputElement | null>(null);
+// 监听 showInput 的变化，当变为 true 时自动聚焦
+watch(showInput, (value) => {
+  if (value) {
+    nextTick(() => {
+      inputRef.value?.focus();
+    });
+  }
+});
 function clickIcon() {
   showInput.value = true;
 }
@@ -153,6 +162,7 @@ defineExpose({ open }); // 提供 open 方法，用于打开弹窗
     <template #title>
       <div class="flex items-center">
         <Input
+          ref="inputRef"
           v-if="showInput"
           type="text"
           class="mr-2 w-48"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
index 3e548c97f..7bbe3b3cf 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
@@ -75,7 +75,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
 const currentNode = useWatchNode(props);
 
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(
+const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
   BpmNodeTypeEnum.COPY_TASK_NODE,
 );
 
@@ -213,6 +213,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
       <div class="config-header">
         <Input
           v-if="showInput"
+          ref="inputRef"
           type="text"
           class="config-editable-input"
           @blur="blurEvent()"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
index 95ffc5098..89f58161b 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
@@ -45,7 +45,7 @@ const props = defineProps({
 // 当前节点
 const currentNode = useWatchNode(props);
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(
+const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
   BpmNodeTypeEnum.DELAY_TIMER_NODE,
 );
 // 抄送人表单配置
@@ -158,6 +158,7 @@ defineExpose({ openDrawer }); // 暴露方法给父组件
       <div class="flex items-center">
         <Input
           v-if="showInput"
+          ref="inputRef"
           type="text"
           class="mr-2 w-48"
           @blur="blurEvent()"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue
index e48f4a161..f377d7d5a 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue
@@ -41,7 +41,7 @@ const processNodeTree = inject<Ref<SimpleFlowNode>>('processNodeTree');
 /** 当前节点 */
 const currentNode = useWatchNode(props);
 /** 节点名称 */
-const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(
+const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
   BpmNodeTypeEnum.ROUTER_BRANCH_NODE,
 );
 const routerGroups = ref<RouterSetting[]>([]);
@@ -205,6 +205,7 @@ defineExpose({ openDrawer }); // 暴露方法给父组件
     <template #title>
       <div class="flex items-center">
         <Input
+          ref="inputRef"
           v-if="showInput"
           type="text"
           class="mr-2 w-48"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue
index eb6feeb8b..eb0d7e704 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue
@@ -52,7 +52,7 @@ const deptOptions = inject<Ref<SystemDeptApi.Dept[]>>('deptList');
 // 当前节点
 const currentNode = useWatchNode(props);
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(
+const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
   BpmNodeTypeEnum.START_USER_NODE,
 );
 // 激活的 Tab 标签页
@@ -145,8 +145,8 @@ defineExpose({ showStartUserNodeConfig });
   <Drawer>
     <template #title>
       <div class="config-header">
-        <!--    TODO v-mountedFocus 自动聚集 需要迁移一下 -->
         <Input
+          ref="inputRef"
           v-if="showInput"
           type="text"
           class="config-editable-input"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index eb7d40476..952c77261 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -72,7 +72,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
 // 当前节点
 const currentNode = useWatchNode(props);
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(
+const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
   BpmNodeTypeEnum.TRIGGER_NODE,
 );
 // 触发器表单配置
@@ -388,6 +388,7 @@ onMounted(() => {
     <template #title>
       <div class="config-header">
         <Input
+          ref="inputRef"
           v-if="showInput"
           type="text"
           class="config-editable-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 c94d78ea8..9da410f1d 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
@@ -114,7 +114,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
 });
 
 // 节点名称配置
-const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(
+const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
   BpmNodeTypeEnum.USER_TASK_NODE,
 );
 
@@ -586,6 +586,7 @@ onMounted(() => {
       <div class="config-header">
         <Input
           v-if="showInput"
+          ref="inputRef"
           type="text"
           class="config-editable-input"
           @blur="blurEvent()"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue
index 4e4e482a0..32deb8992 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue
@@ -32,7 +32,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle } = useNodeName2(
+const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.COPY_TASK_NODE,
 );
@@ -67,11 +67,12 @@ function deleteNode() {
             <span class="iconfont icon-copy"></span>
           </div>
           <Input
+            ref="inputRef"
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
             @blur="blurEvent()"
-            v-model="currentNode.name"
+            v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
           <div v-else class="node-title" @click="clickTitle">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue
index 3a4227d4f..5e55fad99 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue
@@ -30,7 +30,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle } = useNodeName2(
+const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.DELAY_TIMER_NODE,
 );
@@ -64,11 +64,12 @@ function deleteNode() {
             <span class="iconfont icon-delay"></span>
           </div>
           <Input
+            ref="inputRef"
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
             @blur="blurEvent()"
-            v-model="currentNode.name"
+            v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
           <div v-else class="node-title" @click="clickTitle">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue
index 1dc18e528..6a716b3e8 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SimpleFlowNode } from '../../consts';
 
-import { getCurrentInstance, inject, ref, watch } from 'vue';
+import { getCurrentInstance, inject, nextTick, ref, watch } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
 import { cloneDeep, buildShortUUID as generateUUID } from '@vben/utils';
@@ -51,9 +51,28 @@ watch(
     currentNode.value = newValue;
   },
 );
-
+// 条件节点名称输入框引用
+const inputRefs = ref<HTMLInputElement[]>([]);
+// 节点名称输入框显示状态
 const showInputs = ref<boolean[]>([]);
 
+// 监听显示状态变化
+watch(
+  showInputs,
+  (newValues) => {
+    // 当状态为 true 时, 自动聚焦
+    newValues.forEach((value, index) => {
+      if (value) {
+        // 当显示状态从 false 变为 true 时, 自动聚焦
+        nextTick(() => {
+          inputRefs.value[index]?.focus();
+        });
+      }
+    });
+  },
+  { deep: true },
+);
+
 // 失去焦点
 function blurEvent(index: number) {
   showInputs.value[index] = false;
@@ -188,10 +207,15 @@ function recursiveFindParentNode(
               <div class="branch-node-title-container">
                 <div v-if="!readonly && showInputs[index]">
                   <Input
+                    :ref="
+                      (el) => {
+                        inputRefs[index] = el as HTMLInputElement;
+                      }
+                    "
                     type="text"
                     class="editable-title-input"
                     @blur="blurEvent(index)"
-                    v-model="item.name"
+                    v-model:value="item.name"
                   />
                 </div>
                 <div v-else class="branch-title" @click="clickEvent(index)">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue
index c825d01b2..caf15c937 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SimpleFlowNode } from '../../consts';
 
-import { getCurrentInstance, inject, ref, watch } from 'vue';
+import { getCurrentInstance, inject, nextTick, ref, watch } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
 import { cloneDeep, buildShortUUID as generateUUID } from '@vben/utils';
@@ -57,8 +57,26 @@ watch(
     currentNode.value = newValue;
   },
 );
-
+// 条件节点名称输入框引用
+const inputRefs = ref<HTMLInputElement[]>([]);
+// 节点名称输入框显示状态
 const showInputs = ref<boolean[]>([]);
+// 监听显示状态变化
+watch(
+  showInputs,
+  (newValues) => {
+    // 当状态为 true 时, 自动聚焦
+    newValues.forEach((value, index) => {
+      if (value) {
+        // 当显示状态从 false 变为 true 时, 自动聚焦
+        nextTick(() => {
+          inputRefs.value[index]?.focus();
+        });
+      }
+    });
+  },
+  { deep: true },
+);
 // 失去焦点
 function blurEvent(index: number) {
   showInputs.value[index] = false;
@@ -192,10 +210,15 @@ function recursiveFindParentNode(
               <div class="branch-node-title-container">
                 <div v-if="!readonly && showInputs[index]">
                   <Input
+                    :ref="
+                      (el) => {
+                        inputRefs[index] = el as HTMLInputElement;
+                      }
+                    "
                     type="text"
                     class="editable-title-input"
                     @blur="blurEvent(index)"
-                    v-model="item.name"
+                    v-model:value="item.name"
                   />
                 </div>
                 <div v-else class="branch-title" @click="clickEvent(index)">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue
index b6f8ec151..8ead12916 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SimpleFlowNode } from '../../consts';
 
-import { inject, ref, watch } from 'vue';
+import { inject, nextTick, ref, watch } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
 import { buildShortUUID as generateUUID } from '@vben/utils';
@@ -46,8 +46,26 @@ watch(
   },
 );
 
+// 条件节点名称输入框引用
+const inputRefs = ref<HTMLInputElement[]>([]);
+// 节点名称输入框显示状态
 const showInputs = ref<boolean[]>([]);
-
+// 监听显示状态变化
+watch(
+  showInputs,
+  (newValues) => {
+    // 当输入框显示时, 自动聚焦
+    newValues.forEach((value, index) => {
+      if (value) {
+        // 当显示状态从 false 变为 true 时, 自动聚焦
+        nextTick(() => {
+          inputRefs.value[index]?.focus();
+        });
+      }
+    });
+  },
+  { deep: true },
+);
 // 失去焦点
 function blurEvent(index: number) {
   showInputs.value[index] = false;
@@ -150,10 +168,15 @@ function recursiveFindParentNode(
               <div class="branch-node-title-container">
                 <div v-if="showInputs[index]">
                   <Input
+                    :ref="
+                      (el) => {
+                        inputRefs[index] = el as HTMLInputElement;
+                      }
+                    "
                     type="text"
                     class="input-max-width editable-title-input"
                     @blur="blurEvent(index)"
-                    v-model="item.name"
+                    v-model:value="item.name"
                   />
                 </div>
                 <div v-else class="branch-title" @click="clickEvent(index)">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue
index 7e6876722..35df60b87 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue
@@ -33,7 +33,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle } = useNodeName2(
+const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.ROUTER_BRANCH_NODE,
 );
@@ -67,11 +67,12 @@ function deleteNode() {
             <span class="iconfont icon-router"></span>
           </div>
           <Input
+            ref="inputRef"
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
             @blur="blurEvent()"
-            v-model="currentNode.name"
+            v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
           <div v-else class="node-title" @click="clickTitle">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue
index d2a33536f..e9055ef28 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue
@@ -37,7 +37,7 @@ const tasks = inject<Ref<any[]>>('tasks', ref([]));
 // 监控节点变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle } = useNodeName2(
+const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.START_USER_NODE,
 );
@@ -81,6 +81,7 @@ function nodeClick() {
             <span class="iconfont icon-start-user"></span>
           </div>
           <Input
+            ref="inputRef"
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue
index 191632729..84f7f3d4e 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue
@@ -35,7 +35,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle } = useNodeName2(
+const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.TRIGGER_NODE,
 );
@@ -69,11 +69,12 @@ function deleteNode() {
             <span class="iconfont icon-trigger"></span>
           </div>
           <Input
+            ref="inputRef"
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
             @blur="blurEvent()"
-            v-model="currentNode.name"
+            v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
           <div v-else class="node-title" @click="clickTitle">
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue
index f7ae63782..57ea49467 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue
@@ -36,7 +36,7 @@ const tasks = inject<Ref<any[]>>('tasks', ref([]));
 // 监控节点变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle } = useNodeName2(
+const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.USER_TASK_NODE,
 );
@@ -87,11 +87,12 @@ function findReturnTaskNodes(
             </span>
           </div>
           <Input
+            ref="inputRef"
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
             @blur="blurEvent()"
-            v-model="currentNode.name"
+            v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
           <div v-else class="node-title" @click="clickTitle">
diff --git a/apps/web-antd/src/components/simple-process-design/helpers.ts b/apps/web-antd/src/components/simple-process-design/helpers.ts
index 7227b87f9..26f91ad73 100644
--- a/apps/web-antd/src/components/simple-process-design/helpers.ts
+++ b/apps/web-antd/src/components/simple-process-design/helpers.ts
@@ -12,7 +12,7 @@ import type { SystemPostApi } from '#/api/system/post';
 import type { SystemRoleApi } from '#/api/system/role';
 import type { SystemUserApi } from '#/api/system/user';
 
-import { inject, ref, toRaw, unref, watch } from 'vue';
+import { inject, nextTick, ref, toRaw, unref, watch } from 'vue';
 
 import {
   BpmNodeTypeEnum,
@@ -622,6 +622,8 @@ export function useNodeName(nodeType: BpmNodeTypeEnum) {
   const nodeName = ref<string>();
   // 节点名称输入框
   const showInput = ref(false);
+  // 输入框的引用
+  const inputRef = ref<HTMLInputElement | null>(null);
   // 点击节点名称编辑图标
   function clickIcon() {
     showInput.value = true;
@@ -632,9 +634,19 @@ export function useNodeName(nodeType: BpmNodeTypeEnum) {
     nodeName.value =
       nodeName.value || (NODE_DEFAULT_NAME.get(nodeType) as string);
   }
+  // 监听 showInput 的变化，当变为 true 时自动聚焦
+  watch(showInput, (value) => {
+    if (value) {
+      nextTick(() => {
+        inputRef.value?.focus();
+      });
+    }
+  });
+
   return {
     nodeName,
     showInput,
+    inputRef,
     clickIcon,
     blurEvent,
   };
@@ -646,11 +658,24 @@ export function useNodeName2(
 ) {
   // 显示节点名称输入框
   const showInput = ref(false);
+  // 输入框的引用
+  const inputRef = ref<HTMLInputElement | null>(null);
+
+  // 监听 showInput 的变化，当变为 true 时自动聚焦
+  watch(showInput, (value) => {
+    if (value) {
+      nextTick(() => {
+        inputRef.value?.focus();
+      });
+    }
+  });
+
   // 节点名称输入框失去焦点
   function blurEvent() {
     showInput.value = false;
     node.value.name =
       node.value.name || (NODE_DEFAULT_NAME.get(nodeType) as string);
+    console.warn('node.value.name===>', node.value.name);
   }
   // 点击节点标题进行输入
   function clickTitle() {
@@ -658,6 +683,7 @@ export function useNodeName2(
   }
   return {
     showInput,
+    inputRef,
     clickTitle,
     blurEvent,
   };

From 21f2472561bf189f3fb6c1691511525781f2ce53 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 11 Jun 2025 18:12:24 +0800
Subject: [PATCH 08/14] =?UTF-8?q?fix:=20=E9=87=91=E9=A2=9D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/pay/demo/withdraw/index.vue  |  3 ++-
 apps/web-antd/src/views/pay/order/modules/detail.vue | 10 +++++-----
 apps/web-antd/src/views/pay/transfer/data.ts         | 11 ++++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/web-antd/src/views/pay/demo/withdraw/index.vue b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
index cbfe713a6..f92e408c5 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/index.vue
+++ b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
@@ -12,6 +12,7 @@ import {
   transferDemoWithdraw,
 } from '#/api/pay/demo/withdraw';
 import { $t } from '#/locales';
+import { floatToFixed2 } from '#/utils';
 
 import { useGridColumns } from './data';
 import Form from './modules/form.vue';
@@ -109,7 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         <Tag v-else-if="row.type === 3">钱包余额</Tag>
       </template>
       <template #price="{ row }">
-        <span>￥{{ (row.price / 100.0).toFixed(2) }}</span>
+        <span>￥{{ floatToFixed2(row.price) }}</span>
       </template>
       <template #status="{ row }">
         <Tag v-if="row.status === 0 && !row.payTransferId" type="warning">
diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue
index 3d9b6e539..d91fc9d13 100644
--- a/apps/web-antd/src/views/pay/order/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/order/modules/detail.vue
@@ -10,7 +10,7 @@ import { Descriptions, Divider, Tag } from 'ant-design-vue';
 
 import { getOrder } from '#/api/pay/order';
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '#/utils';
+import { DICT_TYPE, floatToFixed2 } from '#/utils';
 
 const detailData = ref<PayOrderApi.Order>();
 
@@ -63,16 +63,16 @@ const [Modal, modalApi] = useVbenModal({
       </Descriptions.Item>
       <Descriptions.Item label="支付金额">
         <Tag color="green" size="small">
-          ￥{{ (detailData?.price || 0 / 100.0).toFixed(2) }}
+          ￥{{ floatToFixed2(detailData?.price) }}
         </Tag>
       </Descriptions.Item>
       <Descriptions.Item label="手续费">
         <Tag color="orange" size="small">
-          ￥{{ (detailData?.channelFeePrice || 0 / 100.0).toFixed(2) }}
+          ￥{{ floatToFixed2(detailData?.channelFeePrice) }}
         </Tag>
       </Descriptions.Item>
       <Descriptions.Item label="手续费比例">
-        {{ (detailData?.channelFeeRate || 0 / 100.0).toFixed(2) }}%
+        {{ floatToFixed2(detailData?.channelFeeRate) }}%
       </Descriptions.Item>
       <Descriptions.Item label="支付时间">
         {{ formatDateTime(detailData?.successTime) }}
@@ -115,7 +115,7 @@ const [Modal, modalApi] = useVbenModal({
       </Descriptions.Item>
       <Descriptions.Item label="退款金额" :span="2">
         <Tag size="small" color="red">
-          ￥{{ (detailData?.refundPrice || 0 / 100.0).toFixed(2) }}
+          ￥{{ floatToFixed2(detailData?.refundPrice) }}
         </Tag>
       </Descriptions.Item>
       <Descriptions.Item label="通知 URL">
diff --git a/apps/web-antd/src/views/pay/transfer/data.ts b/apps/web-antd/src/views/pay/transfer/data.ts
index 36d7cb861..06f875b6a 100644
--- a/apps/web-antd/src/views/pay/transfer/data.ts
+++ b/apps/web-antd/src/views/pay/transfer/data.ts
@@ -9,7 +9,12 @@ import { formatDateTime } from '@vben/utils';
 import { Tag } from 'ant-design-vue';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';
+import {
+  DICT_TYPE,
+  floatToFixed2,
+  getDictOptions,
+  getRangePickerDefaultProps,
+} from '#/utils';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
@@ -120,7 +125,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'price',
       title: '转账金额',
-      formatter: ({ cellValue }) => `￥${(cellValue / 100).toFixed(2)}`,
+      formatter: 'formatAmount2',
     },
     {
       field: 'status',
@@ -217,7 +222,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
       content: (data) => {
         return h(Tag, {
           color: 'blue',
-          content: `￥${(data?.price / 100).toFixed(2)}`,
+          content: `￥${floatToFixed2(data?.price)}`,
         });
       },
     },

From fcce15c0b86c0dbcab80b20405c69fe63991ac15 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 11 Jun 2025 20:15:27 +0800
Subject: [PATCH 09/14] =?UTF-8?q?feat:=20formatNumber=20=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0=20@vben/utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/adapter/vxe-table.ts        | 31 +++++-----------
 apps/web-antd/src/utils/index.ts              |  1 -
 .../views/crm/business/modules/detail-data.ts |  4 +--
 .../crm/receivable/modules/detail-data.ts     |  4 +--
 .../receivable/plan/modules/detail-data.ts    |  4 +--
 .../src/views/mall/product/spu/index.vue      |  3 +-
 .../mall/trade/delivery/pickUpOrder/index.vue |  3 +-
 .../src/views/mall/trade/order/index.vue      |  8 ++---
 .../user/components/user-account-info.vue     |  3 +-
 apps/web-antd/src/views/member/user/data.ts   |  4 +--
 .../member/user/modules/balance-form.vue      |  2 +-
 apps/web-antd/src/views/pay/cashier/index.vue |  3 +-
 .../wallet/rechargePackage/modules/form.vue   |  2 +-
 .../base/shared}/src/utils/formatNumber.ts    | 35 +++++++++++--------
 packages/@core/base/shared/src/utils/index.ts |  1 +
 15 files changed, 48 insertions(+), 60 deletions(-)
 rename {apps/web-antd => packages/@core/base/shared}/src/utils/formatNumber.ts (84%)

diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts
index 7e71fd5ff..206cf57a1 100644
--- a/apps/web-antd/src/adapter/vxe-table.ts
+++ b/apps/web-antd/src/adapter/vxe-table.ts
@@ -10,7 +10,12 @@ import {
   setupVbenVxeTable,
   useVbenVxeGrid,
 } from '@vben/plugins/vxe-table';
-import { isFunction, isString } from '@vben/utils';
+import {
+  floatToFixed2,
+  formatToFractionDigit,
+  isFunction,
+  isString,
+} from '@vben/utils';
 
 import { Button, Image, Popconfirm, Switch } from 'ant-design-vue';
 
@@ -313,33 +318,13 @@ setupVbenVxeTable({
     // add by 星语：数量格式化，例如说：金额
     vxeUI.formats.add('formatNumber', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
-        if (cellValue === null || cellValue === undefined) {
-          return '';
-        }
-        if (isString(cellValue)) {
-          cellValue = Number.parseFloat(cellValue);
-        }
-        // 如果非 number，则直接返回空串
-        if (Number.isNaN(cellValue)) {
-          return '';
-        }
-        return cellValue.toFixed(digits);
+        return formatToFractionDigit(cellValue, digits);
       },
     });
 
     vxeUI.formats.add('formatAmount2', {
       tableCellFormatMethod({ cellValue }) {
-        if (cellValue === null || cellValue === undefined) {
-          return '0.00';
-        }
-        if (isString(cellValue)) {
-          cellValue = Number.parseFloat(cellValue);
-        }
-        // 如果非 number，则直接返回空串
-        if (Number.isNaN(cellValue)) {
-          return '0.00';
-        }
-        return `${(cellValue / 100).toFixed(2)}元`;
+        return `${floatToFixed2(cellValue)}元`;
       },
     });
   },
diff --git a/apps/web-antd/src/utils/index.ts b/apps/web-antd/src/utils/index.ts
index eb173b636..aaa0682f5 100644
--- a/apps/web-antd/src/utils/index.ts
+++ b/apps/web-antd/src/utils/index.ts
@@ -1,7 +1,6 @@
 export * from './constants';
 export * from './dict';
 export * from './download';
-export * from './formatNumber';
 export * from './formCreate';
 export * from './rangePickerProps';
 export * from './routerHelper';
diff --git a/apps/web-antd/src/views/crm/business/modules/detail-data.ts b/apps/web-antd/src/views/crm/business/modules/detail-data.ts
index 0e16a01fe..5ff123f36 100644
--- a/apps/web-antd/src/views/crm/business/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/business/modules/detail-data.ts
@@ -1,9 +1,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { DescriptionItemSchema } from '#/components/description';
 
-import { formatDateTime } from '@vben/utils';
-
-import { erpPriceInputFormatter } from '#/utils';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 /** 详情页的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
diff --git a/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts b/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
index 7468b6c2d..880f8e192 100644
--- a/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
@@ -3,10 +3,10 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
-import { formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE, erpPriceInputFormatter } from '#/utils';
+import { DICT_TYPE } from '#/utils';
 
 /** 详情页的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
index d74100f07..85b5b5efd 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
@@ -3,10 +3,10 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
-import { formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE, erpPriceInputFormatter } from '#/utils';
+import { DICT_TYPE } from '#/utils';
 
 /** 详情页的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
diff --git a/apps/web-antd/src/views/mall/product/spu/index.vue b/apps/web-antd/src/views/mall/product/spu/index.vue
index 34f1979c8..0b7802496 100644
--- a/apps/web-antd/src/views/mall/product/spu/index.vue
+++ b/apps/web-antd/src/views/mall/product/spu/index.vue
@@ -8,6 +8,7 @@ import { useRouter } from 'vue-router';
 import { confirm, DocAlert, Page } from '@vben/common-ui';
 import {
   downloadFileFromBlobPart,
+  fenToYuan,
   handleTree,
   treeToString,
 } from '@vben/utils';
@@ -24,7 +25,7 @@ import {
   updateStatus,
 } from '#/api/mall/product/spu';
 import { $t } from '#/locales';
-import { fenToYuan, ProductSpuStatusEnum } from '#/utils';
+import { ProductSpuStatusEnum } from '#/utils';
 
 import { useGridColumns, useGridFormSchema } from './data';
 
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue
index e5e5fc449..e5bb21c95 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue
@@ -5,6 +5,7 @@ import type { MallOrderApi } from '#/api/mall/trade/order';
 import { h, onMounted, ref } from 'vue';
 
 import { Page, prompt } from '@vben/common-ui';
+import { fenToYuan } from '@vben/utils';
 
 import { Card, Input, message } from 'ant-design-vue';
 
@@ -15,7 +16,7 @@ import {
   getOrderSummary,
 } from '#/api/mall/trade/order';
 import { SummaryCard } from '#/components/summary-card';
-import { DeliveryTypeEnum, fenToYuan, TradeOrderStatusEnum } from '#/utils';
+import { DeliveryTypeEnum, TradeOrderStatusEnum } from '#/utils';
 
 import { useGridColumns, useGridFormSchema } from './data';
 
diff --git a/apps/web-antd/src/views/mall/trade/order/index.vue b/apps/web-antd/src/views/mall/trade/order/index.vue
index c3fc83ea8..983affb8e 100644
--- a/apps/web-antd/src/views/mall/trade/order/index.vue
+++ b/apps/web-antd/src/views/mall/trade/order/index.vue
@@ -6,6 +6,7 @@ import { h } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, prompt, useVbenModal } from '@vben/common-ui';
+import { fenToYuan } from '@vben/utils';
 
 import { Image, List, Tag, Textarea } from 'ant-design-vue';
 
@@ -13,12 +14,7 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getOrderPage, updateOrderRemark } from '#/api/mall/trade/order';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
-import {
-  DeliveryTypeEnum,
-  DICT_TYPE,
-  fenToYuan,
-  TradeOrderStatusEnum,
-} from '#/utils';
+import { DeliveryTypeEnum, DICT_TYPE, TradeOrderStatusEnum } from '#/utils';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import DeleveryForm from './modules/delevery-form.vue';
diff --git a/apps/web-antd/src/views/member/user/components/user-account-info.vue b/apps/web-antd/src/views/member/user/components/user-account-info.vue
index 097d9beba..846fd584f 100644
--- a/apps/web-antd/src/views/member/user/components/user-account-info.vue
+++ b/apps/web-antd/src/views/member/user/components/user-account-info.vue
@@ -2,10 +2,11 @@
 import type { MemberUserApi } from '#/api/member/user';
 import type { PayWalletApi } from '#/api/pay/wallet/balance';
 
+import { fenToYuan } from '@vben/utils';
+
 import { Card } from 'ant-design-vue';
 
 import { useDescription } from '#/components/description';
-import { fenToYuan } from '#/utils';
 
 withDefaults(
   defineProps<{
diff --git a/apps/web-antd/src/views/member/user/data.ts b/apps/web-antd/src/views/member/user/data.ts
index 1232cca3a..866160f4d 100644
--- a/apps/web-antd/src/views/member/user/data.ts
+++ b/apps/web-antd/src/views/member/user/data.ts
@@ -3,6 +3,8 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
 
+import { convertToInteger, formatToFraction } from '@vben/utils';
+
 import { Tag } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
@@ -12,9 +14,7 @@ import { getSimpleTagList } from '#/api/member/tag';
 import { getAreaTree } from '#/api/system/area';
 import {
   CommonStatusEnum,
-  convertToInteger,
   DICT_TYPE,
-  formatToFraction,
   getDictOptions,
   getRangePickerDefaultProps,
 } from '#/utils';
diff --git a/apps/web-antd/src/views/member/user/modules/balance-form.vue b/apps/web-antd/src/views/member/user/modules/balance-form.vue
index 3c0b7377f..c11b1d479 100644
--- a/apps/web-antd/src/views/member/user/modules/balance-form.vue
+++ b/apps/web-antd/src/views/member/user/modules/balance-form.vue
@@ -4,6 +4,7 @@ import type { MemberUserApi } from '#/api/member/user';
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { formatToFraction } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -11,7 +12,6 @@ import { useVbenForm } from '#/adapter/form';
 import { getUser, updateUser } from '#/api/member/user';
 import { getWallet } from '#/api/pay/wallet/balance';
 import { $t } from '#/locales';
-import { formatToFraction } from '#/utils';
 
 import { useBalanceFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/pay/cashier/index.vue b/apps/web-antd/src/views/pay/cashier/index.vue
index 3fa92eea9..c4973bf45 100644
--- a/apps/web-antd/src/views/pay/cashier/index.vue
+++ b/apps/web-antd/src/views/pay/cashier/index.vue
@@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
-import { formatDate } from '@vben/utils';
+import { fenToYuan, formatDate } from '@vben/utils';
 
 import {
   Button,
@@ -19,7 +19,6 @@ import {
 
 import { getOrder, submitOrder } from '#/api/pay/order';
 import {
-  fenToYuan,
   PayChannelEnum,
   PayDisplayModeEnum,
   PayOrderStatusEnum,
diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue b/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue
index e872a078c..022189120 100644
--- a/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue
+++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue
@@ -4,6 +4,7 @@ import type { WalletRechargePackageApi } from '#/api/pay/wallet/rechargePackage'
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { fenToYuan, yuanToFen } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -14,7 +15,6 @@ import {
   updatePackage,
 } from '#/api/pay/wallet/rechargePackage';
 import { $t } from '#/locales';
-import { fenToYuan, yuanToFen } from '#/utils';
 
 import { useFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/utils/formatNumber.ts b/packages/@core/base/shared/src/utils/formatNumber.ts
similarity index 84%
rename from apps/web-antd/src/utils/formatNumber.ts
rename to packages/@core/base/shared/src/utils/formatNumber.ts
index ad3b211c7..4af124e50 100644
--- a/apps/web-antd/src/utils/formatNumber.ts
+++ b/packages/@core/base/shared/src/utils/formatNumber.ts
@@ -1,12 +1,25 @@
-// TODO @xingyu：感觉 formatToFraction 可以整合起来；【优先级：低】
+import { isEmpty, isString, isUndefined } from './inference';
+
+/**
+ * 将一个整数转换为分数保留传入的小数
+ * @param num
+ * @param digit
+ */
+export function formatToFractionDigit(
+  num: number | string | undefined,
+  digit: number = 2,
+): string {
+  if (isUndefined(num)) return '0.00';
+  const parsedNumber = isString(num) ? Number.parseFloat(num) : num;
+  return (parsedNumber / 100).toFixed(digit);
+}
+
 /**
  * 将一个整数转换为分数保留两位小数
  * @param num
  */
 export function formatToFraction(num: number | string | undefined): string {
-  if (num === undefined) return '0.00';
-  const parsedNumber = typeof num === 'string' ? Number.parseFloat(num) : num;
-  return (parsedNumber / 100).toFixed(2);
+  return formatToFractionDigit(num, 2);
 }
 
 /**
@@ -17,9 +30,7 @@ export function formatToFraction(num: number | string | undefined): string {
  */
 export function floatToFixed2(num: number | string | undefined): string {
   let str = '0.00';
-  if (num === undefined) {
-    return str;
-  }
+  if (isUndefined(num)) return str;
   const f = formatToFraction(num);
   const decimalPart = f.toString().split('.')[1];
   const len = decimalPart ? decimalPart.length : 0;
@@ -45,8 +56,8 @@ export function floatToFixed2(num: number | string | undefined): string {
  * @param num
  */
 export function convertToInteger(num: number | string | undefined): number {
-  if (num === undefined) return 0;
-  const parsedNumber = typeof num === 'string' ? Number.parseFloat(num) : num;
+  if (isUndefined(num)) return 0;
+  const parsedNumber = isString(num) ? Number.parseFloat(num) : num;
   return Math.round(parsedNumber * 100);
 }
 
@@ -125,7 +136,6 @@ export function erpCountInputFormatter(num: number | string | undefined) {
   return erpNumberFormatter(num, ERP_COUNT_DIGIT);
 }
 
-// noinspection JSCommentMatchesSignature
 /**
  * 【ERP】格式化数量，保留三位小数
  *
@@ -148,7 +158,6 @@ export function erpPriceInputFormatter(num: number | string | undefined) {
   return erpNumberFormatter(num, ERP_PRICE_DIGIT);
 }
 
-// noinspection JSCommentMatchesSignature
 /**
  * 【ERP】格式化金额，保留二位小数
  *
@@ -167,9 +176,7 @@ export function erpPriceTableColumnFormatter(cellValue: any) {
  * @return 总价格。如果有任一为空，则返回 undefined
  */
 export function erpPriceMultiply(price: number, count: number) {
-  if (price === null || count === null) {
-    return undefined;
-  }
+  if (isEmpty(price) || isEmpty(count)) return undefined;
   return Number.parseFloat((price * count).toFixed(ERP_PRICE_DIGIT));
 }
 
diff --git a/packages/@core/base/shared/src/utils/index.ts b/packages/@core/base/shared/src/utils/index.ts
index a1d553fad..8e57292f6 100644
--- a/packages/@core/base/shared/src/utils/index.ts
+++ b/packages/@core/base/shared/src/utils/index.ts
@@ -3,6 +3,7 @@ export * from './date';
 export * from './diff';
 export * from './dom';
 export * from './download';
+export * from './formatNumber';
 export * from './inference';
 export * from './letter';
 export * from './merge';

From 070605ec6e5f51fd9404d47fefc938ffe4c6aa4a Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Wed, 11 Jun 2025 21:07:50 +0800
Subject: [PATCH 10/14] =?UTF-8?q?perf:=20[BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81]=20Simple=20=E6=A8=A1=E5=9E=8B=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodes-config/condition-node-config.vue           |  7 ++++---
 .../nodes-config/copy-task-node-config.vue           |  8 ++++----
 .../nodes-config/delay-timer-node-config.vue         |  8 ++++----
 .../components/nodes-config/router-node-config.vue   |  8 ++++----
 .../nodes-config/start-user-node-config.vue          |  8 ++++----
 .../components/nodes-config/trigger-node-config.vue  |  8 ++++----
 .../nodes-config/user-task-node-config.vue           |  8 ++++----
 .../components/nodes/copy-task-node.vue              |  5 +++--
 .../components/nodes/delay-timer-node.vue            |  5 +++--
 .../components/nodes/exclusive-node.vue              |  7 ++++---
 .../components/nodes/inclusive-node.vue              |  7 ++++---
 .../components/nodes/parallel-node.vue               |  7 ++++---
 .../components/nodes/router-node.vue                 |  5 +++--
 .../components/nodes/start-user-node.vue             |  5 +++--
 .../components/nodes/trigger-node.vue                |  5 +++--
 .../components/nodes/user-task-node.vue              |  5 +++--
 .../src/components/simple-process-design/helpers.ts  | 12 ++++++------
 17 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue
index cc4376efc..11e0da4b4 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue
@@ -144,8 +144,8 @@ function clickIcon() {
   showInput.value = true;
 }
 
-// 输入框失去焦点
-function blurEvent() {
+// 修改节点名称
+function changeNodeName() {
   showInput.value = false;
   currentNode.value.name =
     currentNode.value.name ||
@@ -166,7 +166,8 @@ defineExpose({ open }); // 提供 open 方法，用于打开弹窗
           v-if="showInput"
           type="text"
           class="mr-2 w-48"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="currentNode.name"
           :placeholder="currentNode.name"
         />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
index 7bbe3b3cf..658392f83 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
@@ -75,9 +75,8 @@ const [Drawer, drawerApi] = useVbenDrawer({
 const currentNode = useWatchNode(props);
 
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
-  BpmNodeTypeEnum.COPY_TASK_NODE,
-);
+const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
+  useNodeName(BpmNodeTypeEnum.COPY_TASK_NODE);
 
 // 激活的 Tab 标签页
 const activeTabName = ref('user');
@@ -216,7 +215,8 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
           ref="inputRef"
           type="text"
           class="config-editable-input"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="nodeName"
           :placeholder="nodeName"
         />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
index 89f58161b..c8c8511a5 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
@@ -45,9 +45,8 @@ const props = defineProps({
 // 当前节点
 const currentNode = useWatchNode(props);
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
-  BpmNodeTypeEnum.DELAY_TIMER_NODE,
-);
+const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
+  useNodeName(BpmNodeTypeEnum.DELAY_TIMER_NODE);
 // 抄送人表单配置
 const formRef = ref(); // 表单 Ref
 
@@ -161,7 +160,8 @@ defineExpose({ openDrawer }); // 暴露方法给父组件
           ref="inputRef"
           type="text"
           class="mr-2 w-48"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="nodeName"
           :placeholder="nodeName"
         />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue
index f377d7d5a..e10f7a84c 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue
@@ -41,9 +41,8 @@ const processNodeTree = inject<Ref<SimpleFlowNode>>('processNodeTree');
 /** 当前节点 */
 const currentNode = useWatchNode(props);
 /** 节点名称 */
-const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
-  BpmNodeTypeEnum.ROUTER_BRANCH_NODE,
-);
+const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
+  useNodeName(BpmNodeTypeEnum.ROUTER_BRANCH_NODE);
 const routerGroups = ref<RouterSetting[]>([]);
 const nodeOptions = ref<any[]>([]);
 const conditionRef = ref<any[]>([]);
@@ -209,7 +208,8 @@ defineExpose({ openDrawer }); // 暴露方法给父组件
           v-if="showInput"
           type="text"
           class="mr-2 w-48"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="nodeName"
           :placeholder="nodeName"
         />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue
index eb0d7e704..0c12a2104 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue
@@ -52,9 +52,8 @@ const deptOptions = inject<Ref<SystemDeptApi.Dept[]>>('deptList');
 // 当前节点
 const currentNode = useWatchNode(props);
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
-  BpmNodeTypeEnum.START_USER_NODE,
-);
+const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
+  useNodeName(BpmNodeTypeEnum.START_USER_NODE);
 // 激活的 Tab 标签页
 const activeTabName = ref('user');
 
@@ -150,7 +149,8 @@ defineExpose({ showStartUserNodeConfig });
           v-if="showInput"
           type="text"
           class="config-editable-input"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="nodeName"
           :placeholder="nodeName"
         />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index 952c77261..b051f3195 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -72,9 +72,8 @@ const [Drawer, drawerApi] = useVbenDrawer({
 // 当前节点
 const currentNode = useWatchNode(props);
 // 节点名称
-const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
-  BpmNodeTypeEnum.TRIGGER_NODE,
-);
+const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
+  useNodeName(BpmNodeTypeEnum.TRIGGER_NODE);
 // 触发器表单配置
 const formRef = ref(); // 表单 Ref
 
@@ -392,7 +391,8 @@ onMounted(() => {
           v-if="showInput"
           type="text"
           class="config-editable-input"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="nodeName"
           :placeholder="nodeName"
         />
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 9da410f1d..441a2b7ef 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
@@ -114,9 +114,8 @@ const [Drawer, drawerApi] = useVbenDrawer({
 });
 
 // 节点名称配置
-const { nodeName, showInput, clickIcon, blurEvent, inputRef } = useNodeName(
-  BpmNodeTypeEnum.USER_TASK_NODE,
-);
+const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
+  useNodeName(BpmNodeTypeEnum.USER_TASK_NODE);
 
 // 激活的 Tab 标签页
 const activeTabName = ref('user');
@@ -589,7 +588,8 @@ onMounted(() => {
           ref="inputRef"
           type="text"
           class="config-editable-input"
-          @blur="blurEvent()"
+          @blur="changeNodeName()"
+          @press-enter="changeNodeName()"
           v-model:value="nodeName"
           :placeholder="nodeName"
         />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue
index 32deb8992..5f07ffa5c 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/copy-task-node.vue
@@ -32,7 +32,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
+const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.COPY_TASK_NODE,
 );
@@ -71,7 +71,8 @@ function deleteNode() {
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
-            @blur="blurEvent()"
+            @blur="changeNodeName()"
+            @press-enter="changeNodeName()"
             v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue
index 5e55fad99..4d5835e44 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/delay-timer-node.vue
@@ -30,7 +30,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
+const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.DELAY_TIMER_NODE,
 );
@@ -68,7 +68,8 @@ function deleteNode() {
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
-            @blur="blurEvent()"
+            @blur="changeNodeName()"
+            @press-enter="changeNodeName()"
             v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue
index 6a716b3e8..5b9b5983d 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue
@@ -73,8 +73,8 @@ watch(
   { deep: true },
 );
 
-// 失去焦点
-function blurEvent(index: number) {
+// 修改节点名称
+function changeNodeName(index: number) {
   showInputs.value[index] = false;
   const conditionNode = currentNode.value.conditionNodes?.at(
     index,
@@ -214,7 +214,8 @@ function recursiveFindParentNode(
                     "
                     type="text"
                     class="editable-title-input"
-                    @blur="blurEvent(index)"
+                    @blur="changeNodeName(index)"
+                    @press-enter="changeNodeName(index)"
                     v-model:value="item.name"
                   />
                 </div>
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue
index caf15c937..14cb94ff7 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue
@@ -77,8 +77,8 @@ watch(
   },
   { deep: true },
 );
-// 失去焦点
-function blurEvent(index: number) {
+// 修改节点名称
+function changeNodeName(index: number) {
   showInputs.value[index] = false;
   const conditionNode = currentNode.value.conditionNodes?.at(
     index,
@@ -217,7 +217,8 @@ function recursiveFindParentNode(
                     "
                     type="text"
                     class="editable-title-input"
-                    @blur="blurEvent(index)"
+                    @blur="changeNodeName(index)"
+                    @press-enter="changeNodeName(index)"
                     v-model:value="item.name"
                   />
                 </div>
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue
index 8ead12916..1d543c0ba 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue
@@ -66,8 +66,8 @@ watch(
   },
   { deep: true },
 );
-// 失去焦点
-function blurEvent(index: number) {
+// 修改节点名称
+function changeNodeName(index: number) {
   showInputs.value[index] = false;
   const conditionNode = currentNode.value.conditionNodes?.at(
     index,
@@ -175,7 +175,8 @@ function recursiveFindParentNode(
                     "
                     type="text"
                     class="input-max-width editable-title-input"
-                    @blur="blurEvent(index)"
+                    @blur="changeNodeName(index)"
+                    @press-enter="changeNodeName(index)"
                     v-model:value="item.name"
                   />
                 </div>
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue
index 35df60b87..91c86b96e 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue
@@ -33,7 +33,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
+const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.ROUTER_BRANCH_NODE,
 );
@@ -71,7 +71,8 @@ function deleteNode() {
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
-            @blur="blurEvent()"
+            @blur="changeNodeName()"
+            @press-enter="changeNodeName()"
             v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue
index e9055ef28..f2fd76e66 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/start-user-node.vue
@@ -37,7 +37,7 @@ const tasks = inject<Ref<any[]>>('tasks', ref([]));
 // 监控节点变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
+const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.START_USER_NODE,
 );
@@ -85,7 +85,8 @@ function nodeClick() {
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
-            @blur="blurEvent()"
+            @blur="changeNodeName()"
+            @press-enter="changeNodeName()"
             v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue
index 84f7f3d4e..f373ae065 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/trigger-node.vue
@@ -35,7 +35,7 @@ const readonly = inject<Boolean>('readonly');
 // 监控节点的变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
+const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.TRIGGER_NODE,
 );
@@ -73,7 +73,8 @@ function deleteNode() {
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
-            @blur="blurEvent()"
+            @blur="changeNodeName()"
+            @press-enter="changeNodeName()"
             v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue
index 57ea49467..120eff145 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes/user-task-node.vue
@@ -36,7 +36,7 @@ const tasks = inject<Ref<any[]>>('tasks', ref([]));
 // 监控节点变化
 const currentNode = useWatchNode(props);
 // 节点名称编辑
-const { showInput, blurEvent, clickTitle, inputRef } = useNodeName2(
+const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
   currentNode,
   BpmNodeTypeEnum.USER_TASK_NODE,
 );
@@ -91,7 +91,8 @@ function findReturnTaskNodes(
             v-if="!readonly && showInput"
             type="text"
             class="editable-title-input"
-            @blur="blurEvent()"
+            @blur="changeNodeName()"
+            @press-enter="changeNodeName()"
             v-model:value="currentNode.name"
             :placeholder="currentNode.name"
           />
diff --git a/apps/web-antd/src/components/simple-process-design/helpers.ts b/apps/web-antd/src/components/simple-process-design/helpers.ts
index 26f91ad73..c346de209 100644
--- a/apps/web-antd/src/components/simple-process-design/helpers.ts
+++ b/apps/web-antd/src/components/simple-process-design/helpers.ts
@@ -628,8 +628,8 @@ export function useNodeName(nodeType: BpmNodeTypeEnum) {
   function clickIcon() {
     showInput.value = true;
   }
-  // 节点名称输入框失去焦点
-  function blurEvent() {
+  // 修改节点名称
+  function changeNodeName() {
     showInput.value = false;
     nodeName.value =
       nodeName.value || (NODE_DEFAULT_NAME.get(nodeType) as string);
@@ -648,7 +648,7 @@ export function useNodeName(nodeType: BpmNodeTypeEnum) {
     showInput,
     inputRef,
     clickIcon,
-    blurEvent,
+    changeNodeName,
   };
 }
 
@@ -670,8 +670,8 @@ export function useNodeName2(
     }
   });
 
-  // 节点名称输入框失去焦点
-  function blurEvent() {
+  // 修改节点名称
+  function changeNodeName() {
     showInput.value = false;
     node.value.name =
       node.value.name || (NODE_DEFAULT_NAME.get(nodeType) as string);
@@ -685,7 +685,7 @@ export function useNodeName2(
     showInput,
     inputRef,
     clickTitle,
-    blurEvent,
+    changeNodeName,
   };
 }
 

From 789f202e5529248d3ea73af478026813b8e8d197 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Thu, 12 Jun 2025 09:59:24 +0800
Subject: [PATCH 11/14] feat: dict tag supper hexColor

---
 .../src/components/dict-tag/dict-tag.vue         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/web-antd/src/components/dict-tag/dict-tag.vue b/apps/web-antd/src/components/dict-tag/dict-tag.vue
index fb26b4ae1..7d9a5f1f3 100644
--- a/apps/web-antd/src/components/dict-tag/dict-tag.vue
+++ b/apps/web-antd/src/components/dict-tag/dict-tag.vue
@@ -23,6 +23,11 @@ interface DictTagProps {
 
 const props = defineProps<DictTagProps>();
 
+function isHexColor(color: string) {
+  const reg = /^#(?:[0-9a-f]{3}|[0-9a-f]{6})$/i;
+  return reg.test(color);
+}
+
 /** 获取字典标签 */
 const dictTag = computed(() => {
   // 校验参数有效性
@@ -66,7 +71,16 @@ const dictTag = computed(() => {
 </script>
 
 <template>
-  <Tag v-if="dictTag" :color="dictTag.colorType">
+  <Tag
+    v-if="dictTag"
+    :color="
+      dictTag.colorType
+        ? dictTag.colorType
+        : dictTag.cssClass && isHexColor(dictTag.cssClass)
+          ? dictTag.cssClass
+          : ''
+    "
+  >
     {{ dictTag.label }}
   </Tag>
 </template>

From c458a43f582cb0f5f1a40e36a4dc86eda7290a89 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Thu, 12 Jun 2025 16:11:54 +0800
Subject: [PATCH 12/14] perf: table actions

---
 .../components/table-action/table-action.vue  | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/apps/web-antd/src/components/table-action/table-action.vue b/apps/web-antd/src/components/table-action/table-action.vue
index 7595b87c1..fe0bfe8fb 100644
--- a/apps/web-antd/src/components/table-action/table-action.vue
+++ b/apps/web-antd/src/components/table-action/table-action.vue
@@ -43,28 +43,27 @@ const { hasAccessByCodes } = useAccess();
 
 function isIfShow(action: ActionItem): boolean {
   const ifShow = action.ifShow;
-
   let isIfShow = true;
-
   if (isBoolean(ifShow)) {
     isIfShow = ifShow;
   }
   if (isFunction(ifShow)) {
     isIfShow = ifShow(action);
   }
+  if (isIfShow) {
+    isIfShow =
+      hasAccessByCodes(action.auth || []) || (action.auth || []).length === 0;
+  }
   return isIfShow;
 }
 
 const getActions = computed(() => {
-  return (toRaw(props.actions) || [])
-    .filter((action) => {
-      return (
-        (hasAccessByCodes(action.auth || []) ||
-          (action.auth || []).length === 0) &&
-        isIfShow(action)
-      );
+  const actions = toRaw(props.actions) || [];
+  return actions
+    .filter((action: ActionItem) => {
+      return isIfShow(action);
     })
-    .map((action) => {
+    .map((action: ActionItem) => {
       const { popConfirm } = action;
       return {
         type: action.type || 'link',
@@ -78,24 +77,21 @@ const getActions = computed(() => {
 });
 
 const getDropdownList = computed((): any[] => {
-  return (toRaw(props.dropDownActions) || [])
-    .filter((action) => {
-      return (
-        (hasAccessByCodes(action.auth || []) ||
-          (action.auth || []).length === 0) &&
-        isIfShow(action)
-      );
+  const dropDownActions = toRaw(props.dropDownActions) || [];
+  return dropDownActions
+    .filter((action: ActionItem) => {
+      return isIfShow(action);
     })
-    .map((action, index) => {
+    .map((action: ActionItem, index: number) => {
       const { label, popConfirm } = action;
+      delete action.icon;
       return {
         ...action,
         ...popConfirm,
         onConfirm: popConfirm?.confirm,
         onCancel: popConfirm?.cancel,
         text: label,
-        divider:
-          index < props.dropDownActions.length - 1 ? props.divider : false,
+        divider: index < dropDownActions.length - 1 ? props.divider : false,
       };
     });
 });

From 8770c9f3743d8d2a733f1b83e4323971468d0d2b Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Thu, 12 Jun 2025 16:48:33 +0800
Subject: [PATCH 13/14] fix: utils

---
 apps/web-antd/src/views/crm/business/data.ts             | 3 ++-
 apps/web-antd/src/views/crm/business/modules/form.vue    | 2 +-
 apps/web-antd/src/views/crm/contract/data.ts             | 4 +++-
 .../src/views/crm/contract/modules/detail-data.ts        | 9 ++++++---
 apps/web-antd/src/views/crm/contract/modules/form.vue    | 2 +-
 .../src/views/crm/product/modules/detail-data.ts         | 4 +++-
 .../src/views/crm/product/modules/detail-list.vue        | 3 ++-
 .../src/views/crm/product/modules/product-table.vue      | 3 ++-
 apps/web-antd/src/views/crm/receivable/plan/data.ts      | 4 +++-
 apps/web-antd/src/views/pay/demo/withdraw/index.vue      | 2 +-
 apps/web-antd/src/views/pay/order/modules/detail.vue     | 4 ++--
 apps/web-antd/src/views/pay/transfer/data.ts             | 9 ++-------
 12 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/apps/web-antd/src/views/crm/business/data.ts b/apps/web-antd/src/views/crm/business/data.ts
index 34b04a094..6993b9af3 100644
--- a/apps/web-antd/src/views/crm/business/data.ts
+++ b/apps/web-antd/src/views/crm/business/data.ts
@@ -1,10 +1,11 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
+import { erpPriceMultiply } from '@vben/utils';
+
 import { getBusinessStatusTypeSimpleList } from '#/api/crm/business/status';
 import { getCustomerSimpleList } from '#/api/crm/customer';
 import { getSimpleUserList } from '#/api/system/user';
-import { erpPriceMultiply } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/crm/business/modules/form.vue b/apps/web-antd/src/views/crm/business/modules/form.vue
index 3a25fb663..b4ed65930 100644
--- a/apps/web-antd/src/views/crm/business/modules/form.vue
+++ b/apps/web-antd/src/views/crm/business/modules/form.vue
@@ -4,6 +4,7 @@ import type { CrmBusinessApi } from '#/api/crm/business';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { erpPriceMultiply } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -15,7 +16,6 @@ import {
 } from '#/api/crm/business';
 import { BizTypeEnum } from '#/api/crm/permission';
 import { $t } from '#/locales';
-import { erpPriceMultiply } from '#/utils';
 import { ProductEditTable } from '#/views/crm/product';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/crm/contract/data.ts b/apps/web-antd/src/views/crm/contract/data.ts
index 062823c63..651ddb082 100644
--- a/apps/web-antd/src/views/crm/contract/data.ts
+++ b/apps/web-antd/src/views/crm/contract/data.ts
@@ -1,12 +1,14 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
+import { erpPriceMultiply, floatToFixed2 } from '@vben/utils';
+
 import { z } from '#/adapter/form';
 import { getSimpleBusinessList } from '#/api/crm/business';
 import { getSimpleContactList } from '#/api/crm/contact';
 import { getCustomerSimpleList } from '#/api/crm/customer';
 import { getSimpleUserList } from '#/api/system/user';
-import { DICT_TYPE, erpPriceMultiply, floatToFixed2 } from '#/utils';
+import { DICT_TYPE } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/crm/contract/modules/detail-data.ts b/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
index 5090cd3ed..2421459a7 100644
--- a/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
@@ -3,11 +3,14 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
-import { formatDateTime } from '@vben/utils';
+import {
+  erpPriceInputFormatter,
+  floatToFixed2,
+  formatDateTime,
+} from '@vben/utils';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE, erpPriceInputFormatter, floatToFixed2 } from '#/utils';
-
+import { DICT_TYPE } from '#/utils';
 /** 详情头部的配置 */
 export function useDetailSchema(): DescriptionItemSchema[] {
   return [
diff --git a/apps/web-antd/src/views/crm/contract/modules/form.vue b/apps/web-antd/src/views/crm/contract/modules/form.vue
index b96f22c02..3cc291a14 100644
--- a/apps/web-antd/src/views/crm/contract/modules/form.vue
+++ b/apps/web-antd/src/views/crm/contract/modules/form.vue
@@ -4,6 +4,7 @@ import type { CrmContractApi } from '#/api/crm/contract';
 import { computed, ref } from 'vue';
 
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
+import { erpPriceMultiply } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -14,7 +15,6 @@ import {
 } from '#/api/crm/contract';
 import { BizTypeEnum } from '#/api/crm/permission';
 import { $t } from '#/locales';
-import { erpPriceMultiply } from '#/utils';
 import { ProductEditTable } from '#/views/crm/product';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/crm/product/modules/detail-data.ts b/apps/web-antd/src/views/crm/product/modules/detail-data.ts
index c317444a9..609612d42 100644
--- a/apps/web-antd/src/views/crm/product/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/product/modules/detail-data.ts
@@ -3,8 +3,10 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
+import { erpPriceInputFormatter } from '@vben/utils';
+
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE, erpPriceInputFormatter } from '#/utils';
+import { DICT_TYPE } from '#/utils';
 
 /** 详情页的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
diff --git a/apps/web-antd/src/views/crm/product/modules/detail-list.vue b/apps/web-antd/src/views/crm/product/modules/detail-list.vue
index 9dfb52ed6..fe840fb67 100644
--- a/apps/web-antd/src/views/crm/product/modules/detail-list.vue
+++ b/apps/web-antd/src/views/crm/product/modules/detail-list.vue
@@ -4,11 +4,12 @@ import type { CrmProductApi } from '#/api/crm/product';
 
 import { ref } from 'vue';
 
+import { erpPriceInputFormatter } from '@vben/utils';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getBusiness } from '#/api/crm/business';
 import { getContract } from '#/api/crm/contract';
 import { BizTypeEnum } from '#/api/crm/permission';
-import { erpPriceInputFormatter } from '#/utils';
 
 import { useDetailListColumns } from './detail-data';
 
diff --git a/apps/web-antd/src/views/crm/product/modules/product-table.vue b/apps/web-antd/src/views/crm/product/modules/product-table.vue
index 6ef206355..a9083b61c 100644
--- a/apps/web-antd/src/views/crm/product/modules/product-table.vue
+++ b/apps/web-antd/src/views/crm/product/modules/product-table.vue
@@ -5,12 +5,13 @@ import type { CrmProductApi } from '#/api/crm/product';
 
 import { nextTick, onMounted, ref, watch } from 'vue';
 
+import { erpPriceMultiply } from '@vben/utils';
+
 import { InputNumber, Select } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { BizTypeEnum } from '#/api/crm/permission';
 import { getProductSimpleList } from '#/api/crm/product';
-import { erpPriceMultiply } from '#/utils';
 
 import { useProductEditTableColumns } from '../data';
 
diff --git a/apps/web-antd/src/views/crm/receivable/plan/data.ts b/apps/web-antd/src/views/crm/receivable/plan/data.ts
index 6f6eec23a..2ae3fe87e 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/data.ts
+++ b/apps/web-antd/src/views/crm/receivable/plan/data.ts
@@ -1,8 +1,10 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
+import { floatToFixed2 } from '@vben/utils';
+
 import { getCustomerSimpleList } from '#/api/crm/customer';
-import { DICT_TYPE, floatToFixed2, getDictOptions } from '#/utils';
+import { DICT_TYPE, getDictOptions } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/pay/demo/withdraw/index.vue b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
index f92e408c5..5243bd4e4 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/index.vue
+++ b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { DemoWithdrawApi } from '#/api/pay/demo/withdraw';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { floatToFixed2 } from '@vben/utils';
 
 import { message, Tag } from 'ant-design-vue';
 
@@ -12,7 +13,6 @@ import {
   transferDemoWithdraw,
 } from '#/api/pay/demo/withdraw';
 import { $t } from '#/locales';
-import { floatToFixed2 } from '#/utils';
 
 import { useGridColumns } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue
index d91fc9d13..a7b604fe0 100644
--- a/apps/web-antd/src/views/pay/order/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/order/modules/detail.vue
@@ -4,13 +4,13 @@ import type { PayOrderApi } from '#/api/pay/order';
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { formatDateTime } from '@vben/utils';
+import { floatToFixed2, formatDateTime } from '@vben/utils';
 
 import { Descriptions, Divider, Tag } from 'ant-design-vue';
 
 import { getOrder } from '#/api/pay/order';
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE, floatToFixed2 } from '#/utils';
+import { DICT_TYPE } from '#/utils';
 
 const detailData = ref<PayOrderApi.Order>();
 
diff --git a/apps/web-antd/src/views/pay/transfer/data.ts b/apps/web-antd/src/views/pay/transfer/data.ts
index 06f875b6a..6b74bde2e 100644
--- a/apps/web-antd/src/views/pay/transfer/data.ts
+++ b/apps/web-antd/src/views/pay/transfer/data.ts
@@ -4,17 +4,12 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
-import { formatDateTime } from '@vben/utils';
+import { floatToFixed2, formatDateTime } from '@vben/utils';
 
 import { Tag } from 'ant-design-vue';
 
 import { DictTag } from '#/components/dict-tag';
-import {
-  DICT_TYPE,
-  floatToFixed2,
-  getDictOptions,
-  getRangePickerDefaultProps,
-} from '#/utils';
+import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {

From 0b4e0237e4cad32c4b84be0e4bb4afb2248a366e Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Thu, 12 Jun 2025 16:49:21 +0800
Subject: [PATCH 14/14] fix: type error

---
 .../src/views/crm/permission/modules/permission-list.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/crm/permission/modules/permission-list.vue b/apps/web-antd/src/views/crm/permission/modules/permission-list.vue
index 68181af94..f240c3654 100644
--- a/apps/web-antd/src/views/crm/permission/modules/permission-list.vue
+++ b/apps/web-antd/src/views/crm/permission/modules/permission-list.vue
@@ -140,7 +140,7 @@ async function handleQuit() {
     message.warning('你不是团队成员！');
     return;
   }
-  await deleteSelfPermission(userPermission.id);
+  await deleteSelfPermission(userPermission.id as number);
   message.success('退出团队成员成功！');
   emits('quitTeam');
 }