From acf3d9a6f0b92b5f317812e2c03837847bfab5a9 Mon Sep 17 00:00:00 2001
From: ziye <278898052@qq.com>
Date: Tue, 13 May 2025 01:04:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20BPM=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E7=BB=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/bpm/group/index.vue   | 25 ++++++++++++-------
 .../bpm/processInstance/create/index.vue      | 23 +++++++++++------
 .../bpm/processInstance/detail/index.vue      | 12 ++++-----
 .../detail/modules/icons/index.ts             | 14 +++++++++++
 .../detail/modules/time-line.vue              | 10 ++++----
 packages/icons/src/svg/index.ts               | 11 --------
 6 files changed, 56 insertions(+), 39 deletions(-)
 create mode 100644 apps/web-antd/src/views/bpm/processInstance/detail/modules/icons/index.ts

diff --git a/apps/web-antd/src/views/bpm/group/index.vue b/apps/web-antd/src/views/bpm/group/index.vue
index 7f5406ca..ad68c318 100644
--- a/apps/web-antd/src/views/bpm/group/index.vue
+++ b/apps/web-antd/src/views/bpm/group/index.vue
@@ -42,6 +42,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
             ...formValues,
           });
         },
+        querySuccess: (params) => {
+          const { list } = params.response;
+          const userMap = new Map(
+            userList.value.map((user) => [user.id, user.nickname]),
+          );
+
+          list.forEach(
+            (item: BpmUserGroupApi.UserGroupVO & { nicknames?: string }) => {
+              item.nicknames = item.userIds
+                .map((userId) => userMap.get(userId))
+                .filter(Boolean)
+                .join('、');
+            },
+          );
+        },
       },
     },
     rowConfig: {
@@ -126,16 +141,8 @@ onMounted(async () => {
         </Button>
       </template>
 
-      <!-- TODO @ziye：可以在 data 里翻译哈。 -->
       <template #userIds-cell="{ row }">
-        <span
-          v-for="(userId, index) in row.userIds"
-          :key="userId"
-          class="pr-5px"
-        >
-          {{ userList.find((user) => user.id === userId)?.nickname }}
-          <span v-if="index < row.userIds.length - 1">、</span>
-        </span>
+        <span>{{ row.nicknames }}</span>
       </template>
     </Grid>
   </Page>
diff --git a/apps/web-antd/src/views/bpm/processInstance/create/index.vue b/apps/web-antd/src/views/bpm/processInstance/create/index.vue
index 34bc7d04..a8ceeb35 100644
--- a/apps/web-antd/src/views/bpm/processInstance/create/index.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/create/index.vue
@@ -265,18 +265,18 @@ onMounted(() => {
                       width: '100%',
                     }"
                   >
-                    <!-- TODO @ziye：使用名字作为图标，缺少了 -->
                     <div class="flex items-center">
                       <img
                         v-if="definition.icon"
                         :src="definition.icon"
-                        class="h-12 w-12 object-contain"
+                        class="flow-icon-img object-contain"
                         alt="流程图标"
                       />
+
                       <div v-else class="flow-icon flex-shrink-0">
                         <Tooltip :title="definition.name">
                           <span class="text-xs text-white">
-                            {{ definition.name }}
+                            {{ definition.name?.slice(0, 2) }}
                           </span>
                         </Tooltip>
                       </div>
@@ -325,19 +325,26 @@ onMounted(() => {
 <style lang="scss" scoped>
 .process-definition-container {
   .definition-item-card {
+    .flow-icon-img {
+      width: 48px;
+      height: 48px;
+      border-radius: 0.25rem;
+    }
+
     .flow-icon {
+      @apply bg-primary;
+
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 32px;
-      height: 32px;
-      background-color: #3f73f7;
-      border-radius: 50%;
+      width: 48px;
+      height: 48px;
+      border-radius: 0.25rem;
     }
 
     &.search-match {
       background-color: rgb(63 115 247 / 10%);
-      border: 1px solid #3f73f7;
+      border: 1px solid var(--primary);
       animation: bounce 0.5s ease;
     }
   }
diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue
index 1a9f670a..5e34853c 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue
@@ -5,12 +5,6 @@ import type { SystemUserApi } from '#/api/system/user';
 import { nextTick, onMounted, ref } from 'vue';
 
 import { Page } from '@vben/common-ui';
-import {
-  SvgBpmApproveIcon,
-  SvgBpmCancelIcon,
-  SvgBpmRejectIcon,
-  SvgBpmRunningIcon,
-} from '@vben/icons';
 import { formatDateTime } from '@vben/utils';
 
 import {
@@ -38,6 +32,12 @@ import {
   registerComponent,
   setConfAndFields2,
 } from '#/utils';
+import {
+  SvgBpmApproveIcon,
+  SvgBpmCancelIcon,
+  SvgBpmRejectIcon,
+  SvgBpmRunningIcon,
+} from '#/views/bpm/processInstance/detail/modules/icons';
 
 import ProcessInstanceTimeline from './modules/time-line.vue';
 
diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/icons/index.ts b/apps/web-antd/src/views/bpm/processInstance/detail/modules/icons/index.ts
new file mode 100644
index 00000000..9a9d28bb
--- /dev/null
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/icons/index.ts
@@ -0,0 +1,14 @@
+import { createIconifyIcon } from '@vben/icons';
+
+// bpm 图标
+const SvgBpmRunningIcon = createIconifyIcon('svg:bpm-running');
+const SvgBpmApproveIcon = createIconifyIcon('svg:bpm-approve');
+const SvgBpmRejectIcon = createIconifyIcon('svg:bpm-reject');
+const SvgBpmCancelIcon = createIconifyIcon('svg:bpm-cancel');
+
+export {
+  SvgBpmApproveIcon,
+  SvgBpmCancelIcon,
+  SvgBpmRejectIcon,
+  SvgBpmRunningIcon,
+};
diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
index f9909928..399e8c88 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -10,6 +10,7 @@ import { formatDateTime, isEmpty } from '@vben/utils';
 
 import { Avatar, Button, Image, Tooltip } from 'ant-design-vue';
 
+import { TimeLine } from '#/components/time-line';
 import { UserSelectModal } from '#/components/user-select-modal';
 import {
   BpmCandidateStrategyEnum,
@@ -215,12 +216,11 @@ const handleUserSelectCancel = () => {
 };
 </script>
 
-<!-- TODO @ziye：antd 组件，使用大写哈；目前项目风格是这样的 -->
 <template>
   <div>
-    <a-timeline class="pt-20px">
+    <TimeLine class="pt-20px">
       <!-- 遍历每个审批节点 -->
-      <a-timeline-item
+      <TimeLine.Item
         v-for="(activity, index) in activityNodes"
         :key="index"
         :color="getApprovalNodeColor(activity.status)"
@@ -449,8 +449,8 @@ const handleUserSelectCancel = () => {
             </div>
           </div>
         </div>
-      </a-timeline-item>
-    </a-timeline>
+      </TimeLine.Item>
+    </TimeLine>
 
     <!-- 用户选择弹窗 -->
     <UserSelectModal
diff --git a/packages/icons/src/svg/index.ts b/packages/icons/src/svg/index.ts
index 9cd1d088..3b5cb995 100644
--- a/packages/icons/src/svg/index.ts
+++ b/packages/icons/src/svg/index.ts
@@ -12,13 +12,6 @@ const SvgBellIcon = createIconifyIcon('svg:bell');
 const SvgCakeIcon = createIconifyIcon('svg:cake');
 const SvgAntdvLogoIcon = createIconifyIcon('svg:antdv-logo');
 
-// bpm 图标
-// TODO @ziye：这个看看，是不是拿到 bpm 模块里，不放在这里；因为有些团队，用不到 bpm 哈
-const SvgBpmRunningIcon = createIconifyIcon('svg:bpm-running');
-const SvgBpmApproveIcon = createIconifyIcon('svg:bpm-approve');
-const SvgBpmRejectIcon = createIconifyIcon('svg:bpm-reject');
-const SvgBpmCancelIcon = createIconifyIcon('svg:bpm-cancel');
-
 export {
   SvgAntdvLogoIcon,
   SvgAvatar1Icon,
@@ -26,10 +19,6 @@ export {
   SvgAvatar3Icon,
   SvgAvatar4Icon,
   SvgBellIcon,
-  SvgBpmApproveIcon,
-  SvgBpmCancelIcon,
-  SvgBpmRejectIcon,
-  SvgBpmRunningIcon,
   SvgCakeIcon,
   SvgCardIcon,
   SvgDownloadIcon,