Browse Source

fix: todo

xingyu 2 years ago
parent
commit
8c5b330cc8

+ 2 - 1
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"

+ 6 - 1
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() // 消息弹窗

+ 1 - 1
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',