@ks-web/use 0.0.6 → 0.0.8

package/dist/index.cjs.js

@@ -4949,6 +4949,33 @@ var KUASHENG_TOKEN_KEY = "ks_token";
 // src/useHttp/http/http.ts
 var import_qs = __toESM(require_lib());
 
+// src/useHttp/interceptors/response.ts
+var import_ks = require("@ks-web/ks");
+var import_style = require("@ks-web/ks/es/toast/style");
+var getErrorsTips = {
+  "Network Error": "网络错误，请检查网络",
+  [`timeout of 20000ms exceeded`]: "请求超时，服务器未响应",
+  "Request failed with status code 500": "请求服务器错误",
+  "Internal Server Error": "请求服务器错误",
+  "Request failed with status code 502": "请求服务器错误",
+  api: "接口错误"
+};
+function ksResponseInterceptor(res) {
+  if (res.data && String(res.data.code) === "0") {
+    return res;
+  }
+  try {
+    const { tips } = res.config.userConfig || {};
+    let { msg = res.message || res.msg } = res.data || {};
+    const errorTips = getErrorsTips[msg];
+    if (tips !== false && msg) {
+      (0, import_ks.showToast)(errorTips || msg);
+    }
+  } catch (e) {
+  }
+  return Promise.reject(res);
+}
+
 // src/useType/index.ts
 var toString3 = Object.prototype.toString;
 var { is } = function _internal() {
@@ -5002,7 +5029,9 @@ function createCasHeaders(opt) {
     sign: _getSign(),
     format: "JSON",
     timestamp: now,
-    "x-webtrace-id": _getXWebTraceId(user.id, menu.id, now)
+    "x-webtrace-id": _getXWebTraceId(user.id, menu.id, now),
+    webTraceId: `${user.id}-${now}-${_random(4)}-${menu.id || "xxxx"}`,
+    "X-menu-id": menu.id
   };
   return _headers;
 }
