From e9f2b5701cd6165f198e116366e56f4b7129fac2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 22 Apr 2025 18:49:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=8A=A5=E9=94=99=EF=BC=9A=20top=20level=20await=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/upload/use-upload.ts       |  4 ++--
 apps/web-antd/src/views/system/dept/data.ts   |  7 +++----
 apps/web-antd/src/views/system/dept/index.vue | 18 ++++++++++++++--
 .../src/views/system/mail/template/data.ts    |  6 +++---
 .../src/views/system/mail/template/index.vue  | 18 +++++++++++++++-
 apps/web-antd/src/views/system/tenant/data.ts | 11 +++-------
 .../src/views/system/tenant/index.vue         | 21 ++++++++++++++++++-
 packages/icons/src/iconify/index.ts           |  4 +++-
 8 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/apps/web-antd/src/components/upload/use-upload.ts b/apps/web-antd/src/components/upload/use-upload.ts
index a11727c6e..7b9b4ca66 100644
--- a/apps/web-antd/src/components/upload/use-upload.ts
+++ b/apps/web-antd/src/components/upload/use-upload.ts
@@ -4,7 +4,7 @@ import type { AxiosProgressEvent, InfraFileApi } from '#/api/infra/file';
 import { computed, unref } from 'vue';
 import { $t } from '@vben/locales';
 import CryptoJS from 'crypto-js'
