@das-fed/utils 7.0.6 → 7.0.7

package/common-info/index.js

@@ -2,7 +2,7 @@ import { getConfig as u } from "@das-fed/utils/config";
 import { getUrlParams as d } from "@das-fed/utils/common-tools";
 import { getAccessToken as I } from "@das-fed/utils/token-tools";
 import { getTokenFromQuery as S, getProjectInfoFromQuery as y } from "@das-fed/utils/common-info/getInfoFromUrl";
-const N = I, A = () => {
+const N = I, T = () => {
   var r;
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
@@ -60,7 +60,7 @@ const N = I, A = () => {
     leaf: (e == null ? void 0 : e.leaf) ?? !1,
     optional: (e == null ? void 0 : e.leaf) ?? !0
   };
-}, v = () => {
+}, f = () => {
   let e = JSON.parse(sessionStorage.getItem("project-message") || "{}");
   return {
     id: (e == null ? void 0 : e.id) ?? 0,
@@ -85,7 +85,7 @@ const N = I, A = () => {
     autoTimezone: (e == null ? void 0 : e.autoTimezone) ?? !1,
     currency: (e == null ? void 0 : e.currency) ?? {}
   };
-}, f = () => {
+}, v = () => {
   const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
   return {
     applicationCode: (e == null ? void 0 : e.applicationCode) ?? "",
@@ -118,6 +118,7 @@ const N = I, A = () => {
     currentSubApp: e.currentSubApp ?? {},
     currentSubAppCode: e.currentSubAppCode ?? "",
     subAppList: e.subAppList ?? [],
+    fixedApps: e.fixedApps ?? [],
     menuCollapses: e.menuCollapses ?? []
   };
 }, U = (e, t = !1) => {
@@ -133,7 +134,7 @@ const N = I, A = () => {
       s[n.code] = n.menus ?? [];
     }), s;
   }
-}, E = () => {
+}, x = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
   return {
     currentCode: e.currentCode ?? "",
@@ -141,10 +142,10 @@ const N = I, A = () => {
     tabMap: e.tabMap ?? {},
     preTab: e.preTab ?? {}
   };
-}, z = () => {
+}, E = () => {
   const e = u(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
-}, x = () => ({
+}, z = () => ({
   instanceInfo: JSON.parse(sessionStorage.getItem("instance") || "{}").instanceInfo ?? {}
 }), F = () => localStorage.getItem("fav-icon") || "./logo.svg";
 N() || S();
@@ -152,20 +153,20 @@ var i;
 (i = C()) != null && i.id || y();
 export {
   F as getFavIcon,
-  f as getHomeInfo,
-  x as getInstanceInfo,
+  v as getHomeInfo,
+  z as getInstanceInfo,
   M as getLanguages,
   U as getMenus,
-  z as getMinioAddress,
+  E as getMinioAddress,
   j as getPageAuth,
   D as getPageAuthBtn,
   k as getPersonalConfig,
   J as getPersonalInfo,
   C as getProjectInfo,
-  v as getProjectMessage,
+  f as getProjectMessage,
   m as getSubApps,
-  E as getTabInfo,
+  x as getTabInfo,
   O as getTenantInfo,
   N as getToken,
-  A as getUserInfo
+  T as getUserInfo
 };

package/common-info/type.d.ts

@@ -188,6 +188,8 @@ export interface SubAppsInfo {
   currentSubAppCode: string
   /** 当前打开的应用 */
   subAppList: any[]
+  /** 常用应用 */
+  fixedApps: any[]
   /** 当前菜单折叠的应用key集合 */
   menuCollapses: any[]
 }

package/common-tools/platform-tools/index.d.ts

@@ -9,7 +9,7 @@ export declare const isRelativeOrSameDomain: (url: string) => boolean;
  * @param url
  * @returns
  */
-export declare const setShowLayout: (url: string) => string;
+export declare const setShowLayout: (url: string) => any;
 export declare const setShowWatermark: (url: string) => string;
 /**
  * url携带token

package/common-tools/platform-tools/index.js

@@ -1,19 +1,26 @@
-import { getToken as s } from "@das-fed/utils/common-info";
-const o = (e) => !!(!e.startsWith("http") || e.startsWith(location.origin)), n = (e) => {
-  if (!e) return "";
-  let t = e;
-  return o(e) && !e.includes("showLayout=false") && (t = e.indexOf("?") !== -1 ? e + "&showLayout=false" : e + "?showLayout=false"), t;
-}, i = (e) => {
-  if (!e) return "";
-  let t = "";
-  return o(e) && !e.includes("showWatermark=false") ? t = e.indexOf("?") !== -1 ? e + "&showWatermark=false" : e + "?showWatermark=false" : t = e, t;
-}, r = (e) => {
-  const t = s();
-  return e.includes("?") ? `${e}&token=${t}` : `${e}?token=${t}`;
+import { getToken as n } from "@das-fed/utils/common-info";
+const o = (t) => {
+  try {
+    return new URL(t, location.origin).origin === location.origin;
+  } catch {
+    return !0;
+  }
+}, r = (t) => {
+  if (!t) return "";
+  if (!o(t)) return t;
+  const e = new URL(t, location.origin);
+  return e.searchParams.has("showLayout") || e.searchParams.set("showLayout", "false"), e.toString();
+}, s = (t) => {
+  if (!t) return "";
+  let e = "";
+  return o(t) && !t.includes("showWatermark=false") ? e = t.indexOf("?") !== -1 ? t + "&showWatermark=false" : t + "?showWatermark=false" : e = t, e;
+}, i = (t) => {
+  const e = n();
+  return t.includes("?") ? `${t}&token=${e}` : `${t}?token=${e}`;
 };
 export {
   o as isRelativeOrSameDomain,
-  n as setShowLayout,
-  i as setShowWatermark,
-  r as withToken
+  r as setShowLayout,
+  s as setShowWatermark,
+  i as withToken
 };

package/create-api-service/sso/index.d.ts

@@ -1,5 +1,5 @@
 declare const getQuery: (name: any) => any;
-declare const real_uri: any;
+declare const real_uri: string;
 declare const getTokenParams: any;
 declare const getTokenFromCode: () => unknown;
 declare const getToken: (config: any) => unknown;

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

@@ -9,15 +9,15 @@ function nt(e, t) {
     return e.apply(t, arguments);
   };
 }
-const { toString: Mt } = Object.prototype, { getPrototypeOf: _e } = Object, { iterator: se, toStringTag: rt } = Symbol, ie = /* @__PURE__ */ ((e) => (t) => {
-  const n = Mt.call(t);
+const { toString: Ht } = Object.prototype, { getPrototypeOf: _e } = Object, { iterator: se, toStringTag: rt } = Symbol, ie = /* @__PURE__ */ ((e) => (t) => {
+  const n = Ht.call(t);
   return e[n] || (e[n] = n.slice(8, -1).toLowerCase());
-})(/* @__PURE__ */ Object.create(null)), x = (e) => (e = e.toLowerCase(), (t) => ie(t) === e), ae = (e) => (t) => typeof t === e, { isArray: B } = Array, H = ae("undefined");
+})(/* @__PURE__ */ Object.create(null)), x = (e) => (e = e.toLowerCase(), (t) => ie(t) === e), ae = (e) => (t) => typeof t === e, { isArray: B } = Array, M = ae("undefined");
 function V(e) {
-  return e !== null && !H(e) && e.constructor !== null && !H(e.constructor) && A(e.constructor.isBuffer) && e.constructor.isBuffer(e);
+  return e !== null && !M(e) && e.constructor !== null && !M(e.constructor) && A(e.constructor.isBuffer) && e.constructor.isBuffer(e);
 }
 const ot = x("ArrayBuffer");
-function Ht(e) {
+function Mt(e) {
   let t;
   return typeof ArrayBuffer < "u" && ArrayBuffer.isView ? t = ArrayBuffer.isView(e) : t = e && e.buffer && ot(e.buffer), t;
 }
@@ -66,7 +66,7 @@ function it(e, t) {
       return o;
   return null;
 }
-const L = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : global, at = (e) => !H(e) && e !== L;
+const L = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : global, at = (e) => !M(e) && e !== L;
 function me() {
   const { caseless: e } = at(this) && this || {}, t = {}, n = (r, o) => {
     const s = e && it(t, o) || o;
@@ -168,7 +168,7 @@ const Rn = (e) => {
         const s = B(r) ? [] : {};
         return K(r, (i, c) => {
           const f = n(i, o + 1);
-          !H(f) && (s[c] = f);
+          !M(f) && (s[c] = f);
         }), t[o] = void 0, s;
       }
     }
@@ -187,7 +187,7 @@ const Rn = (e) => {
   isArrayBuffer: ot,
   isBuffer: V,
   isFormData: Gt,
-  isArrayBufferView: Ht,
+  isArrayBufferView: Mt,
   isString: $t,
   isNumber: st,
   isBoolean: zt,
@@ -198,7 +198,7 @@ const Rn = (e) => {
   isRequest: en,
   isResponse: tn,
   isHeaders: nn,
-  isUndefined: H,
+  isUndefined: M,
   isDate: Vt,
   isFile: Wt,
   isBlob: Kt,
@@ -509,7 +509,7 @@ function jn(e, t) {
 function qn(e) {
   return a.matchAll(/\w+|\[(\w*)]/g, e).map((t) => t[0] === "[]" ? "" : t[1] || t[0]);
 }
-function Mn(e) {
+function Hn(e) {
   const t = {}, n = Object.keys(e);
   let r;
   const o = n.length;
@@ -523,7 +523,7 @@ function yt(e) {
     let i = n[s++];
     if (i === "__proto__") return !0;
     const c = Number.isFinite(+i), f = s >= n.length;
-    return i = !i && a.isArray(o) ? o.length : i, f ? (a.hasOwnProp(o, i) ? o[i] = [o[i], r] : o[i] = r, !c) : ((!o[i] || !a.isObject(o[i])) && (o[i] = []), t(n, r, o[i], s) && a.isArray(o[i]) && (o[i] = Mn(o[i])), !c);
+    return i = !i && a.isArray(o) ? o.length : i, f ? (a.hasOwnProp(o, i) ? o[i] = [o[i], r] : o[i] = r, !c) : ((!o[i] || !a.isObject(o[i])) && (o[i] = []), t(n, r, o[i], s) && a.isArray(o[i]) && (o[i] = Hn(o[i])), !c);
   }
   if (a.isFormData(e) && a.isFunction(e.entries)) {
     const n = {};
@@ -533,7 +533,7 @@ function yt(e) {
   }
   return null;
 }
-function Hn(e, t, n) {
+function Mn(e, t, n) {
   if (a.isString(e))
     try {
       return (t || JSON.parse)(e), a.trim(e);
@@ -569,7 +569,7 @@ const Q = {
         );
       }
     }
-    return s || o ? (n.setContentType("application/json", !1), Hn(t)) : t;
+    return s || o ? (n.setContentType("application/json", !1), Mn(t)) : t;
   }],
   transformResponse: [function(t) {
     const n = this.transitional || Q.transitional, r = n && n.forcedJSONParsing, o = this.responseType === "json";
@@ -1302,7 +1302,7 @@ a.forEach(be, (e, t) => {
     Object.defineProperty(e, "adapterName", { value: t });
   }
 });
-const Me = (e) => `- ${e}`, pr = (e) => a.isFunction(e) || e === null || e === !1, Tt = {
+const He = (e) => `- ${e}`, pr = (e) => a.isFunction(e) || e === null || e === !1, Tt = {
   getAdapter: (e) => {
     e = a.isArray(e) ? e : [e];
     const { length: t } = e;
@@ -1322,8 +1322,8 @@ const Me = (e) => `- ${e}`, pr = (e) => a.isFunction(e) || e === null || e === !
         ([c, f]) => `adapter ${c} ` + (f === !1 ? "is not supported by the environment" : "is not available in the build")
       );
       let i = t ? s.length > 1 ? `since :
-` + s.map(Me).join(`
-`) : " " + Me(s[0]) : "as no adapter specified";
+` + s.map(He).join(`
+`) : " " + He(s[0]) : "as no adapter specified";
       throw new y(
         "There is no suitable adapter to dispatch the request " + i,
         "ERR_NOT_SUPPORT"
@@ -1337,7 +1337,7 @@ function he(e) {
   if (e.cancelToken && e.cancelToken.throwIfRequested(), e.signal && e.signal.aborted)
     throw new j(null, e);
 }
-function He(e) {
+function Me(e) {
   return he(e), e.headers = _.from(e.headers), e.data = pe.call(
     e,
     e.transformRequest
@@ -1468,7 +1468,7 @@ let N = class {
     });
     let u, d = 0, w;
     if (!f) {
-      const p = [He.bind(this), void 0];
+      const p = [Me.bind(this), void 0];
       for (p.unshift(...c), p.push(...l), w = p.length, u = Promise.resolve(n); d < w; )
         u = u.then(p[d++], p[d++]);
       return u;
@@ -1485,7 +1485,7 @@ let N = class {
       }
     }
     try {
-      u = He.call(this, g);
+      u = Me.call(this, g);
     } catch (p) {
       return Promise.reject(p);
     }
@@ -1699,22 +1699,22 @@ b.getAdapter = Tt.getAdapter;
 b.HttpStatusCode = Ee;
 b.default = b;
 const {
-  Axios: Qr,
-  AxiosError: Xr,
-  CanceledError: Gr,
-  isCancel: Zr,
-  CancelToken: Yr,
-  VERSION: eo,
-  all: to,
-  Cancel: no,
-  isAxiosError: ro,
-  spread: oo,
-  toFormData: so,
-  AxiosHeaders: io,
-  HttpStatusCode: ao,
-  formToJSON: co,
-  getAdapter: uo,
-  mergeConfig: lo
+  Axios: Xr,
+  AxiosError: Gr,
+  CanceledError: Zr,
+  isCancel: Yr,
+  CancelToken: eo,
+  VERSION: to,
+  all: no,
+  Cancel: ro,
+  isAxiosError: oo,
+  spread: so,
+  toFormData: io,
+  AxiosHeaders: ao,
+  HttpStatusCode: co,
+  formToJSON: uo,
+  getAdapter: lo,
+  mergeConfig: fo
 } = b;
 /*! js-cookie v3.0.5 | MIT */
 function G(e) {
@@ -1939,7 +1939,7 @@ const te = (e) => new URL(location.href).searchParams.get(e), I = {
   // 清除登录信息
   token: "/api/justauth/oauth-server/v1/visitor/oauth/token"
   // 通过code获取token
-}, { baseURL: Ze, noRedireLogin: vr = !1 } = Ae(), $ = location.origin + "/home", v = {
+}, { baseURL: Ze, noRedireLogin: vr = !1 } = Ae(), Ir = "/home", $ = location.origin + Ir, v = {
   response_type: "code",
   scope: "sever",
   client_id: "sys",
@@ -1962,11 +1962,11 @@ const te = (e) => new URL(location.href).searchParams.get(e), I = {
 };
 localStorage.getItem("idelTime") && Lt(Number(localStorage.getItem("idelTime")));
 let et = "";
-const Ir = async () => {
-  const e = te("code") || "", t = te("redirect_url") || "", n = te("kingdee_token") || "";
+const Br = async () => {
+  const e = te("code") || "", t = te("redirect_url") || "/", n = te("kingdee_token") || "";
   if (!e) return D();
   if (e === et)
-    return Ye(["code", "state", "kingdee_token", "redirect_url"]), t && (window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t))), D();
+    return Ye(["code", "state", "kingdee_token", "redirect_url"]), window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t)), D();
   et = e, Ye(["code", "state", "kingdee_token", "redirect_url"]);
   let r = {};
   const o = {
@@ -2008,13 +2008,13 @@ const Ir = async () => {
   } catch {
     return z({ ...v, redirect_uri: $ });
   }
-}, M = ne(!1), fo = async (e) => {
+}, H = ne(!1), po = async (e) => {
   if (e.public) return "";
   if (Ut.value) return z({ ...v, redirect_uri: $ });
-  if (M.value)
+  if (H.value)
     return await new Promise(async (o) => {
       Oe(
-        () => M.value,
+        () => H.value,
         (s) => {
           if (!s) {
             const i = D();
@@ -2027,17 +2027,17 @@ const Ir = async () => {
   if ((!D() || t === 0) && !n)
     return z({ ...v, redirect_uri: $ });
   let r = D();
-  M.value = !0;
+  H.value = !0;
   try {
-    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await qr(v)), r = await Ir(), M.value = !1;
+    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await Hr(v)), r = await Br(), H.value = !1;
   } catch {
-    M.value = !1;
+    H.value = !1;
   }
   return r;
-}, Br = () => {
+}, jr = () => {
   let e = !1;
   return localStorage.getItem("thirdLogouSource") === "zhongshen" && (e = !0), e;
-}, jr = (e) => {
+}, qr = (e) => {
   if (localStorage.getItem("thirdLogouSource") === "zhongshen") {
     const r = `https://iam.shenyejituan.com:443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=${encodeURIComponent(e)}&entityId=AIoT&redirectToLogin=true`;
     localStorage.removeItem("thirdLogouSource"), location.href = r;
@@ -2048,8 +2048,8 @@ const Ir = async () => {
   if (Te) return Te(e);
   e.logout = "true", n && (e.locale = "locale");
   const r = Object.keys(e).filter((s) => s !== "client_secret").map((s) => `${s}=${e[s]}`).join("&"), o = `${t}${I.oauth}?${r}`;
-  if (localStorage.removeItem("idelTime"), sessionStorage.clear(), J().remove(), Br())
-    jr(o);
+  if (localStorage.removeItem("idelTime"), sessionStorage.clear(), J().remove(), jr())
+    qr(o);
   else {
     try {
       b.create().get(I.logoutCurpage, { baseURL: t });
@@ -2059,7 +2059,7 @@ const Ir = async () => {
   }
 };
 Dr(z);
-const qr = async (e) => {
+const Hr = async (e) => {
   const { baseURL: t } = Ae(), { refreshToken: n } = J().getData();
   try {
     await b.create().get(I.token, { baseURL: t });
@@ -2097,13 +2097,10 @@ const qr = async (e) => {
     refreshToken: fe("refreshToken")
   }),
   save: (e) => {
-    Bt(
-      e.accessToken || "",
-      {
-        accessTokenExpiredAt: e.accessTokenExpiredAt,
-        refreshToken: e.refreshToken
-      }
-    ), qt(e);
+    Bt(e.accessToken ?? "", {
+      accessTokenExpiredAt: e.accessTokenExpiredAt,
+      refreshToken: e.refreshToken
+    }), qt(e);
   },
   remove: () => {
     It(), jt();
@@ -2111,8 +2108,8 @@ const qr = async (e) => {
 });
 export {
   te as getQuery,
-  fo as getToken,
-  Ir as getTokenFromCode,
+  po as getToken,
+  Br as getTokenFromCode,
   v as getTokenParams,
   z as login,
   $ as real_uri,

package/package.json

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