From 5abf00ca5d7a3c4677ba4e4fd7bdd0d999607910 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 1 May 2022 05:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E5=88=B6=E5=AE=9A=E5=9B=A2?=
 =?UTF-8?q?=E9=98=9F=E8=A7=84=E5=88=99,=E6=8F=90=E4=BE=9B=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=82=E8=80=83=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kicc-ui/src/api/system/user.ts           | 2 +-
 kicc-ui/src/settings/componentSetting.ts | 2 +-
 kicc-ui/src/utils/http/axios/index.ts    | 4 ++--
 kicc-ui/types/axios.d.ts                 | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kicc-ui/src/api/system/user.ts b/kicc-ui/src/api/system/user.ts
index 2d8d7b60..dfdb051b 100644
--- a/kicc-ui/src/api/system/user.ts
+++ b/kicc-ui/src/api/system/user.ts
@@ -14,7 +14,7 @@ enum Api {
 }
 
 // 查询用户列表
-export const listUser = (params?: Partial<UserDto>) => defHttp.get({ url: Api.list, params });
+export const listUser = (params?: Partial<UserDto>) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true });
 
 // 新增用户
 export const addUser = (params: Partial<User>) => defHttp.post({ url: Api.add, data: params });
diff --git a/kicc-ui/src/settings/componentSetting.ts b/kicc-ui/src/settings/componentSetting.ts
index 40d6fb30..6928e6ed 100644
--- a/kicc-ui/src/settings/componentSetting.ts
+++ b/kicc-ui/src/settings/componentSetting.ts
@@ -16,7 +16,7 @@ export default {
       // 后台显示的每页的数字字段名称
       sizeField: 'size',
       // 接口返回的表单数据的字段名
-      listField: 'records',
+      listField: 'data',
       // 接口字段名返回的表总数
       totalField: 'total',
     },
diff --git a/kicc-ui/src/utils/http/axios/index.ts b/kicc-ui/src/utils/http/axios/index.ts
index d70edb13..9fb280c4 100644
--- a/kicc-ui/src/utils/http/axios/index.ts
+++ b/kicc-ui/src/utils/http/axios/index.ts
@@ -32,7 +32,7 @@ const transform: AxiosTransform = {
    * 处理请求数据。如果数据不是预期格式，可直接抛出错误
    */
   transformRequestHook: (res: AxiosResponse<Data>, options: RequestOptions) => {
-    const { isReturnNativeResponse } = options;
+    const { isReturnNativeResponse, isReturnResultResponse } = options;
 
     // 是否返回原生响应头 比如：需要获取响应头时使用该属性
     if (isReturnNativeResponse) {
@@ -42,7 +42,7 @@ const transform: AxiosTransform = {
     // 检查是否有code,并且code等于200,直接返回结果
     const { data }  = res;
     const hasCode = data && Reflect.has(data, 'code');
-    if (hasCode && data.code === ResultEnum.SUCCESS) {
+    if (hasCode && data.code === ResultEnum.SUCCESS && !isReturnResultResponse) {
       return data.data;
     // 检查是否有code,如果code不等于200,说明返回的结果集有错误,直接抛错
     } else if (hasCode && data.code !== ResultEnum.SUCCESS) {
diff --git a/kicc-ui/types/axios.d.ts b/kicc-ui/types/axios.d.ts
index 43f2cb3a..b3ed0fd7 100644
--- a/kicc-ui/types/axios.d.ts
+++ b/kicc-ui/types/axios.d.ts
@@ -15,6 +15,8 @@ export interface RequestOptions {
   // 是否返回原生响应头
   // 例如：当需要获取响应头时使用该属性
   isReturnNativeResponse?: boolean;
+  // 是否返回后端原生结果集响应
+  isReturnResultResponse ?: boolean;
   // 是否加入url
   joinPrefix?: boolean;
   // 接口地址，留空使用默认apiUrl