feat: 优化 system

apps/web-antd/src/views/system/notify/message/data.ts

@@ -1,6 +1,12 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { DescriptionItemSchema } from '#/components/description';
 
+import { h } from 'vue';
+
+import { formatDateTime } from '@vben/utils';
+
+import { DictTag } from '#/components/dict-tag';
 import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -135,3 +141,84 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
+
+/** 详情页的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'id',
+      label: '编号',
+    },
+    {
+      field: 'userType',
+      label: '用户类型',
+      content: (data) => {
+        return h(DictTag, {
+          type: DICT_TYPE.USER_TYPE,
+          value: data?.userType,
+        });
+      },
+    },
+    {
+      field: 'userId',
+      label: '用户编号',
+    },
+    {
+      field: 'templateId',
+      label: '模版编号',
+    },
+    {
+      field: 'templateCode',
+      label: '模板编码',
+    },
+    {
+      field: 'templateNickname',
+      label: '发送人名称',
+    },
+    {
+      field: 'templateContent',
+      label: '模版内容',
+    },
+    {
+      field: 'templateParams',
+      label: '模版参数',
+      content: (data) => {
+        try {
+          return JSON.stringify(data?.templateParams);
+        } catch {
+          return '';
+        }
+      },
+    },
+    {
+      field: 'templateType',
+      label: '模版类型',
+      content: (data) => {
+        return h(DictTag, {
+          type: DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE,
+          value: data?.templateType,
+        });
+      },
+    },
+    {
+      field: 'readStatus',
+      label: '是否已读',
+      content: (data) => {
+        return h(DictTag, {
+          type: DICT_TYPE.INFRA_BOOLEAN_STRING,
+          value: data?.readStatus,
+        });
+      },
+    },
+    {
+      field: 'readTime',
+      label: '阅读时间',
+      content: (data) => formatDateTime(data?.readTime || '') as string,
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      content: (data) => formatDateTime(data?.createTime || '') as string,
+    },
+  ];
+}

apps/web-antd/src/views/system/notify/message/modules/detail.vue

@@ -4,15 +4,22 @@ import type { SystemNotifyMessageApi } from '#/api/system/notify/message';
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { formatDateTime } from '@vben/utils';
 
-import { Descriptions } from 'ant-design-vue';
+import { useDescription } from '#/components/description';
 
-import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '#/utils';
+import { useDetailSchema } from '../data';
 
 const formData = ref<SystemNotifyMessageApi.NotifyMessage>();
 
+const [Descriptions] = useDescription({
+  componentProps: {
+    bordered: true,
+    column: 1,
+    class: 'mx-4',
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
@@ -37,51 +44,10 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal
     title="站内信详情"
-    class="w-1/2"
+    class="w-1/3"
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Descriptions bordered :column="1" size="middle" class="mx-4">
-      <Descriptions.Item label="编号">{{ formData?.id }}</Descriptions.Item>
-      <Descriptions.Item label="用户类型">
-        <DictTag :type="DICT_TYPE.USER_TYPE" :value="formData?.userType" />
-      </Descriptions.Item>
-      <Descriptions.Item label="用户编号">
-        {{ formData?.userId }}
-      </Descriptions.Item>
-      <Descriptions.Item label="模版编号">
-        {{ formData?.templateId }}
-      </Descriptions.Item>
-      <Descriptions.Item label="模板编码">
-        {{ formData?.templateCode }}
-      </Descriptions.Item>
-      <Descriptions.Item label="发送人名称">
-        {{ formData?.templateNickname }}
-      </Descriptions.Item>
-      <Descriptions.Item label="模版内容">
-        {{ formData?.templateContent }}
-      </Descriptions.Item>
-      <Descriptions.Item label="模版参数">
-        {{ formData?.templateParams }}
-      </Descriptions.Item>
-      <Descriptions.Item label="模版类型">
-        <DictTag
-          :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE"
-          :value="formData?.templateType"
-        />
-      </Descriptions.Item>
-      <Descriptions.Item label="是否已读">
-        <DictTag
-          :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
-          :value="formData?.readStatus"
-        />
-      </Descriptions.Item>
-      <Descriptions.Item label="阅读时间">
-        {{ formatDateTime(formData?.readTime || '') }}
-      </Descriptions.Item>
-      <Descriptions.Item label="创建时间">
-        {{ formatDateTime(formData?.createTime || '') }}
-      </Descriptions.Item>
-    </Descriptions>
+    <Descriptions :data="formData" />
   </Modal>
 </template>

apps/web-antd/src/views/system/notify/my/modules/detail.vue

@@ -11,7 +11,6 @@ const [Description, descApi] = useDescription({
   componentProps: {
     bordered: true,
     column: 1,
-    size: 'middle',
     class: 'mx-4',
   },
   schema: useDetailSchema(),
@@ -40,6 +39,7 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal
     title="消息详情"
+    class="w-1/3"
     :show-cancel-button="false"
     :show-confirm-button="false"
   >