From 8c5b330cc8739659ab52e55191bafbf68ef27a8a Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 17 Nov 2022 23:27:19 +0800
Subject: [PATCH] fix: todo

---
 .../src/components/Descriptions/src/Descriptions.vue       | 3 ++-
 yudao-ui-admin-vue3/src/views/system/notice/index.vue      | 7 ++++++-
 yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
index 8781cfe0d..07e0dbb74 100644
--- a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
+++ b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
@@ -19,6 +19,7 @@ const props = defineProps({
   title: propTypes.string.def(''),
   message: propTypes.string.def(''),
   collapse: propTypes.bool.def(true),
+  columns: propTypes.number.def(1),
   schema: {
     type: Array as PropType<DescriptionsSchema[]>,
     default: () => []
@@ -94,7 +95,7 @@ const toggleClick = () => {
     <ElCollapseTransition>
       <div v-show="show" :class="[`${prefixCls}-content`, 'p-10px']">
         <ElDescriptions
-          :column="1"
+          :column="props.columns"
           border
           :direction="mobile ? 'vertical' : 'horizontal'"
           v-bind="getBindValue"
diff --git a/yudao-ui-admin-vue3/src/views/system/notice/index.vue b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
index 2e8aabcc1..54843e5ab 100644
--- a/yudao-ui-admin-vue3/src/views/system/notice/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
@@ -51,7 +51,11 @@
       v-if="actionType === 'detail'"
       :schema="allSchemas.detailSchema"
       :data="detailRef"
-    />
+    >
+      <template #content="{ row }">
+        <Editor :model-value="row.content" read-only="true" />
+      </template>
+    </Descriptions>
     <template #footer>
       <!-- 按钮：保存 -->
       <XButton
@@ -77,6 +81,7 @@ import { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as NoticeApi from '@/api/system/notice'
 import { rules, allSchemas } from './notice.data'
+import { Editor } from '@/components/Editor'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts b/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts
index 88e6848e0..ad22b5967 100644
--- a/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts
@@ -39,7 +39,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
       title: '公告内容',
       field: 'content',
       table: {
-        type: 'html' // TODO 芋艿：详情展示，会是 html 的原始内容。要不改成直接使用富文本展示，设置个 readonly？
+        type: 'html'
       },
       form: {
         component: 'Editor',