@hkyhy/marsun-components-core 0.1.57 → 0.1.59

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export type { BuildLoginPathOptions } from './utils/authRedirect';
 export { DEFAULT_LAST_ACTIVITY_STORAGE_KEY, getLastActivityTime, touchLastActivity, clearLastActivity, } from './utils/sessionActivity';
 export { USER_ROLE_PERMISSIONS_KEY, PERMISSION_DEFINITIONS_KEY, PERMISSIONS_STORAGE_KEY, loadUserRolePermissions, saveUserRolePermissions, loadPermissionDefinitions, savePermissionDefinitions, getStoredUserPermissions, getStoredPermissionMap, } from './utils/permissionStorage';
 export { createMarsunRequest } from './utils/createMarsunRequest';
-export type { MarsunApiResponse, CreateMarsunRequestOptions, MarsunRequestClient, } from './utils/createMarsunRequest';
+export type { MarsunApiResponse, CreateMarsunRequestOptions, MarsunRequestClient, MarsunRequestErrorResponse, } from './utils/createMarsunRequest';
 export type { UserRolePermissions, PermissionDefinition, PermissionDefinitionsResponse, } from './types/auth';
 export { buildDepartmentPathMapFromTree, buildDepartmentPathMapFromFlat, getDepartmentPath, buildLeafDepartmentPathMap, buildDepartmentPathMaps, mergeDepartmentPathMaps, toDepartmentPathMaps, } from './utils/department/departmentPath';
 export type { DepartmentPathMaps } from './utils/department/departmentPath';

package/dist/utils/createMarsunRequest.d.ts

@@ -3,6 +3,11 @@ export interface MarsunApiResponse<T = unknown> {
     message?: string;
     data?: T;
 }
