feat: 优化 system

apps/web-antd/src/views/system/mail/account/modules/form.vue

@@ -31,7 +31,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 80,
+    labelWidth: 140,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :title="getTitle">
+  <Modal :title="getTitle" class="w-1/3">
     <Form class="mx-4" />
   </Modal>
 </template>

apps/web-antd/src/views/system/mail/log/data.ts

@@ -1,7 +1,13 @@
 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 { getSimpleMailAccountList } from '#/api/system/mail/account';
+import { DictTag } from '#/components/dict-tag';
 import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -117,3 +123,79 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
+
+/** 详情页的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'id',
+      label: '编号',
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      content: (data) => formatDateTime(data?.createTime || '') as string,
+    },
+    {
+      field: 'toMail',
+      label: '收件邮箱',
+    },
+    {
+      field: 'fromMail',
+      label: '发送邮箱',
+    },
+    {
+      field: 'userId',
+      label: '用户编号',
+    },
+    {
+      field: 'userType',
+      label: '用户类型',
+    },
+    {
+      field: 'templateId',
+      label: '模板编号',
+    },
+    {
+      field: 'templateCode',
+      label: '模板编码',
+    },
+    {
+      field: 'templateTitle',
+      label: '邮件标题',
+    },
+    {
+      field: 'templateContent',
+      label: '邮件内容',
+      content: (data) => {
+        // 渲染HTML内容
+        return h('div', {
+          innerHTML: data?.templateContent || '',
+        });
+      },
+    },
+    {
+      field: 'sendStatus',
+      label: '发送状态',
+      content: (data) => {
+        return h(DictTag, {
+          type: DICT_TYPE.SYSTEM_MAIL_SEND_STATUS,
+          value: data?.sendStatus,
+        });
+      },
+    },
+    {
+      field: 'sendTime',
+      label: '发送时间',
+      content: (data) => formatDateTime(data?.sendTime || '') as string,
+    },
+    {
+      field: 'sendMessageId',
+      label: '发送消息编号',
+    },
+    {
+      field: 'sendException',
+      label: '发送异常',
+    },
+  ];
+}

apps/web-antd/src/views/system/mail/log/modules/detail.vue

@@ -4,15 +4,22 @@ import type { SystemMailLogApi } from '#/api/system/mail/log';
 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<SystemMailLogApi.MailLog>();
 
+const [Descriptions] = useDescription({
+  componentProps: {
+    bordered: true,
+    column: 2,
+    class: 'mx-4',
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
@@ -41,53 +48,6 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <div class="p-4">
-      <Descriptions :column="2" bordered :label-style="{ width: '140px' }">
-        <Descriptions.Item label="编号">{{ formData?.id }}</Descriptions.Item>
-        <Descriptions.Item label="创建时间">
-          {{ formatDateTime(formData?.createTime || '') }}
-        </Descriptions.Item>
-        <Descriptions.Item label="收件邮箱">
-          {{ formData?.toMail }}
-        </Descriptions.Item>
-        <Descriptions.Item label="发送邮箱">
-          {{ formData?.fromMail }}
-        </Descriptions.Item>
-        <Descriptions.Item label="用户编号">
-          {{ formData?.userId }}
-        </Descriptions.Item>
-        <Descriptions.Item label="用户类型">
-          {{ formData?.userType }}
-        </Descriptions.Item>
-        <Descriptions.Item label="模板编号">
-          {{ formData?.templateId }}
-        </Descriptions.Item>
-        <Descriptions.Item label="模板编码">
-          {{ formData?.templateCode }}
-        </Descriptions.Item>
-        <Descriptions.Item label="邮件标题" :span="2">
-          {{ formData?.templateTitle }}
-        </Descriptions.Item>
-        <Descriptions.Item label="邮件内容" :span="2">
-          <!-- eslint-disable-next-line vue/no-v-html -->
-          <div v-html="formData?.templateContent"></div>
-        </Descriptions.Item>
-        <Descriptions.Item label="发送状态">
-          <DictTag
-            :type="DICT_TYPE.SYSTEM_MAIL_SEND_STATUS"
-            :value="formData?.sendStatus"
-          />
-        </Descriptions.Item>
-        <Descriptions.Item label="发送时间">
-          {{ formatDateTime(formData?.sendTime || '') }}
-        </Descriptions.Item>
-        <Descriptions.Item label="发送消息编号">
-          {{ formData?.sendMessageId }}
-        </Descriptions.Item>
-        <Descriptions.Item label="发送异常">
-          {{ formData?.sendException }}
-        </Descriptions.Item>
-      </Descriptions>
-    </div>
+    <Descriptions :data="formData" />
   </Modal>
 </template>

apps/web-antd/src/views/system/mail/template/modules/form.vue

@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :title="getTitle">
+  <Modal :title="getTitle" class="w-1/3">
     <Form class="mx-4" />
   </Modal>
 </template>