@das-fed/utils 6.4.0-dev.2 → 6.4.0-dev.20

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

@@ -5,11 +5,12 @@
  */
 export declare const isRelativeOrSameDomain: (url: string) => boolean;
 /**
- * wei自动拼接上showLayout=false参数
+ * 自动拼接上showLayout=false参数
  * @param url
  * @returns
  */
 export declare const setShowLayout: (url: string) => string;
+export declare const setShowWatermark: (url: string) => string;
 /**
  * url携带token
  * @param url

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

@@ -1,14 +1,19 @@
-import { getToken as o } from "@das-fed/utils/common-info";
-const n = (t) => !!(!t.startsWith("http") || t.startsWith(location.origin)), i = (t) => {
-  if (!t) return "";
-  let e = t;
-  return n(t) && !t.includes("showLayout=false") && (e = t.indexOf("?") !== -1 ? t + "&showLayout=false" : t + "?showLayout=false"), e;
-}, a = (t) => {
-  const e = o();
-  return t.includes("?") ? `${t}&token=${e}` : `${t}?token=${e}`;
+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}`;
 };
 export {
-  n as isRelativeOrSameDomain,
-  i as setShowLayout,
-  a as withToken
+  o as isRelativeOrSameDomain,
+  n as setShowLayout,
+  i as setShowWatermark,
+  r as withToken
 };

package/common-tools/update-fav-icon/index.js

@@ -1,19 +1,20 @@
-import { getFavIcon as s } from "@das-fed/utils/common-info";
-import { pureImageSrc as l } from "@das-fed/utils/pure-image-src";
-import { systemConfiguration as m } from "@das-fed/utils/api-services/modules";
-const c = m.get("/visitor/appearance/with-default", (t) => (t.public = !0, t)), i = (t, o = "./logo.svg") => {
-  const r = t || o;
+import { getFavIcon as l } from "@das-fed/utils/common-info";
+import { pureImageSrc as m } from "@das-fed/utils/pure-image-src";
+import { systemConfiguration as c } from "@das-fed/utils/api-services";
+const i = (o, r = "./logo.svg") => {
+  const t = o || r;
   let e = document.querySelector('link[rel*="icon"]');
-  e ? e == null || e.setAttribute("href", r) : (e = document.createElement("link"), e.rel = "icon", e.type = "image/svg+xml", e.href = r, document.getElementsByTagName("head")[0].appendChild(e));
-}, f = async (t = "./logo.svg") => {
-  let o = s();
-  if (!o) {
-    const [r, e] = await c().run();
-    if (r) return;
-    const { browserLogoImgHost: n = "", browserLogoImg: a = "" } = e || {};
-    o = a ? n + l(a) : "";
+  e ? e == null || e.setAttribute("href", t) : (e = document.createElement("link"), e.rel = "icon", e.type = "image/svg+xml", e.href = t, document.getElementsByTagName("head")[0].appendChild(e));
+}, f = async (o = "./logo.svg") => {
+  const r = c.get("/visitor/appearance/with-default", (e) => (e.public = !0, e));
+  let t = l();
+  if (!t) {
+    const [e, n] = await r().run();
+    if (e) return;
+    const { browserLogoImgHost: s = "", browserLogoImg: a = "" } = n || {};
+    t = a ? s + m(a) : "";
   }
-  i(o, t);
+  i(t, o);
 };
 export {
   f as setDasHtmlIcon,