From 5e4dca001b128a4dd62cdf0fa3b33f3cbd393503 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Fri, 19 Sep 2025 18:55:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=A5=E8=A1=A8html=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/report/member/data.ts         |  4 +---
 .../src/views/report/member/modules/staff.vue         | 11 ++++++++++-
 .../src/views/report/progress/modules/project.vue     |  4 +---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/web-antd/src/views/report/member/data.ts b/apps/web-antd/src/views/report/member/data.ts
index 4785536..5f1c4f3 100644
--- a/apps/web-antd/src/views/report/member/data.ts
+++ b/apps/web-antd/src/views/report/member/data.ts
@@ -148,12 +148,10 @@ export function useStaffGridColumns(): VxeTableGridOptions<ProgressApi.Progress>
     {
       field: 'content',
       title: '进展记录',
-      type: 'html',
       showOverflow: false,
       align: 'left',
-      className: 'rich-text-comment-content-table',
-      // headerAlign: 'center',
       minWidth: 600,
+      slots: { default: 'contentDefault' },
     },
     {
       field: 'updateTime',
diff --git a/apps/web-antd/src/views/report/member/modules/staff.vue b/apps/web-antd/src/views/report/member/modules/staff.vue
index f0eb4c2..b145180 100644
--- a/apps/web-antd/src/views/report/member/modules/staff.vue
+++ b/apps/web-antd/src/views/report/member/modules/staff.vue
@@ -7,6 +7,7 @@ import dayjs from 'dayjs';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { exportStaff, getProgressByStaffPage } from '#/api/report/progress';
+import { ShadowContainer } from '#/components/shadow-container';
 
 import { useStaffGridColumns, useStaffGridFormSchema } from '../data';
 
@@ -149,5 +150,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
 </script>
 
 <template>
-  <Grid table-title="成员进展" />
+  <Grid table-title="成员进展">
+    <template #contentDefault="{ row }">
+      <!-- <div v-html="row.content" style="white-space: pre-wrap"></div> -->
+      <ShadowContainer
+        :content="row.content"
+        styles="font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 13px; color: #323639;"
+      />
+    </template>
+  </Grid>
 </template>
diff --git a/apps/web-antd/src/views/report/progress/modules/project.vue b/apps/web-antd/src/views/report/progress/modules/project.vue
index cd19c86..91d8438 100644
--- a/apps/web-antd/src/views/report/progress/modules/project.vue
+++ b/apps/web-antd/src/views/report/progress/modules/project.vue
@@ -155,9 +155,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <!-- <div v-html="row.content" style="white-space: pre-wrap"></div> -->
       <ShadowContainer
         :content="row.content"
-        styles="font-family: -apple-system, blinkmacsystemfont, 'Segoe UI', roboto, 'Helvetica Neue',
-    arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';"
+        styles="font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 13px; color: #323639;"
       />
     </template>
   </Grid>