@das-fed/utils 7.1.0-dev.3 → 7.1.0-dev.30

package/common-info/index.d.ts

@@ -1,7 +1,7 @@
 import { UserInfo, PersonalInfo, TenantInfo, HomeInfo, PersonalConfigInfo, ProjectInfo, ProjectMessage, SubAppsInfo, TabInfo, permissionBtnInfo } from './type';
 
 /** 获取token */
-export declare const getToken: any;
+export declare const getToken: () => string;
 /** 获取账户详情 */
 export declare const getUserInfo: () => UserInfo;
 /** 获取用户详情 */

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

@@ -5,12 +5,17 @@
  */
 export declare const isRelativeOrSameDomain: (url: string) => boolean;
 /**
- * 自动拼接上showLayout=false参数
+ * 自动拼接上showLayout=false 和 ignoreAuth = true
  * @param url
  * @returns
  */
 export declare const setShowLayout: (url: string) => any;
-export declare const setShowWatermark: (url: string) => string;
+/**
+ * 设置水印显示参数
+ * @param url
+ * @returns
+ */
+export declare const setShowWatermark: (url: string) => any;
 /**
  * url携带token
  * @param url

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

@@ -1,26 +1,38 @@
-import { getToken as n } from "@das-fed/utils/common-info";
-const o = (t) => {
+import { getToken as r } from "@das-fed/utils/common-info";
+const s = (t) => {
   try {
     return new URL(t, location.origin).origin === location.origin;
   } catch {
     return !0;
   }
-}, r = (t) => {
+}, h = (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 (!s(t)) return t;
+  try {
+    const e = new URL(t, location.origin);
+    return e.searchParams.has("showLayout") || e.searchParams.set("showLayout", "false"), e.searchParams.has("ignoreAuth") || e.searchParams.set("ignoreAuth", "true"), e.toString();
+  } catch {
+    const e = /([?&])showLayout=/.test(t), a = /([?&])ignoreAuth=/.test(t), o = [];
+    if (e || o.push("showLayout=false"), a || o.push("ignoreAuth=true"), o.length === 0) return t;
+    const n = t.includes("?") ? "&" : "?";
+    return t + n + o.join("&");
+  }
+}, c = (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();
+  if (!s(t)) return t;
+  try {
+    const e = new URL(t, location.origin);
+    return e.searchParams.get("showWatermark") !== "false" && e.searchParams.set("showWatermark", "false"), e.toString();
+  } catch {
+    return t.includes("showWatermark=false") ? t : t.indexOf("?") !== -1 ? t + "&showWatermark=false" : t + "?showWatermark=false";
+  }
+}, f = (t) => {
+  const e = r();
   return t.includes("?") ? `${t}&token=${e}` : `${t}?token=${e}`;
 };
 export {
-  o as isRelativeOrSameDomain,
-  r as setShowLayout,
-  s as setShowWatermark,
-  i as withToken
+  s as isRelativeOrSameDomain,
+  h as setShowLayout,
+  c as setShowWatermark,
+  f as withToken
 };