From 4085b05dae26212a810803a192991dc66be9d0f5 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 30 Jan 2026 17:03:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(workflow):=20=E7=A7=BB=E9=99=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=99=84=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E7=BA=BF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除apply-modal、approval-modal、approval-rejection-modal中附件上传字段的冗余defaultValue配置，避免潜在的表单数据冲突。同时调整approval-timeline组件样式，禁用非完成状态项的悬停颜色，并增加时间线项间距以改善视觉呈现。在approval-timeline-item中使用DictTag组件替代renderDict函数以提升字典渲染的一致性和可维护性。
---
 .../views/workflow/components/apply-modal.vue   |  1 -
 .../workflow/components/approval-modal.vue      |  1 -
 .../components/approval-rejection-modal.vue     |  1 -
 .../components/approval-timeline-item.vue       |  9 ++++++---
 .../workflow/components/approval-timeline.vue   | 17 ++++++++++++++++-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/web-antd/src/views/workflow/components/apply-modal.vue b/apps/web-antd/src/views/workflow/components/apply-modal.vue
index fd48a70e..5c4ce89d 100644
--- a/apps/web-antd/src/views/workflow/components/apply-modal.vue
+++ b/apps/web-antd/src/views/workflow/components/apply-modal.vue
@@ -103,7 +103,6 @@ const [BasicForm, formApi] = useVbenForm({
         maxSize: 20,
         accept: 'png, jpg, jpeg, doc, docx, xlsx, xls, ppt, pdf',
       },
-      defaultValue: [],
       label: '附件上传',
       formItemClass: 'items-start',
     },
diff --git a/apps/web-antd/src/views/workflow/components/approval-modal.vue b/apps/web-antd/src/views/workflow/components/approval-modal.vue
index e4c209dc..3caf9a85 100644
--- a/apps/web-antd/src/views/workflow/components/approval-modal.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-modal.vue
@@ -62,7 +62,6 @@ const [BasicForm, formApi] = useVbenForm({
         maxSize: 20,
         accept: 'png, jpg, jpeg, doc, docx, xlsx, xls, ppt, pdf',
       },
-      defaultValue: [],
       label: '附件上传',
       formItemClass: 'items-start',
     },
diff --git a/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue b/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue
index eca143d5..82bd184d 100644
--- a/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue
@@ -58,7 +58,6 @@ const [BasicForm, formApi] = useVbenForm({
         maxSize: 20,
         accept: 'png, jpg, jpeg, doc, docx, xlsx, xls, ppt, pdf',
       },
-      defaultValue: [],
       label: '附件上传',
       formItemClass: 'items-start',
     },
diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue b/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue
index ae6388f3..b5a7ecaf 100644
--- a/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue
@@ -10,7 +10,8 @@ import { MessageOutlined, UserOutlined } from '@antdv-next/icons';
 import { Avatar } from 'antdv-next';
 
 import { ossInfo } from '#/api/system/oss';
-import { renderDict } from '#/utils/render';
+import { DictTag } from '#/components/dict';
+import { getDictOptions } from '#/utils/dict';
 
 defineOptions({
   name: 'ApprovalTimelineItem',
@@ -43,14 +44,16 @@ onMounted(async () => {
 const isMultiplePerson = computed(
   () => props.item.approver?.split(',').length > 1,
 );
+
+const flowStatusOptions = getDictOptions(DictEnum.WF_TASK_STATUS);
 </script>
 
 <template>
   <div>
-    <div class="mb-5 ml-2 flex flex-col gap-1">
+    <div :class="cn('mb-5 ml-2 flex flex-col gap-1', 'mt-[-8px]')">
       <div class="flex items-center gap-1">
         <div class="font-bold">{{ item.nodeName }}</div>
-        <component :is="renderDict(item.flowStatus, DictEnum.WF_TASK_STATUS)" />
+        <DictTag :value="item.flowStatus" :dicts="flowStatusOptions" />
       </div>
 
       <div :class="cn('mt-2 flex flex-wrap gap-2')" v-if="isMultiplePerson">
diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline.vue b/apps/web-antd/src/views/workflow/components/approval-timeline.vue
index 2208be21..bdaf4413 100644
--- a/apps/web-antd/src/views/workflow/components/approval-timeline.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-timeline.vue
@@ -60,6 +60,21 @@ const items = computed<TimelineProps['items']>(() => {
 </script>
 
 <template>
-  <Timeline v-if="list.length > 0" :items="items" />
+  <Timeline
+    v-if="list.length > 0"
+    :items="items"
+    :styles="{
+      item: {
+        /**
+         * 非finish状态hover会有加上primary色 不需要
+         */
+        '--ant-cmp-steps-item-text-hover-color': 'initial',
+        /**
+         * 时间线之间的间距 默认12px
+         */
+        '--ant-padding-sm': '16px',
+      },
+    }"
+  />
   <Empty v-else />
 </template>