+export interface MarsunRequestErrorResponse {
+    data?: unknown;
+    status?: number;
+    config?: unknown;
+}
 export interface CreateMarsunRequestOptions {
     baseURL?: string;
     timeout?: number;
@@ -14,6 +19,10 @@ export interface CreateMarsunRequestOptions {
     isPublicUrl?: (url: string) => boolean;
     isOnLoginPage?: () => boolean;
     showError?: (msg: string) => void;
+    /** 自定义错误信息提取；默认按 message/detail/msg 顺序兜底 */
+    getResponseError?: (response: MarsunRequestErrorResponse | undefined) => string;
+    /** 信封 code != successCode 时不 reject、不 showError，原样返回信封由调用方自判（用于复用既有 unwrap 逻辑的接入方） */
+    passThroughEnvelopeError?: boolean;
 }
 /** 与 axios 实例兼容的请求客户端（避免对外暴露 axios 类型，消除多副本 axios 的类型冲突） */
 export interface MarsunRequestClient {

package/dist/utils/createMarsunRequest.js

@@ -1,55 +1,61 @@
-import { message as C } from "antd";
+import { message as y } from "antd";
 import "../node_modules/axios/index.js";
-import S from "../node_modules/axios/lib/axios.js";
-const b = "X-Skip-Error-Handler";
-function g(t) {
-  return !!(t != null && t[b]);
+import h from "../node_modules/axios/lib/axios.js";
+const v = "X-Skip-Error-Handler";
+function m(o) {
+  return !!(o != null && o[v]);
 }
-function B(t = {}) {
+function q(o = {}) {
   const {
-    baseURL: d = "/api",
-    timeout: E = 3e4,
-    successCode: P = 0,
-    withCredentials: R = !1,
-    getToken: r,
-    onUnauthorized: n,
-    isPublicUrl: j = () => !1,
-    isOnLoginPage: w = () => !1,
-    showError: o = (e) => C.error(e)
-  } = t, a = S.create({
-    baseURL: d,
-    timeout: E,
-    withCredentials: R,
+    baseURL: E = "/api",
+    timeout: g = 3e4,
+    successCode: R = 0,
+    withCredentials: b = !1,
+    getToken: i,
+    onUnauthorized: c,
+    isPublicUrl: d = () => !1,
+    isOnLoginPage: P = () => !1,
+    showError: f = (e) => y.error(e),
+    getResponseError: l,
+    passThroughEnvelopeError: j = !1
+  } = o, p = (e) => {
+    if (l) return l(e);
+    const r = e == null ? void 0 : e.data;
+    return (r == null ? void 0 : r.message) || (r == null ? void 0 : r.detail) || (r == null ? void 0 : r.msg) || "请求失败";
+  }, a = h.create({
+    baseURL: E,
+    timeout: g,
+    withCredentials: b,
     headers: {
       "Content-Type": "application/json"
     }
   });
   return a.interceptors.request.use(
     (e) => {
-      const s = r == null ? void 0 : r();
-      return s && (e.headers.Authorization = `Bearer ${s}`), e;
+      const r = i == null ? void 0 : i();
+      return r && (e.headers.Authorization = `Bearer ${r}`), e;
     },
     (e) => Promise.reject(e)
   ), a.interceptors.response.use(
     (e) => {
-      const s = e.data;
-      return s.code !== P ? (g(e.config.headers) || o(s.message || "请求失败"), Promise.reject(new Error(s.message || "请求失败"))) : e.data;
+      var n;
+      const r = (n = e.config) == null ? void 0 : n.responseType;
+      if (r === "blob" || r === "arraybuffer")
+        return e.data;
+      const t = e.data;
+      if (!(t && typeof t == "object" && "code" in t))
+        return t;
+      const s = t;
+      return s.code !== R ? j ? t : (m(e.config.headers) || f(s.message || "请求失败"), Promise.reject(new Error(s.message || "请求失败"))) : t;
     },
     (e) => {
-      var i, c, u, m, f, p, l;
-      const s = ((i = e.config) == null ? void 0 : i.url) ?? "", H = g((c = e.config) == null ? void 0 : c.headers);
-      if (((u = e.response) == null ? void 0 : u.status) === 401)
-        !j(s) && !w() && (n == null || n());
-      else if (!H) {
-        const q = ((f = (m = e.response) == null ? void 0 : m.data) == null ? void 0 : f.message) || e.message || "请求失败";
-        o(q);
-      }
-      const k = ((l = (p = e.response) == null ? void 0 : p.data) == null ? void 0 : l.message) || e.message || "请求失败";
-      return Promise.reject(new Error(k));
+      var u, s, n;
+      const r = ((u = e.config) == null ? void 0 : u.url) ?? "", t = m((s = e.config) == null ? void 0 : s.headers);
+      return ((n = e.response) == null ? void 0 : n.status) === 401 ? !d(r) && !P() && (c == null || c()) : t || f(p(e.response)), Promise.reject(new Error(p(e.response)));
     }
   ), a;
 }
 export {
-  B as createMarsunRequest
+  q as createMarsunRequest
 };
 //# sourceMappingURL=createMarsunRequest.js.map

package/dist/utils/createMarsunRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"createMarsunRequest.js","sources":["../../src/utils/createMarsunRequest.ts"],"sourcesContent":["import { message } from 'antd';\nimport axios from 'axios';\n\nexport interface MarsunApiResponse<T = unknown> {\n  code: number;\n  message?: string;\n  data?: T;\n}\n\nexport interface CreateMarsunRequestOptions {\n  baseURL?: string;\n  timeout?: number;\n  successCode?: number;\n  /** Cookie 会话 SSO：跨域携带凭证 */\n  withCredentials?: boolean;\n  getToken?: () => string | null;\n  onUnauthorized?: () => void;\n  isPublicUrl?: (url: string) => boolean;\n  isOnLoginPage?: () => boolean;\n  showError?: (msg: string) => void;\n}\n\n/** 与 axios 实例兼容的请求客户端（避免对外暴露 axios 类型，消除多副本 axios 的类型冲突） */\nexport interface MarsunRequestClient {\n  get<T = unknown>(url: string, config?: unknown): Promise<T>;\n  post<T = unknown>(url: string, data?: unknown, config?: unknown): Promise<T>;\n  put<T = unknown>(url: string, data?: unknown, config?: unknown): Promise<T>;\n  patch<T = unknown>(url: string, data?: unknown, config?: unknown): Promise<T>;\n  delete<T = unknown>(url: string, config?: unknown): Promise<T>;\n  request<T = unknown>(config: unknown): Promise<T>;\n}\n\nconst SKIP_ERROR_HEADER = 'X-Skip-Error-Handler';\n\nfunction getSkipHandler(headers: unknown): boolean {\n  return Boolean((headers as Record<string, string> | undefined)?.[SKIP_ERROR_HEADER]);\n}\n\n/** 创建带鉴权、统一错误处理的 axios 实例 */\nexport function createMarsunRequest(options: CreateMarsunRequestOptions = {}): MarsunRequestClient {\n  const {\n    baseURL = '/api',\n    timeout = 30000,\n    successCode = 0,\n    withCredentials = false,\n    getToken,\n    onUnauthorized,\n    isPublicUrl = () => false,\n    isOnLoginPage = () => false,\n    showError = (msg) => message.error(msg),\n  } = options;\n\n  const request = axios.create({\n    baseURL,\n    timeout,\n    withCredentials,\n    headers: {\n      'Content-Type': 'application/json',\n    },\n  });\n\n  request.interceptors.request.use(\n    (config) => {\n      const token = getToken?.();\n      if (token) {\n        config.headers.Authorization = `Bearer ${token}`;\n      }\n      return config;\n    },\n    (error) => Promise.reject(error),\n  );\n\n  request.interceptors.response.use(\n    (response) => {\n      const data = response.data as MarsunApiResponse;\n      if (data.code !== successCode) {\n        if (!getSkipHandler(response.config.headers)) {\n          showError(data.message || '请求失败');\n        }\n        return Promise.reject(new Error(data.message || '请求失败'));\n      }\n      return response.data;\n    },\n    (error) => {\n      const url = error.config?.url ?? '';\n      const skipHandler = getSkipHandler(error.config?.headers);\n\n      if (error.response?.status === 401) {\n        if (!isPublicUrl(url) && !isOnLoginPage()) {\n          onUnauthorized?.();\n        }\n      } else if (!skipHandler) {\n        const msg = error.response?.data?.message || error.message || '请求失败';\n        showError(msg);\n      }\n      const msg = error.response?.data?.message || error.message || '请求失败';\n      return Promise.reject(new Error(msg));\n    },\n  );\n\n  return request as MarsunRequestClient;\n}\n"],"names":["SKIP_ERROR_HEADER","getSkipHandler","headers","createMarsunRequest","options","baseURL","timeout","successCode","withCredentials","getToken","onUnauthorized","isPublicUrl","isOnLoginPage","showError","msg","message","request","axios","config","token","error","response","data","url","_a","skipHandler","_b","_c","_e","_d","_g","_f"],"mappings":";;;AAgCA,MAAMA,IAAoB;AAE1B,SAASC,EAAeC,GAA2B;AACjD,SAAO,GAASA,KAAA,QAAAA,EAAiDF;AACnE;AAGO,SAASG,EAAoBC,IAAsC,IAAyB;AACjG,QAAM;AAAA,IACJ,SAAAC,IAAU;AAAA,IACV,SAAAC,IAAU;AAAA,IACV,aAAAC,IAAc;AAAA,IACd,iBAAAC,IAAkB;AAAA,IAClB,UAAAC;AAAA,IACA,gBAAAC;AAAA,IACA,aAAAC,IAAc,MAAM;AAAA,IACpB,eAAAC,IAAgB,MAAM;AAAA,IACtB,WAAAC,IAAY,CAACC,MAAQC,EAAQ,MAAMD,CAAG;AAAA,EAAA,IACpCV,GAEEY,IAAUC,EAAM,OAAO;AAAA,IAC3B,SAAAZ;AAAA,IACA,SAAAC;AAAA,IACA,iBAAAE;AAAA,IACA,SAAS;AAAA,MACP,gBAAgB;AAAA,IAAA;AAAA,EAClB,CACD;AAED,SAAAQ,EAAQ,aAAa,QAAQ;AAAA,IAC3B,CAACE,MAAW;AACV,YAAMC,IAAQV,KAAA,gBAAAA;AACd,aAAIU,MACFD,EAAO,QAAQ,gBAAgB,UAAUC,CAAK,KAEzCD;AAAA,IACT;AAAA,IACA,CAACE,MAAU,QAAQ,OAAOA,CAAK;AAAA,EAAA,GAGjCJ,EAAQ,aAAa,SAAS;AAAA,IAC5B,CAACK,MAAa;AACZ,YAAMC,IAAOD,EAAS;AACtB,aAAIC,EAAK,SAASf,KACXN,EAAeoB,EAAS,OAAO,OAAO,KACzCR,EAAUS,EAAK,WAAW,MAAM,GAE3B,QAAQ,OAAO,IAAI,MAAMA,EAAK,WAAW,MAAM,CAAC,KAElDD,EAAS;AAAA,IAClB;AAAA,IACA,CAACD,MAAU;;AACT,YAAMG,MAAMC,IAAAJ,EAAM,WAAN,gBAAAI,EAAc,QAAO,IAC3BC,IAAcxB,GAAeyB,IAAAN,EAAM,WAAN,gBAAAM,EAAc,OAAO;AAExD,YAAIC,IAAAP,EAAM,aAAN,gBAAAO,EAAgB,YAAW;AAC7B,QAAI,CAAChB,EAAYY,CAAG,KAAK,CAACX,QACxBF,KAAA,QAAAA;AAAA,eAEO,CAACe,GAAa;AACvB,cAAMX,MAAMc,KAAAC,IAAAT,EAAM,aAAN,gBAAAS,EAAgB,SAAhB,gBAAAD,EAAsB,YAAWR,EAAM,WAAW;AAC9D,QAAAP,EAAUC,CAAG;AAAA,MACf;AACA,YAAMA,MAAMgB,KAAAC,IAAAX,EAAM,aAAN,gBAAAW,EAAgB,SAAhB,gBAAAD,EAAsB,YAAWV,EAAM,WAAW;AAC9D,aAAO,QAAQ,OAAO,IAAI,MAAMN,CAAG,CAAC;AAAA,IACtC;AAAA,EAAA,GAGKE;AACT;"}
+{"version":3,"file":"createMarsunRequest.js","sources":["../../src/utils/createMarsunRequest.ts"],"sourcesContent":["import { message } from 'antd';\nimport axios from 'axios';\n\nexport interface MarsunApiResponse<T = unknown> {\n  code: number;\n  message?: string;\n  data?: T;\n}\n\nexport interface MarsunRequestErrorResponse {\n  data?: unknown;\n  status?: number;\n  config?: unknown;\n}\n\nexport interface CreateMarsunRequestOptions {\n  baseURL?: string;\n  timeout?: number;\n  successCode?: number;\n  /** Cookie 会话 SSO：跨域携带凭证 */\n  withCredentials?: boolean;\n  getToken?: () => string | null;\n  onUnauthorized?: () => void;\n  isPublicUrl?: (url: string) => boolean;\n  isOnLoginPage?: () => boolean;\n  showError?: (msg: string) => void;\n  /** 自定义错误信息提取；默认按 message/detail/msg 顺序兜底 */\n  getResponseError?: (response: MarsunRequestErrorResponse | undefined) => string;\n  /** 信封 code != successCode 时不 reject、不 showError，原样返回信封由调用方自判（用于复用既有 unwrap 逻辑的接入方） */\n  passThroughEnvelopeError?: boolean;\n}\n\n/** 与 axios 实例兼容的请求客户端（避免对外暴露 axios 类型，消除多副本 axios 的类型冲突） */\nexport interface MarsunRequestClient {\n  get<T = unknown>(url: string, config?: unknown): Promise<T>;\n  post<T = unknown>(url: string, data?: unknown, config?: unknown): Promise<T>;\n  put<T = unknown>(url: string, data?: unknown, config?: unknown): Promise<T>;\n  patch<T = unknown>(url: string, data?: unknown, config?: unknown): Promise<T>;\n  delete<T = unknown>(url: string, config?: unknown): Promise<T>;\n  request<T = unknown>(config: unknown): Promise<T>;\n}\n\nconst SKIP_ERROR_HEADER = 'X-Skip-Error-Handler';\n\nfunction getSkipHandler(headers: unknown): boolean {\n  return Boolean((headers as Record<string, string> | undefined)?.[SKIP_ERROR_HEADER]);\n}\n\n/** 创建带鉴权、统一错误处理的 axios 实例 */\nexport function createMarsunRequest(options: CreateMarsunRequestOptions = {}): MarsunRequestClient {\n  const {\n    baseURL = '/api',\n    timeout = 30000,\n    successCode = 0,\n    withCredentials = false,\n    getToken,\n    onUnauthorized,\n    isPublicUrl = () => false,\n    isOnLoginPage = () => false,\n    showError = (msg) => message.error(msg),\n    getResponseError,\n    passThroughEnvelopeError = false,\n  } = options;\n\n  const extractError = (response: MarsunRequestErrorResponse | undefined): string => {\n    if (getResponseError) return getResponseError(response);\n    const data = response?.data as { message?: string; detail?: string; msg?: string } | undefined;\n    return data?.message || data?.detail || data?.msg || '请求失败';\n  };\n\n  const request = axios.create({\n    baseURL,\n    timeout,\n    withCredentials,\n    headers: {\n      'Content-Type': 'application/json',\n    },\n  });\n\n  request.interceptors.request.use(\n    (config) => {\n      const token = getToken?.();\n      if (token) {\n        config.headers.Authorization = `Bearer ${token}`;\n      }\n      return config;\n    },\n    (error) => Promise.reject(error),\n  );\n\n  request.interceptors.response.use(\n    (response) => {\n      const responseType = (response.config as { responseType?: string } | undefined)?.responseType;\n      if (responseType === 'blob' || responseType === 'arraybuffer') {\n        return response.data;\n      }\n      const data = response.data;\n      const isEnvelope = data && typeof data === 'object' && 'code' in data;\n      if (!isEnvelope) {\n        return data;\n      }\n      const envelope = data as MarsunApiResponse;\n      if (envelope.code !== successCode) {\n        if (passThroughEnvelopeError) {\n          return data;\n        }\n        if (!getSkipHandler(response.config.headers)) {\n          showError(envelope.message || '请求失败');\n        }\n        return Promise.reject(new Error(envelope.message || '请求失败'));\n      }\n      return data;\n    },\n    (error) => {\n      const url = error.config?.url ?? '';\n      const skipHandler = getSkipHandler(error.config?.headers);\n\n      if (error.response?.status === 401) {\n        if (!isPublicUrl(url) && !isOnLoginPage()) {\n          onUnauthorized?.();\n        }\n      } else if (!skipHandler) {\n        showError(extractError(error.response));\n      }\n      return Promise.reject(new Error(extractError(error.response)));\n    },\n  );\n\n  return request as MarsunRequestClient;\n}\n"],"names":["SKIP_ERROR_HEADER","getSkipHandler","headers","createMarsunRequest","options","baseURL","timeout","successCode","withCredentials","getToken","onUnauthorized","isPublicUrl","isOnLoginPage","showError","msg","message","getResponseError","passThroughEnvelopeError","extractError","response","data","request","axios","config","token","error","responseType","_a","envelope","url","skipHandler","_b","_c"],"mappings":";;;AA0CA,MAAMA,IAAoB;AAE1B,SAASC,EAAeC,GAA2B;AACjD,SAAO,GAASA,KAAA,QAAAA,EAAiDF;AACnE;AAGO,SAASG,EAAoBC,IAAsC,IAAyB;AACjG,QAAM;AAAA,IACJ,SAAAC,IAAU;AAAA,IACV,SAAAC,IAAU;AAAA,IACV,aAAAC,IAAc;AAAA,IACd,iBAAAC,IAAkB;AAAA,IAClB,UAAAC;AAAA,IACA,gBAAAC;AAAA,IACA,aAAAC,IAAc,MAAM;AAAA,IACpB,eAAAC,IAAgB,MAAM;AAAA,IACtB,WAAAC,IAAY,CAACC,MAAQC,EAAQ,MAAMD,CAAG;AAAA,IACtC,kBAAAE;AAAA,IACA,0BAAAC,IAA2B;AAAA,EAAA,IACzBb,GAEEc,IAAe,CAACC,MAA6D;AACjF,QAAIH,EAAkB,QAAOA,EAAiBG,CAAQ;AACtD,UAAMC,IAAOD,KAAA,gBAAAA,EAAU;AACvB,YAAOC,KAAA,gBAAAA,EAAM,aAAWA,KAAA,gBAAAA,EAAM,YAAUA,KAAA,gBAAAA,EAAM,QAAO;AAAA,EACvD,GAEMC,IAAUC,EAAM,OAAO;AAAA,IAC3B,SAAAjB;AAAA,IACA,SAAAC;AAAA,IACA,iBAAAE;AAAA,IACA,SAAS;AAAA,MACP,gBAAgB;AAAA,IAAA;AAAA,EAClB,CACD;AAED,SAAAa,EAAQ,aAAa,QAAQ;AAAA,IAC3B,CAACE,MAAW;AACV,YAAMC,IAAQf,KAAA,gBAAAA;AACd,aAAIe,MACFD,EAAO,QAAQ,gBAAgB,UAAUC,CAAK,KAEzCD;AAAA,IACT;AAAA,IACA,CAACE,MAAU,QAAQ,OAAOA,CAAK;AAAA,EAAA,GAGjCJ,EAAQ,aAAa,SAAS;AAAA,IAC5B,CAACF,MAAa;;AACZ,YAAMO,KAAgBC,IAAAR,EAAS,WAAT,gBAAAQ,EAA2D;AACjF,UAAID,MAAiB,UAAUA,MAAiB;AAC9C,eAAOP,EAAS;AAElB,YAAMC,IAAOD,EAAS;AAEtB,UAAI,EADeC,KAAQ,OAAOA,KAAS,YAAY,UAAUA;AAE/D,eAAOA;AAET,YAAMQ,IAAWR;AACjB,aAAIQ,EAAS,SAASrB,IAChBU,IACKG,KAEJnB,EAAekB,EAAS,OAAO,OAAO,KACzCN,EAAUe,EAAS,WAAW,MAAM,GAE/B,QAAQ,OAAO,IAAI,MAAMA,EAAS,WAAW,MAAM,CAAC,KAEtDR;AAAA,IACT;AAAA,IACA,CAACK,MAAU;;AACT,YAAMI,MAAMF,IAAAF,EAAM,WAAN,gBAAAE,EAAc,QAAO,IAC3BG,IAAc7B,GAAe8B,IAAAN,EAAM,WAAN,gBAAAM,EAAc,OAAO;AAExD,eAAIC,IAAAP,EAAM,aAAN,gBAAAO,EAAgB,YAAW,MACzB,CAACrB,EAAYkB,CAAG,KAAK,CAACjB,QACxBF,KAAA,QAAAA,OAEQoB,KACVjB,EAAUK,EAAaO,EAAM,QAAQ,CAAC,GAEjC,QAAQ,OAAO,IAAI,MAAMP,EAAaO,EAAM,QAAQ,CAAC,CAAC;AAAA,IAC/D;AAAA,EAAA,GAGKJ;AACT;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hkyhy/marsun-components-core",
-  "version": "0.1.57",
+  "version": "0.1.59",
   "description": "Marsun pure UI component library",
   "type": "module",
   "repository": {
@@ -117,6 +117,7 @@
     "@vitejs/plugin-react": "^4.3.4",
     "antd": "^6.0.0",
     "axios": "^1.7.7",
+    "axios-mock-adapter": "^2.1.0",
     "dayjs": "^1.11.13",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^9.1.2",