@das-fed/utils 7.0.10 → 7.0.11

package/create-api-service/sso/index.js

@@ -183,7 +183,7 @@ const On = (e) => {
 }))(`axios@${Math.random()}`, []) : (n) => setTimeout(n))(
   typeof setImmediate == "function",
   A(U.postMessage)
-), xn = typeof queueMicrotask < "u" ? queueMicrotask.bind(U) : typeof process < "u" && process.nextTick || ft, kn = (e) => e != null && A(e[oe]), a = {
+), xn = typeof queueMicrotask < "u" ? queueMicrotask.bind(U) : typeof process < "u" && process.nextTick || ft, Cn = (e) => e != null && A(e[oe]), a = {
   isArray: v,
   isArrayBuffer: it,
   isBuffer: J,
@@ -241,7 +241,7 @@ const On = (e) => {
   isThenable: _n,
   setImmediate: ft,
   asap: xn,
-  isIterable: kn
+  isIterable: Cn
 };
 function y(e, t, n, r, o) {
   Error.call(this), Error.captureStackTrace ? Error.captureStackTrace(this, this.constructor) : this.stack = new Error().stack, this.message = e, this.name = "AxiosError", t && (this.code = t), n && (this.config = n), r && (this.request = r), o && (this.response = o, this.status = o.status ? o.status : null);
@@ -293,7 +293,7 @@ y.from = (e, t, n, r, o, s) => {
     return f !== Error.prototype;
   }, (c) => c !== "isAxiosError"), y.call(i, e.message, t, n, r, o), i.cause = e, i.name = e.name, s && Object.assign(i, s), i;
 };
-const Cn = null;
+const kn = null;
 function we(e) {
   return a.isPlainObject(e) || a.isArray(e);
 }
