@ks-web/use 0.0.7 → 0.0.9

package/dist/index.cjs.js

@@ -4962,13 +4962,16 @@ var getErrorsTips = {
 };
 function ksResponseInterceptor(res) {
   if (res.data && String(res.data.code) === "0") {
-    return res.data.data;
+    return res;
   }
-  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);
+  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);
 }
@@ -5026,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;
 }

package/dist/index.esm.mjs

@@ -4944,13 +4944,16 @@ var getErrorsTips = {
 };
 function ksResponseInterceptor(res) {
   if (res.data && String(res.data.code) === "0") {
-    return res.data.data;
+    return res;
   }
-  const { tips } = res.config.userConfig || {};
-  let { msg = res.message || res.msg } = res.data || {};
-  const errorTips = getErrorsTips[msg];
-  if (tips !== false && msg) {
-    showToast(errorTips || msg);
+  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);
 }
@@ -5008,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;
 }

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

@@ -52,15 +52,15 @@ export declare function handleOptions(httpInstance: HttpClient, url: string, met
     formSerializer?: import("axios").FormSerializerOptions | undefined;
     userConfig: {
         baseURL?: string | undefined;
-        headers?: Record<string, any> | undefined;
+        headers?: Record<string, any> | (Record<string, any> & import("axios").AxiosHeaders) | 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;
+        onUploadProgress?: ((progressEvent: import("axios").AxiosProgressEvent) => void) | undefined;
+        onDownloadProgress?: ((progressEvent: import("axios").AxiosProgressEvent) => void) | undefined;
         options?: Record<string, any> | undefined;
         origin?: boolean | undefined;
         appKey?: string | number | undefined;

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

@@ -1,7 +1,7 @@
-import type { AxiosRequestTransformer, AxiosResponseTransformer, AxiosAdapter, AxiosRequestConfig, AxiosInstance, CancelToken, CancelTokenSource, Canceler, AxiosResponse } from 'axios';
-export interface HttpOptions {
+import type { AxiosRequestTransformer, AxiosResponseTransformer, AxiosAdapter, AxiosRequestConfig, AxiosInstance, CancelToken, CancelTokenSource, Canceler, AxiosResponse, AxiosProgressEvent, AxiosHeaders } from 'axios';
+export interface HttpOptions<D = any> {
     baseURL?: string;
-    headers?: Record<string, any>;
+    headers?: AxiosHeaders | Record<string, D>;
     timeout?: number;
     adapter?: AxiosAdapter;
     transformRequest?: AxiosRequestTransformer;
@@ -17,18 +17,18 @@ export interface HttpOptions {
     casToken?: boolean;
     appKey?: string | number;
 }
-export interface RequestOptions {
+export interface RequestOptions<D = any> {
     baseURL?: string;
-    headers?: Record<string, any>;
+    headers?: Record<string, D>;
     cancelToken?: CancelToken | CancelTokenSource;
     ksAdapter?: boolean;
     failToast?: boolean;
     loading?: boolean;
     tips?: boolean;
     customHeaders?: boolean;
-    onUploadProgress?: (progressEvent: any) => void;
-    onDownloadProgress?: (progressEvent: any) => void;
-    options?: Record<string, any>;
+    onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
+    onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void;
+    options?: Record<string, D>;
     origin?: boolean;
     appKey?: string | number;
 }

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/index.d.ts

@@ -1,3 +1,4 @@
 import ksHttp from './http';
 export * from './openApi';
+export * from './http/types';
 export { ksHttp };

package/dist/useHttp/openApi.d.ts

@@ -2,10 +2,10 @@ import type { RequestOptions } from './http/types';
 export declare function useHttp(): {
     cancel: (message: string) => void;
     createCancelToken: () => import("./http/types").CancelTokenMap;
-    $get: (url: string, appKey: string | number, data: any, config?: RequestOptions | undefined) => Promise<any>;
-    $put: (url: string, appKey: string | number, data: any, config?: RequestOptions | undefined) => Promise<any>;
-    $del: (url: string, appKey: string | number, data: any, config?: RequestOptions | undefined) => Promise<any>;
-    $patch: (url: string, appKey: string | number, data: any, config?: RequestOptions | undefined) => Promise<any>;
-    $post: (url: string, appKey: string | number, data: any, config?: RequestOptions | undefined) => Promise<any>;
-    $http: (url: string, appKey: string | number, data: any, config?: RequestOptions | undefined) => Promise<any>;
+    $get: (url: string, appKey: string | number, data: any, config?: RequestOptions<any> | undefined) => Promise<any>;
+    $put: (url: string, appKey: string | number, data: any, config?: RequestOptions<any> | undefined) => Promise<any>;
+    $del: (url: string, appKey: string | number, data: any, config?: RequestOptions<any> | undefined) => Promise<any>;
+    $patch: (url: string, appKey: string | number, data: any, config?: RequestOptions<any> | undefined) => Promise<any>;
+    $post: (url: string, appKey: string | number, data: any, config?: RequestOptions<any> | undefined) => Promise<any>;
+    $http: (url: string, appKey: string | number, data: any, config?: RequestOptions<any> | undefined) => Promise<any>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ks-web/use",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Vant Composition API",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.mjs",