@kevisual/query 0.0.31 → 0.0.32

package/dist/query-browser.d.ts

@@ -118,23 +118,11 @@ type Data = {
     payload?: Record<string, any>;
     [key: string]: any;
 };
-type Result<S = any> = {
+type Result<S = any, U = {}> = {
     code: number;
     data?: S;
     message?: string;
-    success: boolean;
-    /**
-     * 是否不返回 message
-     */
-    noMsg?: boolean;
-    /**
-     * 显示错误, 当 handle的信息被处理的时候，如果不是success，同时自己设置了noMsg，那么就不显示错误信息了，因为被处理。
-     *
-     * 日常: fetch().then(res=>if(res.sucess){message.error('error')})的时候，比如401被处理过了，就不再提示401错误了。
-     *
-     */
-    showError: (fn?: () => void) => void;
-};
+} & U;
 type DataOpts = Partial<QueryOpts$1> & {
     beforeRequest?: Fn;
     afterResponse?: <S = any>(result: Result<S>, ctx?: {
@@ -221,6 +209,7 @@ declare class Query {
     fetchText(urlOrOptions?: string | QueryOpts$1, options?: QueryOpts$1): Promise<Result<any>>;
 }
 
+/** @deprecated */
 declare class BaseQuery<T extends Query = Query, R extends {
     queryChain?: any;
     query?: any;

package/dist/query-browser.js

@@ -318,25 +318,6 @@ class QueryWs {
     }
 }
 
-/**
- * 设置基础响应, 设置 success 和 showError,
- * success 是 code 是否等于 200
- * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
- * @param res 响应
- */
-const setBaseResponse = (res) => {
-    res.success = res.code === 200;
-    /**
-     * 显示错误
-     * @param fn 错误处理函数
-     */
-    res.showError = (fn) => {
-        if (!res.success && !res.noMsg) {
-            fn?.();
-        }
-    };
-    return res;
-};
 const wrapperError = ({ code, message }) => {
     const result = {
         code: code || 500,
@@ -465,7 +446,6 @@ class Query {
         }
         return _adapter(req).then(async (res) => {
             try {
-                setBaseResponse(res);
                 if (_afterResponse) {
                     return await _afterResponse(res, {
                         req,
@@ -513,9 +493,16 @@ class Query {
                 ...(_options?.headers || {}),
             },
         });
-        return setBaseResponse(res);
+        if (res && !res.code) {
+            return {
+                code: 200,
+                data: res,
+            };
+        }
+        return res;
     }
 }
+/** @deprecated */
 class BaseQuery {
     query;
     queryDefine;

package/dist/query.d.ts

@@ -118,23 +118,11 @@ type Data = {
     payload?: Record<string, any>;
     [key: string]: any;
 };
-type Result<S = any> = {
+type Result<S = any, U = {}> = {
     code: number;
     data?: S;
     message?: string;
-    success: boolean;
-    /**
-     * 是否不返回 message
-     */
-    noMsg?: boolean;
-    /**
-     * 显示错误, 当 handle的信息被处理的时候，如果不是success，同时自己设置了noMsg，那么就不显示错误信息了，因为被处理。
-     *
-     * 日常: fetch().then(res=>if(res.sucess){message.error('error')})的时候，比如401被处理过了，就不再提示401错误了。
-     *
-     */
-    showError: (fn?: () => void) => void;
-};
+} & U;
 type DataOpts = Partial<QueryOpts> & {
     beforeRequest?: Fn;
     afterResponse?: <S = any>(result: Result<S>, ctx?: {
@@ -153,7 +141,11 @@ type DataOpts = Partial<QueryOpts> & {
  * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
  * @param res 响应
  */
-declare const setBaseResponse: (res: Partial<Result>) => Result;
+declare const setBaseResponse: (res: Partial<Result & {
+    success?: boolean;
+    showError?: (fn?: () => void) => void;
+    noMsg?: boolean;
+}>) => Result;
 declare const wrapperError: ({ code, message }: {
     code?: number;
     message?: string;
@@ -228,6 +220,7 @@ declare class Query {
     fetchText(urlOrOptions?: string | QueryOpts, options?: QueryOpts): Promise<Result<any>>;
 }
 
+/** @deprecated */
 declare class BaseQuery<T extends Query = Query, R extends {
     queryChain?: any;
     query?: any;

package/dist/query.js

@@ -249,7 +249,6 @@ class Query {
         }
         return _adapter(req).then(async (res) => {
             try {
-                setBaseResponse(res);
                 if (_afterResponse) {
                     return await _afterResponse(res, {
                         req,
@@ -297,9 +296,16 @@ class Query {
                 ...(_options?.headers || {}),
             },
         });
-        return setBaseResponse(res);
+        if (res && !res.code) {
+            return {
+                code: 200,
+                data: res,
+            };
+        }
+        return res;
     }
 }
+/** @deprecated */
 class BaseQuery {
     query;
     queryDefine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "main": "dist/query-browser.js",
   "private": false,
   "type": "module",