@@ -340,10 +340,10 @@ function ae(e, t, n) {
       if (a.endsWith(m, "{}"))
         m = r ? m : m.slice(0, -2), p = JSON.stringify(p);
       else if (a.isArray(p) && Pn(p) || (a.isFileList(p) || a.endsWith(m, "[]")) && (E = a.toArray(p)))
-        return m = ht(m), E.forEach(function(R, C) {
+        return m = ht(m), E.forEach(function(R, k) {
           !(a.isUndefined(R) || R === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
-            i === !0 ? Ne([m], C, s) : i === null ? m : m + "[]",
+            i === !0 ? Ne([m], k, s) : i === null ? m : m + "[]",
             l(R)
           );
         }), !1;
@@ -388,10 +388,10 @@ function Fe(e) {
     return t[r];
   });
 }
-function ke(e, t) {
+function Ce(e, t) {
   this._pairs = [], e && ae(e, this, t);
 }
-const mt = ke.prototype;
+const mt = Ce.prototype;
 mt.append = function(t, n) {
   this._pairs.push([t, n]);
 };
@@ -415,7 +415,7 @@ function yt(e, t, n) {
   });
   const o = n && n.serialize;
   let s;
-  if (o ? s = o(t, n) : s = a.isURLSearchParams(t) ? t.toString() : new ke(t, n).toString(r), s) {
+  if (o ? s = o(t, n) : s = a.isURLSearchParams(t) ? t.toString() : new Ce(t, n).toString(r), s) {
     const i = e.indexOf("#");
     i !== -1 && (e = e.slice(0, i)), e += (e.indexOf("?") === -1 ? "?" : "&") + s;
   }
@@ -479,7 +479,7 @@ const wt = {
   silentJSONParsing: !0,
   forcedJSONParsing: !0,
   clarifyTimeoutError: !1
-}, Nn = typeof URLSearchParams < "u" ? URLSearchParams : ke, Fn = typeof FormData < "u" ? FormData : null, Dn = typeof Blob < "u" ? Blob : null, vn = {
+}, Nn = typeof URLSearchParams < "u" ? URLSearchParams : Ce, Fn = typeof FormData < "u" ? FormData : null, Dn = typeof Blob < "u" ? Blob : null, vn = {
   isBrowser: !0,
   classes: {
     URLSearchParams: Nn,
@@ -487,10 +487,10 @@ const wt = {
     Blob: Dn
   },
   protocols: ["http", "https", "file", "blob", "url", "data"]
-}, Ce = typeof window < "u" && typeof document < "u", ge = typeof navigator == "object" && navigator || void 0, In = Ce && (!ge || ["ReactNative", "NativeScript", "NS"].indexOf(ge.product) < 0), Bn = typeof WorkerGlobalScope < "u" && // eslint-disable-next-line no-undef
-self instanceof WorkerGlobalScope && typeof self.importScripts == "function", jn = Ce && window.location.href || "http://localhost", qn = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ke = typeof window < "u" && typeof document < "u", ge = typeof navigator == "object" && navigator || void 0, In = ke && (!ge || ["ReactNative", "NativeScript", "NS"].indexOf(ge.product) < 0), Bn = typeof WorkerGlobalScope < "u" && // eslint-disable-next-line no-undef
+self instanceof WorkerGlobalScope && typeof self.importScripts == "function", jn = ke && window.location.href || "http://localhost", qn = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  hasBrowserEnv: Ce,
+  hasBrowserEnv: ke,
   hasStandardBrowserEnv: In,
   hasStandardBrowserWebWorkerEnv: Bn,
   navigator: ge,
@@ -1061,16 +1061,16 @@ const Rt = (e) => {
     }, h.onerror = function() {
       r(new y("Network Error", y.ERR_NETWORK, e, h)), h = null;
     }, h.ontimeout = function() {
-      let C = o.timeout ? "timeout of " + o.timeout + "ms exceeded" : "timeout exceeded";
+      let k = o.timeout ? "timeout of " + o.timeout + "ms exceeded" : "timeout exceeded";
       const O = o.transitional || wt;
-      o.timeoutErrorMessage && (C = o.timeoutErrorMessage), r(new y(
-        C,
+      o.timeoutErrorMessage && (k = o.timeoutErrorMessage), r(new y(
+        k,
         O.clarifyTimeoutError ? y.ETIMEDOUT : y.ECONNABORTED,
         e,
         h
       )), h = null;
-    }, s === void 0 && i.setContentType(null), "setRequestHeader" in h && a.forEach(i.toJSON(), function(C, O) {
-      h.setRequestHeader(O, C);
+    }, s === void 0 && i.setContentType(null), "setRequestHeader" in h && a.forEach(i.toJSON(), function(k, O) {
+      h.setRequestHeader(O, k);
     }), a.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), c && c !== "json" && (h.responseType = o.responseType), l && ([w, p] = ne(l, !0), h.addEventListener("progress", w)), f && h.upload && ([d, g] = ne(f), h.upload.addEventListener("progress", d), h.upload.addEventListener("loadend", g)), (o.cancelToken || o.signal) && (u = (R) => {
       h && (r(!R || R.type ? new I(null, e, h) : R), h.abort(), h = null);
     }, o.cancelToken && o.cancelToken.subscribe(u), o.signal && (o.signal.aborted ? u() : o.signal.addEventListener("abort", u)));
@@ -1270,10 +1270,10 @@ const dr = async (e) => {
       );
     }
     l = l || "text";
-    let C = await re[a.findKey(re, l) || "text"](S, e);
+    let k = await re[a.findKey(re, l) || "text"](S, e);
     return !R && m && m(), await new Promise((O, P) => {
       Et(O, P, {
-        data: C,
+        data: k,
         headers: _.from(S.headers),
         status: S.status,
         statusText: S.statusText,
@@ -1290,7 +1290,7 @@ const dr = async (e) => {
     ) : y.from(E, E && E.code, e, p);
   }
 }), Ee = {
-  http: Cn,
+  http: kn,
   xhr: sr,
   fetch: hr
 };
@@ -1399,7 +1399,7 @@ function yr(e, t, n) {
 const ee = {
   assertOptions: yr,
   validators: ue
-}, k = ee.validators;
+}, C = ee.validators;
 let N = class {
   constructor(t) {
     this.defaults = t || {}, this.interceptors = {
@@ -1436,17 +1436,17 @@ let N = class {
     typeof t == "string" ? (n = n || {}, n.url = t) : n = t || {}, n = F(this.defaults, n);
     const { transitional: r, paramsSerializer: o, headers: s } = n;
     r !== void 0 && ee.assertOptions(r, {
-      silentJSONParsing: k.transitional(k.boolean),
-      forcedJSONParsing: k.transitional(k.boolean),
-      clarifyTimeoutError: k.transitional(k.boolean)
+      silentJSONParsing: C.transitional(C.boolean),
+      forcedJSONParsing: C.transitional(C.boolean),
+      clarifyTimeoutError: C.transitional(C.boolean)
     }, !1), o != null && (a.isFunction(o) ? n.paramsSerializer = {
       serialize: o
     } : ee.assertOptions(o, {
-      encode: k.function,
-      serialize: k.function
+      encode: C.function,
+      serialize: C.function
     }, !0)), n.allowAbsoluteUrls !== void 0 || (this.defaults.allowAbsoluteUrls !== void 0 ? n.allowAbsoluteUrls = this.defaults.allowAbsoluteUrls : n.allowAbsoluteUrls = !0), ee.assertOptions(n, {
-      baseUrl: k.spelling("baseURL"),
-      withXsrfToken: k.spelling("withXSRFToken")
+      baseUrl: C.spelling("baseURL"),
+      withXsrfToken: C.spelling("withXSRFToken")
     }, !0), n.method = (n.method || this.defaults.method || "get").toLowerCase();
     let i = s && a.merge(
       s.common,
@@ -1673,13 +1673,13 @@ const Se = {
 Object.entries(Se).forEach(([e, t]) => {
   Se[t] = e;
 });
-function kt(e) {
+function Ct(e) {
   const t = new N(e), n = ot(N.prototype.request, t);
   return a.extend(n, N.prototype, t, { allOwnKeys: !0 }), a.extend(n, t, null, { allOwnKeys: !0 }), n.create = function(o) {
-    return kt(F(e, o));
+    return Ct(F(e, o));
   }, n;
 }
-const b = kt(K);
+const b = Ct(K);
 b.Axios = N;
 b.CanceledError = I;
 b.CancelToken = wr;
@@ -1788,9 +1788,9 @@ function Re(e, t) {
   );
 }
 var Sr = Re(Er, { path: "/" }), Je;
-const Ct = typeof window < "u", Rr = (e) => typeof e == "string", Ve = () => +Date.now(), Te = () => {
+const kt = typeof window < "u", Rr = (e) => typeof e == "string", Ve = () => +Date.now(), Te = () => {
 };
-Ct && ((Je = window == null ? void 0 : window.navigator) != null && Je.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
+kt && ((Je = window == null ? void 0 : window.navigator) != null && Je.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
 function Pe(e) {
   return typeof e == "function" ? e() : Dt(e);
 }
@@ -1827,7 +1827,7 @@ function xr(e) {
   const n = Pe(e);
   return (t = n == null ? void 0 : n.$el) != null ? t : n;
 }
-const Pt = Ct ? window : void 0;
+const Pt = kt ? window : void 0;
 function We(...e) {
   let t, n, r, o;
   if (Rr(e[0]) || Array.isArray(e[0]) ? ([n, r, o] = e, t = Pt) : [t, n, r, o] = e, !t)
@@ -1844,12 +1844,12 @@ function We(...e) {
 }
 const Ke = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, Qe = "__vueuse_ssr_handlers__";
 Ke[Qe] = Ke[Qe] || {};
-const kr = ["mousemove", "mousedown", "resize", "keydown", "touchstart", "wheel"], Cr = 6e4;
-function Pr(e = Cr, t = {}) {
+const Cr = ["mousemove", "mousedown", "resize", "keydown", "touchstart", "wheel"], kr = 6e4;
+function Pr(e = kr, t = {}) {
   const {
     initialState: n = !1,
     listenForVisibilityChange: r = !0,
-    events: o = kr,
+    events: o = Cr,
     window: s = Pt,
     eventFilter: i = Or(50)
   } = t, c = te(n), f = te(Ve());
@@ -1933,7 +1933,7 @@ let Ut = (e = 21) => {
   }
   return t;
 };
-const G = (e) => new URL(location.href).searchParams.get(e), D = {
+const j = (e) => new URL(location.href).searchParams.get(e), D = {
   oauth: "/api/justauth/oauth-server/v1/visitor/oauth/authorize",
   // 重定向到登录页
   logoutCurpage: "/api/justauth/oauth-server/v1/visitor/logout-curpage",
@@ -1964,7 +1964,7 @@ const G = (e) => new URL(location.href).searchParams.get(e), D = {
 localStorage.getItem("idelTime") && Ft(Number(localStorage.getItem("idelTime")));
 let tt = "";
 const jr = async () => {
-  const e = G("code") || "", t = G("redirect_url") || "/", n = G("kingdee_token") || "", r = G("loginType") || "";
+  const e = j("code") || "", t = j("redirect_url") || "/", n = j("kingdee_token") || "", r = j("loginType") || "";
   if (r && localStorage.setItem("loginType", r), !e) return H();
   if (e === tt)
     return et(["code", "state", "kingdee_token", "redirect_url"]), window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t)), H();
@@ -2009,14 +2009,14 @@ const jr = async () => {
   } catch {
     return le({ ...M, redirect_uri: q });
   }
-}, j = te(!1), mo = async (e) => {
+}, G = te(!1), mo = async (e) => {
   if (e.public) return "";
   if (Nt.value)
     return le({ ...M, redirect_uri: q });
-  if (j.value)
+  if (G.value)
     return await new Promise(async (r) => {
       Ae(
-        () => j.value,
+        () => G.value,
         (o) => {
           if (!o) {
             const s = H();
@@ -2025,15 +2025,16 @@ const jr = async () => {
         }
       );
     });
-  const { accessTokenExpiredAt: t } = z().getData();
-  let n = H();
-  j.value = !0;
+  let t = H();
+  const { accessTokenExpiredAt: n } = z().getData();
+  G.value = !0;
   try {
-    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (n = await Hr(M)), n = await jr(), j.value = !1;
+    j("code") || "" ? t = await jr() : typeof n == "number" && n > 0 && +/* @__PURE__ */ new Date() + 6e4 > n && (t = await Hr(M));
   } catch {
-    j.value = !1;
+  } finally {
+    G.value = !1;
   }
-  return n;
+  return t;
 }, qr = () => {
   let e = !1;
   return localStorage.getItem("thirdLogouSource") === "zhongshen" && (e = !0), e;
@@ -2121,7 +2122,7 @@ const Hr = async (e) => {
   }
 });
 export {
-  G as getQuery,
+  j as getQuery,
   mo as getToken,
   jr as getTokenFromCode,
   M as getTokenParams,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.10",
+  "version": "7.0.11",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.0.10",
+    "@das-fed/utils": "7.0.11",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.0.10",
-    "@das-fed/web": "7.0.10",
+    "@das-fed/cli": "7.0.11",
+    "@das-fed/web": "7.0.11",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",