@das-fed/utils 6.4.0-dev.55.2 → 6.4.0-dev.55.21

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

@@ -301,10 +301,10 @@ function Ue(e, t, n) {
     return o = ft(o), !n && s ? "[" + o + "]" : o;
   }).join(n ? "." : "") : t;
 }
-function Cn(e) {
+function kn(e) {
   return a.isArray(e) && !e.some(de);
 }
-const kn = a.toFlatObject(a, {}, null, function(t) {
+const Cn = a.toFlatObject(a, {}, null, function(t) {
   return /^is[A-Z]/.test(t);
 });
 function se(e, t, n) {
@@ -333,18 +333,18 @@ function se(e, t, n) {
     if (p && !h && typeof p == "object") {
       if (a.endsWith(m, "{}"))
         m = r ? m : m.slice(0, -2), p = JSON.stringify(p);
-      else if (a.isArray(p) && Cn(p) || (a.isFileList(p) || a.endsWith(m, "[]")) && (E = a.toArray(p)))
-        return m = ft(m), E.forEach(function(R, C) {
+      else if (a.isArray(p) && kn(p) || (a.isFileList(p) || a.endsWith(m, "[]")) && (E = a.toArray(p)))
+        return m = ft(m), E.forEach(function(R, k) {
           !(a.isUndefined(R) || R === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
-            i === !0 ? Ue([m], C, s) : i === null ? m : m + "[]",
+            i === !0 ? Ue([m], k, s) : i === null ? m : m + "[]",
             l(R)
           );
         }), !1;
     }
     return de(p) ? !0 : (t.append(Ue(h, m, s), l(p)), !1);
   }
-  const d = [], w = Object.assign(kn, {
+  const d = [], w = Object.assign(Cn, {
     defaultVisitor: u,
     convertValue: l,
     isVisitable: de
@@ -1069,16 +1069,16 @@ const bt = (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 T = o.transitional || ht;
-      o.timeoutErrorMessage && (C = o.timeoutErrorMessage), r(new y(
-        C,
+      o.timeoutErrorMessage && (k = o.timeoutErrorMessage), r(new y(
+        k,
         T.clarifyTimeoutError ? y.ETIMEDOUT : y.ECONNABORTED,
         e,
         h
       )), h = null;
-    }, s === void 0 && i.setContentType(null), "setRequestHeader" in h && a.forEach(i.toJSON(), function(C, T) {
-      h.setRequestHeader(T, C);
+    }, s === void 0 && i.setContentType(null), "setRequestHeader" in h && a.forEach(i.toJSON(), function(k, T) {
+      h.setRequestHeader(T, k);
     }), a.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), c && c !== "json" && (h.responseType = o.responseType), l && ([w, p] = ee(l, !0), h.addEventListener("progress", w)), f && h.upload && ([d, g] = ee(f), h.upload.addEventListener("progress", d), h.upload.addEventListener("loadend", g)), (o.cancelToken || o.signal) && (u = (R) => {
       h && (r(!R || R.type ? new j(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)));
@@ -1239,8 +1239,8 @@ const lr = async (e) => {
         method: "POST",
         body: r,
         duplex: "half"
-      }), k;
-      if (a.isFormData(r) && (k = T.headers.get("content-type")) && u.setContentType(k), T.body) {
+      }), C;
+      if (a.isFormData(r) && (C = T.headers.get("content-type")) && u.setContentType(C), T.body) {
         const [N, K] = Fe(
           h,
           ee(Be(f))
@@ -1263,11 +1263,11 @@ const lr = async (e) => {
     const R = he && (l === "stream" || l === "response");
     if (he && (c || R && m)) {
       const T = {};
-      ["status", "statusText", "headers"].forEach((ke) => {
-        T[ke] = S[ke];
+      ["status", "statusText", "headers"].forEach((Ce) => {
+        T[Ce] = S[Ce];
       });
-      const k = a.toFiniteNumber(S.headers.get("content-length")), [N, K] = c && Fe(
-        k,
+      const C = a.toFiniteNumber(S.headers.get("content-length")), [N, K] = c && Fe(
+        C,
         ee(Be(c), !0)
       ) || [];
       S = new Response(
@@ -1278,10 +1278,10 @@ const lr = async (e) => {
       );
     }
     l = l || "text";
-    let C = await te[a.findKey(te, l) || "text"](S, e);
-    return !R && m && m(), await new Promise((T, k) => {
-      wt(T, k, {
-        data: C,
+    let k = await te[a.findKey(te, l) || "text"](S, e);
+    return !R && m && m(), await new Promise((T, C) => {
+      wt(T, C, {
+        data: k,
         headers: A.from(S.headers),
         status: S.status,
         statusText: S.statusText,
@@ -1775,7 +1775,7 @@ var gr = ge(wr, { path: "/" }), $e;
 const At = typeof window < "u", br = (e) => typeof e == "string", Je = () => +Date.now(), be = () => {
 };
 At && (($e = window == null ? void 0 : window.navigator) != null && $e.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
-function Ce(e) {
+function ke(e) {
   return typeof e == "function" ? e() : Ut(e);
 }
 function Er(e, t) {
@@ -1792,7 +1792,7 @@ function Sr(e, t = !0, n = !0, r = !1) {
     s && (clearTimeout(s), s = void 0, c(), c = be);
   };
   return (d) => {
-    const w = Ce(e), g = Date.now() - o, p = () => f = d();
+    const w = ke(e), g = Date.now() - o, p = () => f = d();
     return l(), w <= 0 ? (o = Date.now(), p()) : (g > w && (n || !i) ? (o = Date.now(), p()) : t && (f = new Promise((m, h) => {
       c = r ? h : m, s = setTimeout(() => {
         o = Date.now(), i = !0, m(p()), l();
@@ -1808,7 +1808,7 @@ function Tr(e) {
 }
 function Or(e) {
   var t;
-  const n = Ce(e);
+  const n = ke(e);
   return (t = n == null ? void 0 : n.$el) != null ? t : n;
 }
 const _t = At ? window : void 0;
@@ -1819,7 +1819,7 @@ function Ve(...e) {
   Array.isArray(n) || (n = [n]), Array.isArray(r) || (r = [r]);
   const s = [], i = () => {
     s.forEach((u) => u()), s.length = 0;
-  }, c = (u, d, w, g) => (u.addEventListener(d, w, g), () => u.removeEventListener(d, w, g)), f = Se(() => [Or(t), Ce(o)], ([u, d]) => {
+  }, c = (u, d, w, g) => (u.addEventListener(d, w, g), () => u.removeEventListener(d, w, g)), f = Se(() => [Or(t), ke(o)], ([u, d]) => {
     i(), u && s.push(...n.flatMap((w) => r.map((g) => c(u, w, g, d))));
   }, { immediate: !0, flush: "post" }), l = () => {
     f(), i();
@@ -1855,9 +1855,9 @@ var Qe;
 (function(e) {
   e.UP = "UP", e.RIGHT = "RIGHT", e.DOWN = "DOWN", e.LEFT = "LEFT", e.NONE = "NONE";
 })(Qe || (Qe = {}));
-var Cr = Object.defineProperty, Ge = Object.getOwnPropertySymbols, kr = Object.prototype.hasOwnProperty, Pr = Object.prototype.propertyIsEnumerable, Xe = (e, t, n) => t in e ? Cr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, Nr = (e, t) => {
+var kr = Object.defineProperty, Ge = Object.getOwnPropertySymbols, Cr = Object.prototype.hasOwnProperty, Pr = Object.prototype.propertyIsEnumerable, Xe = (e, t, n) => t in e ? kr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, Nr = (e, t) => {
   for (var n in t || (t = {}))
-    kr.call(t, n) && Xe(e, n, t[n]);
+    Cr.call(t, n) && Xe(e, n, t[n]);
   if (Ge)
     for (var n of Ge(t))
       Pr.call(t, n) && Xe(e, n, t[n]);
@@ -1909,7 +1909,7 @@ const xt = { triggerProxySso: "triggerProxySso" }, Lr = () => {
   });
 };
 window.top !== window.self && Lr();
-let Ct = (e = 21) => {
+let kt = (e = 21) => {
   let t = "", n = crypto.getRandomValues(new Uint8Array(e));
   for (; e--; ) {
     let r = n[e] & 63;
@@ -1917,7 +1917,7 @@ let Ct = (e = 21) => {
   }
   return t;
 };
-const kt = (e) => new URL(location.href).searchParams.get(e), B = {
+const Ct = (e) => new URL(location.href).searchParams.get(e), B = {
   oauth: "/api/justauth/oauth-server/v1/visitor/oauth/authorize",
   // 重定向到登录页
   logoutCurpage: "/api/justauth/oauth-server/v1/visitor/logout-curpage",
@@ -1936,7 +1936,7 @@ const kt = (e) => new URL(location.href).searchParams.get(e), B = {
     window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(e));
   else {
     const t = ["code", "state", "kingdee_token", "redirect_url"];
-    window.history.replaceState(null, "", Ft(t)), window.__isAutoCloseApp = !1, window.location.reload();
+    window.history.replaceState({}, "", Ft(t));
   }
 }, Pt = Y(!1), Nt = (e) => {
   if (e <= 0) return;
@@ -1950,7 +1950,7 @@ const kt = (e) => new URL(location.href).searchParams.get(e), B = {
 };
 localStorage.getItem("idelTime") && Nt(Number(localStorage.getItem("idelTime")));
 const Ir = async () => {
-  const e = kt("code") || "";
+  const e = Ct("code") || "";
   if (!e) return H();
   const { redirectUri: t } = v().getData(), n = Ye(location.href, "kingdee_token") || "";
   let r = {};
@@ -1961,7 +1961,7 @@ const Ir = async () => {
     client_secret: F.client_secret,
     redirect_uri: t || $,
     timestamp: (/* @__PURE__ */ new Date()).getTime(),
-    nonce: Ct()
+    nonce: kt()
   };
   n && (sessionStorage.setItem("kingdee_token", n), o.redirect_uri = `${o.redirect_uri}?kingdee_token=${n}`);
   try {
@@ -2008,7 +2008,7 @@ const Ir = async () => {
         }
       );
     });
-  const { accessTokenExpiredAt: t } = v().getData(), n = kt("code") || "";
+  const { accessTokenExpiredAt: t } = v().getData(), n = Ct("code") || "";
   if ((!H() || t === 0) && !n)
     return J({ ...F, redirect_uri: $ });
   let r = H();
@@ -2046,7 +2046,7 @@ const jr = async (e) => {
           client_id: e.client_id,
           client_secret: e.client_secret,
           timestamp: (/* @__PURE__ */ new Date()).getTime(),
-          nonce: Ct()
+          nonce: kt()
         }
       }
     ), { access_token: s = "", expires_in: i = 0, refresh_token: c = "" } = o.data, f = {
@@ -2081,7 +2081,7 @@ const jr = async (e) => {
   }
 });
 export {
-  kt as getQuery,
+  Ct as getQuery,
   Wr as getToken,
   Ir as getTokenFromCode,
   F as getTokenParams,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-dev.55.2",
+  "version": "6.4.0-dev.55.21",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-dev.55.2",
+    "@das-fed/utils": "6.4.0-dev.55.21",
     "@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": "6.4.0-dev.55.2",
-    "@das-fed/web": "6.4.0-dev.55.2",
+    "@das-fed/cli": "6.4.0-dev.55.21",
+    "@das-fed/web": "6.4.0-dev.55.21",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",