refactor：优化 mail 邮箱的实现

2025-04-04 17:45:56 +08:00
parent c03845ba99
commit a59c3bed8a
13 changed files with 267 additions and 418 deletions
--- a/apps/web-antd/src/views/system/mail/log/data.ts
+++ b/apps/web-antd/src/views/system/mail/log/data.ts
@@ -8,36 +8,6 @@ import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
  return [
-    {
-      fieldName: 'toMail',
-      label: '收件邮箱',
-      component: 'Input',
-    },
-    {
-      fieldName: 'accountId',
-      label: '邮箱账号',
-      component: 'ApiSelect',
-      componentProps: {
-        api: async () => await getSimpleMailAccountList(),
-        labelField: 'mail',
-        valueField: 'id',
-        allowClear: true,
-      },
-    },
-    {
-      fieldName: 'templateId',
-      label: '模板编号',
-      component: 'Input',
-    },
-    {
-      fieldName: 'sendStatus',
-      label: '发送状态',
-      component: 'Select',
-      componentProps: {
-        allowClear: true,
-        options: getDictOptions(DICT_TYPE.SYSTEM_MAIL_SEND_STATUS, 'number'),
-      },
-    },
    {
      fieldName: 'sendTime',
      label: '发送时间',
@@ -50,21 +20,57 @@ export function useGridFormSchema(): VbenFormSchema[] {
      fieldName: 'userId',
      label: '用户编号',
      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入用户编号',
+      }
    },
    {
      fieldName: 'userType',
      label: '用户类型',
      component: 'Select',
      componentProps: {
-        allowClear: true,
        options: getDictOptions(DICT_TYPE.USER_TYPE, 'number'),
+        allowClear: true,
+        placeholder: '请选择用户类型',
      },
    },
+    {
+      fieldName: 'sendStatus',
+      label: '发送状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.SYSTEM_MAIL_SEND_STATUS, 'number'),
+        allowClear: true,
+        placeholder: '请选择发送状态',
+      },
+    },
+    {
+      fieldName: 'accountId',
+      label: '邮箱账号',
+      component: 'ApiSelect',
+      componentProps: {
+        api: async () => await getSimpleMailAccountList(),
+        labelField: 'mail',
+        valueField: 'id',
+        allowClear: true,
+        placeholder: '请选择邮箱账号',
+      },
+    },
+    {
+      fieldName: 'templateId',
+      label: '模板编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入模板编号',
+      }
+    },
  ];
 }

 /** 列表的字段 */
-export function useGridColumns<T = SystemMailLogApi.MailLog>(
+export function useGridColumns<T = SystemMailLogApi.SystemMailLog>(
  onActionClick: OnActionClickFn<T>,
 ): VxeTableGridOptions['columns'] {
  return [
@@ -74,20 +80,15 @@ export function useGridColumns<T = SystemMailLogApi.MailLog>(
      minWidth: 100,
    },
    {
-      field: 'createTime',
-      title: '创建时间',
+      field: 'sendTime',
+      title: '发送时间',
      minWidth: 180,
      formatter: 'formatDateTime',
    },
    {
      field: 'toMail',
      title: '收件邮箱',
-      minWidth: 120,
-    },
-    {
-      field: 'fromMail',
-      title: '发送邮箱',
-      minWidth: 120,
+      minWidth: 160,
    },
    {
      field: 'templateTitle',
@@ -99,6 +100,11 @@ export function useGridColumns<T = SystemMailLogApi.MailLog>(
      title: '邮件内容',
      minWidth: 300,
    },
+    {
+      field: 'fromMail',
+      title: '发送邮箱',
+      minWidth: 120,
+    },
    {
      field: 'sendStatus',
      title: '发送状态',
@@ -108,40 +114,15 @@ export function useGridColumns<T = SystemMailLogApi.MailLog>(
        props: { type: DICT_TYPE.SYSTEM_MAIL_SEND_STATUS },
      },
    },
-    {
-      field: 'sendTime',
-      title: '发送时间',
-      minWidth: 180,
-      formatter: 'formatDateTime',
-    },
-    {
-      field: 'templateId',
-      title: '模板编号',
-      minWidth: 100,
-    },
    {
      field: 'templateCode',
      title: '模板编码',
      minWidth: 120,
    },
-    {
-      field: 'userId',
-      title: '用户编号',
-      minWidth: 100,
-    },
-    {
-      field: 'userType',
-      title: '用户类型',
-      minWidth: 100,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.USER_TYPE },
-      },
-    },
    {
      field: 'operation',
      title: '操作',
-      minWidth: 120,
+      minWidth: 80,
      align: 'center',
      fixed: 'right',
      cellRender: {
@@ -155,11 +136,7 @@ export function useGridColumns<T = SystemMailLogApi.MailLog>(
          {
            code: 'view',
            text: '查看',
-          },
-          {
-            code: 'resend',
-            text: '重发',
-          },
+          }
        ],
      },
    },
--- a/apps/web-antd/src/views/system/mail/log/index.vue
+++ b/apps/web-antd/src/views/system/mail/log/index.vue
@@ -1,19 +1,14 @@
 <script lang="ts" setup>
-import type {
-  OnActionClickParams,
-  VxeTableGridOptions,
-} from '#/adapter/vxe-table';
+import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemMailLogApi } from '#/api/system/mail/log';

 import { Page, useVbenModal } from '@vben/common-ui';