@@ -5110,6 +5139,7 @@ function getRequest(httpInstance, url, method2, param, config) {
     httpInstance.http(options).then((res) => {
       resolve(origin ? res : res.data.data);
     }).catch((e) => {
+      ksResponseInterceptor(e);
       reject(e);
     }).finally(
       () => loading && typeof (loadingOptions == null ? void 0 : loadingOptions.hide) === "function" && (loadingOptions == null ? void 0 : loadingOptions.hide())
@@ -5164,6 +5194,7 @@ function handleOptions(httpInstance, url, method2, param, config) {
   const headers = {};
   Object.assign(headers, config.headers || {}, casHeaders);
   return __spreadValues(__spreadValues({
+    userConfig: __spreadValues({}, config),
     url: getRequestUrl(
       url,
       config.baseURL ? config.baseURL : httpInstance.baseURL
@@ -5263,7 +5294,10 @@ var http_default = function() {
 
 // src/useHttp/openApi.ts
 var http = http_default({
-  baseURL: "/router/rest"
+  baseURL: "/router/rest",
+  interceptors: {
+    response: [ksResponseInterceptor]
+  }
 });
 function createRequest(type) {
   return function(url, appKey, data, config) {

package/dist/index.esm.mjs

@@ -4931,6 +4931,33 @@ var KUASHENG_TOKEN_KEY = "ks_token";
 // src/useHttp/http/http.ts
 var import_qs = __toESM(require_lib());
 
+// src/useHttp/interceptors/response.ts
+import { showToast } from "@ks-web/ks";
+import "@ks-web/ks/es/toast/style";
+var getErrorsTips = {
+  "Network Error": "网络错误，请检查网络",
+  [`timeout of 20000ms exceeded`]: "请求超时，服务器未响应",
+  "Request failed with status code 500": "请求服务器错误",
+  "Internal Server Error": "请求服务器错误",
+  "Request failed with status code 502": "请求服务器错误",
+  api: "接口错误"
+};
+function ksResponseInterceptor(res) {
+  if (res.data && String(res.data.code) === "0") {
+    return res;
+  }
+  try {
+    const { tips } = res.config.userConfig || {};
+    let { msg = res.message || res.msg } = res.data || {};
+    const errorTips = getErrorsTips[msg];
+    if (tips !== false && msg) {
+      showToast(errorTips || msg);
+    }
+  } catch (e) {
+  }
+  return Promise.reject(res);
+}
+
 // src/useType/index.ts
 var toString3 = Object.prototype.toString;
 var { is } = function _internal() {
@@ -4984,7 +5011,9 @@ function createCasHeaders(opt) {
     sign: _getSign(),
     format: "JSON",
     timestamp: now,
-    "x-webtrace-id": _getXWebTraceId(user.id, menu.id, now)
+    "x-webtrace-id": _getXWebTraceId(user.id, menu.id, now),
+    webTraceId: `${user.id}-${now}-${_random(4)}-${menu.id || "xxxx"}`,
+    "X-menu-id": menu.id
   };
   return _headers;
 }
@@ -5092,6 +5121,7 @@ function getRequest(httpInstance, url, method2, param, config) {
     httpInstance.http(options).then((res) => {
       resolve(origin ? res : res.data.data);
     }).catch((e) => {
+      ksResponseInterceptor(e);
       reject(e);
     }).finally(
       () => loading && typeof (loadingOptions == null ? void 0 : loadingOptions.hide) === "function" && (loadingOptions == null ? void 0 : loadingOptions.hide())
@@ -5146,6 +5176,7 @@ function handleOptions(httpInstance, url, method2, param, config) {
   const headers = {};
   Object.assign(headers, config.headers || {}, casHeaders);
   return __spreadValues(__spreadValues({
+    userConfig: __spreadValues({}, config),
     url: getRequestUrl(
       url,
       config.baseURL ? config.baseURL : httpInstance.baseURL
@@ -5245,7 +5276,10 @@ var http_default = function() {
 
 // src/useHttp/openApi.ts
 var http = http_default({
-  baseURL: "/router/rest"
+  baseURL: "/router/rest",
+  interceptors: {
+    response: [ksResponseInterceptor]
+  }
 });
 function createRequest(type) {
   return function(url, appKey, data, config) {

package/dist/useHttp/http/http.d.ts

@@ -50,6 +50,32 @@ export declare function handleOptions(httpInstance: HttpClient, url: string, met
         FormData?: (new (...args: any[]) => object) | undefined;
     } | undefined;
     formSerializer?: import("axios").FormSerializerOptions | undefined;
+    userConfig: {
+        baseURL?: string | undefined;
+        headers?: Record<string, any> | undefined;
+        cancelToken?: CancelToken | import("axios").CancelTokenSource | undefined;
+        ksAdapter?: boolean | undefined;
+        failToast?: boolean | undefined;
+        loading?: boolean | undefined;
+        tips?: boolean | undefined;
+        customHeaders?: boolean | undefined;
+        onUploadProgress?: ((progressEvent: any) => void) | undefined;
+        onDownloadProgress?: ((progressEvent: any) => void) | undefined;
+        options?: Record<string, any> | undefined;
+        origin?: boolean | undefined;
+        appKey?: string | number | undefined;
+        timeout?: number | undefined;
+        adapter?: import("axios").AxiosAdapter | undefined;
+        transformRequest?: AxiosRequestTransformer | undefined;
+        transformResponse?: AxiosResponseTransformer | undefined;
+        validateStatus?: ((status: number) => boolean) | undefined;
+        interceptors?: HttpInterceptorMap | undefined;
+        loadingOptions?: {
+            show?: (() => void) | undefined;
+            hide?: (() => void) | undefined;
+        } | undefined;
+        casToken?: boolean | undefined;
+    };
 };
 type InterceptorList = Array<{
     type: 'request' | 'response' | 'rejectRequest' | 'rejectResponse';

package/dist/useHttp/http/types.d.ts

@@ -24,6 +24,7 @@ export interface RequestOptions {
     ksAdapter?: boolean;
     failToast?: boolean;
     loading?: boolean;
+    tips?: boolean;
     customHeaders?: boolean;
     onUploadProgress?: (progressEvent: any) => void;
     onDownloadProgress?: (progressEvent: any) => void;

package/dist/useHttp/http/utils.d.ts

@@ -13,6 +13,8 @@ export declare function createCasHeaders(opt: CasHeadersTransformOptions): {
     format: string;
     timestamp: number;
     'x-webtrace-id': string;
+    webTraceId: string;
+    'X-menu-id': string;
 };
 export declare function casInterceptorResponse(response: AxiosResponse): AxiosResponse<any, any>;
 export declare function createKuaShengAdapter(config: InternalAxiosRequestConfig): AxiosPromise;

package/dist/useHttp/interceptors/response.d.ts

@@ -0,0 +1,2 @@
+import '@ks-web/ks/es/toast/style';
+export declare function ksResponseInterceptor(res: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ks-web/use",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Vant Composition API",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.mjs",
@@ -47,7 +47,8 @@
     "release-it": "^16.1.3",
     "rimraf": "^5.0.0",
     "typescript": "^5.0.4",
-    "vue": "^3.3.4"
+    "vue": "^3.3.4",
+    "@ks-web/ks": "0.0.8-beta.2"
   },
   "peerDependencies": {
     "vue": "^3.0.0"