From c881a47ffd6b1cf1d04ad04db212caabfc91c8b0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 26 Mar 2025 07:36:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E3=80=90web-ant=E3=80=91=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=9D=97=E5=B9=B6=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD=E3=80=900fed9472=E3=80=91=EF=BC=88?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=20request=E3=80=81present=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/adapter/vxe-table.ts        | 17 +++++++++++++
 apps/web-antd/src/api/core/auth.ts            |  6 ++---
 apps/web-antd/src/layouts/basic.vue           |  3 ++-
 apps/web-antd/src/store/auth.ts               |  6 ++---
 packages/@core/base/typings/src/basic.d.ts    |  2 +-
 packages/effects/hooks/src/use-app-config.ts  |  5 ++--
 packages/effects/request/package.json         |  6 +++--
 .../src/request-client/request-client.ts      |  5 ++++
 .../request/src/request-client/types.ts       | 15 ++++++++++-
 packages/stores/src/modules/user.ts           |  1 +
 pnpm-lock.yaml                                | 25 +++++++++++++++++++
 pnpm-workspace.yaml                           |  2 ++
 12 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts
index 648180571..de6c13c31 100644
--- a/apps/web-antd/src/adapter/vxe-table.ts
+++ b/apps/web-antd/src/adapter/vxe-table.ts
@@ -20,6 +20,17 @@ setupVbenVxeTable({
           // 全局禁用vxe-table的表单配置，使用formOptions
           enabled: false,
         },
+        toolbarConfig: {
+          import: true,
+          export: true,
+          refresh: true,
+          print: true,
+          zoom: true,
+          custom: true,
+        },
+        customConfig: {
+          mode: 'modal',
+        },
         proxyConfig: {
           autoLoad: true,
           response: {
@@ -29,6 +40,12 @@ setupVbenVxeTable({
           showActiveMsg: true,
           showResponseMsg: false,
         },
+        pagerConfig: {
+          enabled: true,
+        },
+        sortConfig: {
+          multiple: true,
+        },
         round: true,
         showOverflow: true,
         size: 'small',
diff --git a/apps/web-antd/src/api/core/auth.ts b/apps/web-antd/src/api/core/auth.ts
index a43738d15..8393d45a8 100644
--- a/apps/web-antd/src/api/core/auth.ts
+++ b/apps/web-antd/src/api/core/auth.ts
@@ -64,21 +64,21 @@ export async function logoutApi() {
 }
 
 /** 获取权限信息 */
-export function getAuthPermissionInfoApi() {
+export async function getAuthPermissionInfoApi() {
   return requestClient.get<AuthPermissionInfo>(
     '/system/auth/get-permission-info',
   );
 }
 
 /** 获取租户列表 */
-export function getTenantSimpleList() {
+export async function getTenantSimpleList() {
   return requestClient.get<AuthApi.TenantResult[]>(
     `/system/tenant/simple-list`,
   );
 }
 
 /** 使用租户域名，获得租户信息 */
-export function getTenantByWebsite(website: string) {
+export async function getTenantByWebsite(website: string) {
   return requestClient.get<AuthApi.TenantResult>(`/system/tenant/get-by-website?website=${website}`);
 }
 
diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index 51412956a..a4c206583 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -125,10 +125,11 @@ watch(
 <template>
   <BasicLayout @clear-preferences-and-logout="handleLogout">
     <template #user-dropdown>
+      <!-- TODO @芋艿：去掉 ann.vben@gmail.com -->
       <UserDropdown
         :avatar
         :menus
-        :text="userStore.userInfo?.realName"
+        :text="userStore.userInfo?.nickname"
         description="ann.vben@gmail.com"
         tag-text="Pro"
         @logout="handleLogout"
diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts
index b5f54faae..de2a22ea9 100644
--- a/apps/web-antd/src/store/auth.ts
+++ b/apps/web-antd/src/store/auth.ts
@@ -57,9 +57,9 @@ export const useAuthStore = defineStore('auth', () => {
             : await router.push(userInfo.homePath || DEFAULT_HOME_PATH);
         }
 
-        if (userInfo?.realName) {
+        if (userInfo?.nickname) {
           notification.success({
-            description: `${$t('authentication.loginSuccessDesc')}:${userInfo?.realName}`,
+            description: `${$t('authentication.loginSuccessDesc')}:${userInfo?.nickname}`,
             duration: 3,
             message: $t('authentication.loginSuccess'),
           });
@@ -99,7 +99,7 @@ export const useAuthStore = defineStore('auth', () => {
     let authPermissionInfo: AuthPermissionInfo | null = null;
     authPermissionInfo = await getAuthPermissionInfoApi();
     // userStore
-    userStore.setUserInfo(authPermissionInfo.user);
+    userStore.setUserInfo(authPermissionInfo.user); // TODO @芋艿：这里有报错
     userStore.setUserRoles(authPermissionInfo.roles);
     // accessStore
     accessStore.setAccessMenus(authPermissionInfo.menus);
diff --git a/packages/@core/base/typings/src/basic.d.ts b/packages/@core/base/typings/src/basic.d.ts
index 2f209f02b..45c6a1e1d 100644
--- a/packages/@core/base/typings/src/basic.d.ts
+++ b/packages/@core/base/typings/src/basic.d.ts
@@ -15,7 +15,7 @@ interface BasicUserInfo {
   /**
    * 用户昵称
    */
-  realName: string;
+  nickname: string;
   /**
    * 用户角色
    */
diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts
index fd2ae74d3..0072bb93d 100644
--- a/packages/effects/hooks/src/use-app-config.ts
+++ b/packages/effects/hooks/src/use-app-config.ts
@@ -18,9 +18,10 @@ export function useAppConfig(
   const { VITE_APP_CAPTCHA_ENABLE, VITE_APP_TENANT_ENABLE, VITE_GLOB_API_URL } =
     config;
 
+  // TODO @芋艿：貌似 VITE_APP_CAPTCHA_ENABLE 读取的是字符串，所以这里暂时这么转换
   return {
     apiURL: VITE_GLOB_API_URL,
-    captchaEnable: VITE_APP_CAPTCHA_ENABLE,
-    tenantEnable: VITE_APP_TENANT_ENABLE,
+    captchaEnable: VITE_APP_CAPTCHA_ENABLE === 'true',
+    tenantEnable: VITE_APP_TENANT_ENABLE === 'true',
   };
 }
diff --git a/packages/effects/request/package.json b/packages/effects/request/package.json
index bbea72627..e2ad06901 100644
--- a/packages/effects/request/package.json
+++ b/packages/effects/request/package.json
@@ -22,9 +22,11 @@
   "dependencies": {
     "@vben/locales": "workspace:*",
     "@vben/utils": "workspace:*",
-    "axios": "catalog:"
+    "axios": "catalog:",
+    "qs": "catalog:"
   },
   "devDependencies": {
-    "axios-mock-adapter": "catalog:"
+    "axios-mock-adapter": "catalog:",
+    "@types/qs": "catalog:"
   }
 }
diff --git a/packages/effects/request/src/request-client/request-client.ts b/packages/effects/request/src/request-client/request-client.ts
index 56412dd84..dc32a460e 100644
--- a/packages/effects/request/src/request-client/request-client.ts
+++ b/packages/effects/request/src/request-client/request-client.ts
@@ -5,6 +5,7 @@ import type { RequestClientConfig, RequestClientOptions } from './types';
 import { bindMethods, merge } from '@vben/utils';
 
 import axios from 'axios';
+import qs from 'qs';
 
 import { FileDownloader } from './modules/downloader';
 import { InterceptorManager } from './modules/interceptor';
@@ -36,6 +37,10 @@ class RequestClient {
       responseReturn: 'raw',
       // 默认超时时间
       timeout: 10_000,
+      // 处理请求参数 默认使用 qs 库处理
+      paramsSerializer: (params) => {
+        return qs.stringify(params, { arrayFormat: 'repeat' });
+      },
     };
     const { ...axiosConfig } = options;
     const requestConfig = merge(axiosConfig, defaultConfig);
diff --git a/packages/effects/request/src/request-client/types.ts b/packages/effects/request/src/request-client/types.ts
index 1abfd981e..d6560062a 100644
--- a/packages/effects/request/src/request-client/types.ts
+++ b/packages/effects/request/src/request-client/types.ts
@@ -52,12 +52,25 @@ interface HttpResponse<T = any> {
    */
   code: number;
   data: T;
-  message: string;
+  msg: string;
+}
+
+interface PageParam {
+  [key: string]: any;
+  pageNo: number;
+  pageSize: number;
+}
+
+interface PageResult<T> {
+  list: T[];
+  total: number;
 }
 
 export type {
   HttpResponse,
   MakeErrorMessageFn,
+  PageParam,
+  PageResult,
   RequestClientConfig,
   RequestClientOptions,
   RequestContentType,
diff --git a/packages/stores/src/modules/user.ts b/packages/stores/src/modules/user.ts
index 5d3631a2f..0ae843df7 100644
--- a/packages/stores/src/modules/user.ts
+++ b/packages/stores/src/modules/user.ts
@@ -55,6 +55,7 @@ export const useUserStore = defineStore('core-user', {
     userInfo: null,
     userRoles: [],
   }),
+  // TODO @芋艿：pick: ['userInfo', 'userRoles'], 是否要持久化
 });
 
 // 解决热更新问题
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 90b5a0ff2..5e23a946e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -111,6 +111,9 @@ catalogs:
     '@types/qrcode':
       specifier: ^1.5.5
       version: 1.5.5
+    '@types/qs':
+      specifier: ^6.9.17
+      version: 6.9.18
     '@types/sortablejs':
       specifier: ^1.15.8
       version: 1.15.8
@@ -369,6 +372,9 @@ catalogs:
     qrcode:
       specifier: ^1.5.4
       version: 1.5.4
+    qs:
+      specifier: ^6.13.1
+      version: 6.14.0
     radix-vue:
       specifier: ^1.9.17
       version: 1.9.17
@@ -1714,7 +1720,13 @@ importers:
       axios:
         specifier: 'catalog:'
         version: 1.8.2
+      qs:
+        specifier: 'catalog:'
+        version: 6.14.0
     devDependencies:
+      '@types/qs':
+        specifier: 'catalog:'
+        version: 6.9.18
       axios-mock-adapter:
         specifier: 'catalog:'
         version: 2.1.0(axios@1.8.2)
@@ -4331,6 +4343,9 @@ packages:
   '@types/qrcode@1.5.5':
     resolution: {integrity: sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==}
 
+  '@types/qs@6.9.18':
+    resolution: {integrity: sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==}
+
   '@types/readdir-glob@1.1.5':
     resolution: {integrity: sha512-raiuEPUYqXu+nvtY2Pe8s8FEmZ3x5yAH4VkLdihcPdalvsHltomrRC9BzuStrJ9yk06470hS0Crw0f1pXqD+Hg==}
 
@@ -8650,6 +8665,10 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
+  qs@6.14.0:
+    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
+    engines: {node: '>=0.6'}
+
   quansync@0.2.8:
     resolution: {integrity: sha512-4+saucphJMazjt7iOM27mbFCk+D9dd/zmgMDCzRZ8MEoBfYp7lAvoN38et/phRQF6wOPMy/OROBGgoWeSKyluA==}
 
@@ -13160,6 +13179,8 @@ snapshots:
     dependencies:
       '@types/node': 22.13.10
 
+  '@types/qs@6.9.18': {}
+
   '@types/readdir-glob@1.1.5':
     dependencies:
       '@types/node': 22.13.10
@@ -17949,6 +17970,10 @@ snapshots:
       pngjs: 5.0.0
       yargs: 15.4.1
 
+  qs@6.14.0:
+    dependencies:
+      side-channel: 1.1.0
+
   quansync@0.2.8: {}
 
   queue-microtask@1.2.3: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 0463eb6ad..2c4118109 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -49,6 +49,7 @@ catalog:
   '@types/nprogress': ^0.2.3
   '@types/postcss-import': ^14.0.3
   '@types/qrcode': ^1.5.5
+  '@types/qs': ^6.9.17
   '@types/sortablejs': ^1.15.8
   '@types/crypto-js': ^4.2.2
   '@typescript-eslint/eslint-plugin': ^8.26.0
@@ -139,6 +140,7 @@ catalog:
   prettier-plugin-tailwindcss: ^0.6.11
   publint: ^0.2.12
   qrcode: ^1.5.4
+  qs: ^6.13.1
   radix-vue: ^1.9.17
   resolve.exports: ^2.0.3
   rimraf: ^6.0.1