-import axios from 'axios'
+import { baseRequestClient } from '#/api/request';
 import { uploadFile, getFilePresignedUrl, createFile } from '#/api/infra/file';
 
 export function useUploadType({
@@ -78,7 +78,7 @@ export const useUpload = () => {
       // 1.2 获取文件预签名地址
       const presignedInfo = await getFilePresignedUrl(fileName)
       // 1.3 上传文件
-      return axios
+      return baseRequestClient
         .put(presignedInfo.uploadUrl, file, {
           headers: {
             'Content-Type': file.type
diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts
index 1f3c3d691..ce12f4cd3 100644
--- a/apps/web-antd/src/views/system/dept/data.ts
+++ b/apps/web-antd/src/views/system/dept/data.ts
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 import type { VbenFormSchema } from '#/adapter/form';
 import type { OnActionClickFn } from '#/adapter/vxe-table';
 import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemUserApi } from '#/api/system/user';
 
 import { useAccess } from '@vben/access';
 
@@ -122,9 +123,9 @@ export function useFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-const userList = await getSimpleUserList();
 export function useGridColumns(
   onActionClick?: OnActionClickFn<SystemDeptApi.SystemDept>,
+  getLeaderName?: (userId: number) => string | undefined,
 ): VxeTableGridOptions<SystemDeptApi.SystemDept>['columns'] {
   return [
     {
@@ -140,9 +141,7 @@ export function useGridColumns(
       title: '负责人',
       minWidth: 150,
       formatter: (row) => {
-        return (
-          userList.find((user) => user.id === row.cellValue)?.nickname || '-'
-        );
+        return getLeaderName?.(row.cellValue) || '-';
       },
     },
     {
diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue
index b790d2dec..f15cabd34 100644
--- a/apps/web-antd/src/views/system/dept/index.vue
+++ b/apps/web-antd/src/views/system/dept/index.vue
@@ -4,8 +4,9 @@ import type {
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
 import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemUserApi } from '#/api/system/user';
 
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { Plus } from '@vben/icons';
@@ -14,6 +15,7 @@ import { Button, message } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteDept, getDeptList } from '#/api/system/dept';
+import { getSimpleUserList } from '#/api/system/user';
 import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
@@ -24,6 +26,13 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
+const userList = ref<SystemUserApi.SystemUser[]>([]);
+
+/** 获取负责人名称 */
+const getLeaderName = (userId: number) => {
+  return userList.value.find((user) => user.id === userId)?.nickname;
+};
+
 /** 刷新表格 */
 function onRefresh() {
   gridApi.query();
@@ -93,7 +102,7 @@ function onActionClick({
 
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    columns: useGridColumns(onActionClick),
+    columns: useGridColumns(onActionClick, getLeaderName),
     height: 'auto',
     keepSource: true,
     pagerConfig: {
@@ -121,6 +130,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions,
 });
+
+/** 初始化 */
+onMounted(async () => {
+  userList.value = await getSimpleUserList();
+});
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/system/mail/template/data.ts b/apps/web-antd/src/views/system/mail/template/data.ts
index e2db90ef9..f0dd3adec 100644
--- a/apps/web-antd/src/views/system/mail/template/data.ts
+++ b/apps/web-antd/src/views/system/mail/template/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemMailAccountApi } from '#/api/system/mail/account';
 import type { SystemMailTemplateApi } from '#/api/system/mail/template';
 
 import { useAccess } from '@vben/access';
@@ -191,9 +192,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-const accountList = await getSimpleMailAccountList();
 export function useGridColumns<T = SystemMailTemplateApi.SystemMailTemplate>(
   onActionClick: OnActionClickFn<T>,
+  getAccountMail?: (accountId: number) => string | undefined,
 ): VxeTableGridOptions['columns'] {
   return [
     {
@@ -220,8 +221,7 @@ export function useGridColumns<T = SystemMailTemplateApi.SystemMailTemplate>(
       field: 'accountId',
       title: '邮箱账号',
       minWidth: 120,
-      formatter: ({ cellValue }) =>
-        accountList.find((account) => account.id === cellValue)?.mail || '-',
+      formatter: (row) => getAccountMail?.(row.cellValue) || '-',
     },
     {
       field: 'nickname',
diff --git a/apps/web-antd/src/views/system/mail/template/index.vue b/apps/web-antd/src/views/system/mail/template/index.vue
index 3c30a6821..61e8f3e66 100644
--- a/apps/web-antd/src/views/system/mail/template/index.vue
+++ b/apps/web-antd/src/views/system/mail/template/index.vue
@@ -3,14 +3,18 @@ import type {
   OnActionClickParams,
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
+import type { SystemMailAccountApi } from '#/api/system/mail/account';
 import type { SystemMailTemplateApi } from '#/api/system/mail/template';
 
+import { onMounted, ref } from 'vue';
+
 import { Page, useVbenModal } from '@vben/common-ui';
 import { Plus } from '@vben/icons';
 
 import { Button, message } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSimpleMailAccountList } from '#/api/system/mail/account';
 import {
   deleteMailTemplate,
   getMailTemplatePage,
@@ -22,6 +26,13 @@ import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 import SendForm from './modules/send-form.vue';
 
+const accountList = ref<SystemMailAccountApi.SystemMailAccount[]>([]);
+
+/** 获取邮箱账号 */
+const getAccountMail = (accountId: number) => {
+  return accountList.value.find((account) => account.id === accountId)?.mail;
+};
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
@@ -97,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(onActionClick),
+    columns: useGridColumns(onActionClick, getAccountMail),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -120,6 +131,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions<SystemMailTemplateApi.SystemMailTemplate>,
 });
+
+/** 初始化 */
+onMounted(async () => {
+  accountList.value = await getSimpleMailAccountList();
+});
 </script>
 <template>
   <Page auto-content-height>
diff --git a/apps/web-antd/src/views/system/tenant/data.ts b/apps/web-antd/src/views/system/tenant/data.ts
index 0e28a10a1..dc385968c 100644
--- a/apps/web-antd/src/views/system/tenant/data.ts
+++ b/apps/web-antd/src/views/system/tenant/data.ts
@@ -182,9 +182,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-const tenantPackageList = await getTenantPackageList();
 export function useGridColumns<T = SystemTenantApi.SystemTenant>(
   onActionClick: OnActionClickFn<T>,
+  getPackageName?: (packageId: number) => string | undefined,
 ): VxeTableGridOptions['columns'] {
   return [
     {
@@ -201,13 +201,8 @@ export function useGridColumns<T = SystemTenantApi.SystemTenant>(
       field: 'packageId',
       title: '租户套餐',
       minWidth: 180,
-      formatter: (row) => {
-        const packageId = row.cellValue;
-        return packageId === 0
-          ? '系统租户'
-          : tenantPackageList.find(
-              (tenantPackage) => tenantPackage.id === packageId,
-            )?.name || '-';
+      formatter: (row: { cellValue: number }) => {
+        return getPackageName?.(row.cellValue) || '-';
       },
     },
     {
diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue
index ee98087fc..5fb7c904b 100644
--- a/apps/web-antd/src/views/system/tenant/index.vue
+++ b/apps/web-antd/src/views/system/tenant/index.vue
@@ -4,6 +4,9 @@ import type {
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
 import type { SystemTenantApi } from '#/api/system/tenant';
+import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
+
+import { onMounted, ref } from 'vue';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { Download, Plus } from '@vben/icons';
@@ -12,6 +15,7 @@ import { Button, message } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteTenant, exportTenant, getTenantPage } from '#/api/system/tenant';
+import { getTenantPackageList } from '#/api/system/tenant-package';
 import { DocAlert } from '#/components/doc-alert';
 import { $t } from '#/locales';
 import { downloadByData } from '#/utils/download';
@@ -19,6 +23,16 @@ import { downloadByData } from '#/utils/download';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
+const tenantPackageList = ref<SystemTenantPackageApi.SystemTenantPackage[]>([]);
+
+/** 获取套餐名称 */
+const getPackageName = (packageId: number) => {
+  if (packageId === 0) {
+    return '系统租户';
+  }
+  return tenantPackageList.value.find((pkg) => pkg.id === packageId)?.name;
+};
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
@@ -86,7 +100,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(onActionClick),
+    columns: useGridColumns(onActionClick, getPackageName),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -109,6 +123,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions<SystemTenantApi.SystemTenant>,
 });
+
+/** 初始化 */
+onMounted(async () => {
+  tenantPackageList.value = await getTenantPackageList();
+});
 </script>
 <template>
   <Page auto-content-height>
diff --git a/packages/icons/src/iconify/index.ts b/packages/icons/src/iconify/index.ts
index 48db12a4f..673456cc7 100644
--- a/packages/icons/src/iconify/index.ts
+++ b/packages/icons/src/iconify/index.ts
@@ -8,9 +8,11 @@ export const MdiWechat = createIconifyIcon('mdi:wechat');
 
 export const MdiGithub = createIconifyIcon('mdi:github');
 
+export const MdiGoogle = createIconifyIcon('mdi:google');
+
 export const MdiQqchat = createIconifyIcon('mdi:qqchat');
 
-export const AntdDingTalk = createIconifyIcon('ant-design:dingtalk')
+export const AntdDingTalk = createIconifyIcon('ant-design:dingtalk');
 
 export const MdiCheckboxMarkedCircleOutline = createIconifyIcon(
   'mdi:checkbox-marked-circle-outline',