@das-fed/utils 7.0.6 → 7.0.7-dev.1

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,9 +1,9 @@
 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;
-declare const login: (params: any) => any;
+declare const login: (_params: any) => any;
 declare const tokenStorage: () => {
     getData: () => {
         accessToken: any;