@das-fed/utils 7.0.5-beta.5 → 7.0.5-beta.6

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/package.json

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