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 1/3] =?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 7f5406cac..ad68c318c 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 () => { - 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 34bc7d040..a8ceeb353 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%', }" > -
流程图标 +
- {{ definition.name }} + {{ definition.name?.slice(0, 2) }}
@@ -325,19 +325,26 @@ onMounted(() => { diff --git a/apps/web-antd/src/views/bpm/form/index.vue b/apps/web-antd/src/views/bpm/form/index.vue index e4b8d5795..433f0a54a 100644 --- a/apps/web-antd/src/views/bpm/form/index.vue +++ b/apps/web-antd/src/views/bpm/form/index.vue @@ -1,34 +1,215 @@ diff --git a/apps/web-antd/src/views/bpm/form/modules/form.vue b/apps/web-antd/src/views/bpm/form/modules/form.vue new file mode 100644 index 000000000..4a395ec2b --- /dev/null +++ b/apps/web-antd/src/views/bpm/form/modules/form.vue @@ -0,0 +1,107 @@ + + + diff --git a/packages/locales/src/langs/en-US/ui.json b/packages/locales/src/langs/en-US/ui.json index a9fa1717d..143fa631c 100644 --- a/packages/locales/src/langs/en-US/ui.json +++ b/packages/locales/src/langs/en-US/ui.json @@ -11,6 +11,7 @@ "mobile": "Please input a valid {0}" }, "actionTitle": { + "copy": "Copy {0}", "cancel": "Cancel {0}", "edit": "Modify {0}", "create": "Create {0}", diff --git a/packages/locales/src/langs/zh-CN/ui.json b/packages/locales/src/langs/zh-CN/ui.json index 446cfe756..5afc10729 100644 --- a/packages/locales/src/langs/zh-CN/ui.json +++ b/packages/locales/src/langs/zh-CN/ui.json @@ -11,6 +11,7 @@ "mobile": "请输入正确的{0}" }, "actionTitle": { + "copy": "复制{0}", "cancel": "取消{0}", "edit": "修改{0}", "create": "新增{0}",