-
-import { message } from 'ant-design-vue';
+import Form from './modules/form.vue';

 import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getMailLogPage, resendMail } from '#/api/system/mail/log';
+import { getMailLogPage } from '#/api/system/mail/log';

 import { useGridColumns, useGridFormSchema } from './data';
-import Form from './modules/form.vue';

 const [FormModal, formModalApi] = useVbenModal({
  connectedComponent: Form,
@@ -25,40 +20,17 @@ function onRefresh() {
  gridApi.query();
 }

-/** 查看邮件日志详情 */
-function onView(row: SystemMailLogApi.MailLog) {
+/** 查看邮件日志 */
+function onView(row: SystemMailLogApi.SystemMailLog) {
  formModalApi.setData(row).open();
 }

-/** 重新发送邮件 */
-async function onResend(row: SystemMailLogApi.MailLog) {
-  const hideLoading = message.loading({
-    content: '重新发送邮件中...',
-    duration: 0,
-    key: 'action_process_msg',
-  });
-  try {
-    await resendMail(row.id as number);
-    message.success({
-      content: '重新发送邮件成功',
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } finally {
-    hideLoading();
-  }
-}
-
 /** 表格操作按钮的回调函数 */
 function onActionClick({
  code,
  row,
-}: OnActionClickParams<SystemMailLogApi.MailLog>) {
+}: OnActionClickParams<SystemMailLogApi.SystemMailLog>) {
  switch (code) {
-    case 'resend': {
-      onResend(row);
-      break;
-    }
    case 'view': {
      onView(row);
      break;
@@ -92,7 +64,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
      refresh: { code: 'query' },
      search: true,
    },
-  } as VxeTableGridOptions<SystemMailLogApi.MailLog>,
+  } as VxeTableGridOptions<SystemMailLogApi.SystemMailLog>,
 });
 </script>
 <template>
--- a/apps/web-antd/src/views/system/mail/log/modules/form.vue
+++ b/apps/web-antd/src/views/system/mail/log/modules/form.vue
@@ -4,14 +4,11 @@ import type { SystemMailLogApi } from '#/api/system/mail/log';
 import { useVbenModal } from '@vben/common-ui';
 import { Descriptions, Tag } from 'ant-design-vue';

-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { formatDateTime } from '@vben/utils';
 import { DICT_TYPE, getDictLabel } from '#/utils/dict';

-const formData = ref<SystemMailLogApi.MailLog>();
-const getTitle = computed(() => {
-  return '邮件日志详情';
-});
+const formData = ref<SystemMailLogApi.SystemMailLog>();

 const [Modal, modalApi] = useVbenModal({
  async onOpenChange(isOpen: boolean) {
@@ -19,7 +16,7 @@ const [Modal, modalApi] = useVbenModal({
      return;
    }
    // 加载数据
-    const data = modalApi.getData<SystemMailLogApi.MailLog>();
+    const data = modalApi.getData<SystemMailLogApi.SystemMailLog>();
    if (!data || !data.id) {
      return;
    }
@@ -34,7 +31,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>

 <template>
-  <Modal :title="getTitle">
+  <Modal title="邮件日志详情" class="w-1/2">
    <div class="p-4">
      <Descriptions :column="2" bordered>
        <Descriptions.Item label="编号">{{ formData?.id }}</Descriptions.Item>
@@ -68,12 +65,7 @@ const [Modal, modalApi] = useVbenModal({
        <Descriptions.Item label="发送状态">
          <!-- TODO @芋艿: 数据字典-->
          <Tag color="processing">
-            {{
-              getDictLabel(
-                DICT_TYPE.SYSTEM_MAIL_SEND_STATUS,
-                formData?.sendStatus,
-              )
-            }}
+            {{ getDictLabel(DICT_TYPE.SYSTEM_MAIL_SEND_STATUS, formData?.sendStatus ) }}
          </Tag>
        </Descriptions.Item>
        <Descriptions.Item label="发送时间">