@das-fed/utils 6.3.0-beta.9 → 6.4.0-beta.10

package/common-tools/date-format/index.js

@@ -10,7 +10,8 @@ const a = (s, t = "yyyy-MM-dd HH:mm:ss") => {
     S: e.getMilliseconds()
   }, g = e.getFullYear().toString();
   g = g.length >= 4 ? g : "0000".substr(0, 4 - g.length) + g, /(y+)/.test(t) && (t = t.replace(RegExp.$1, (g + "").substr(4 - RegExp.$1.length)));
-  for (var n in r) new RegExp("(" + n + ")").test(t) && (t = t.replace(RegExp.$1, RegExp.$1.length === 1 ? r[n] : ("00" + r[n]).substr(("" + r[n]).length)));
+  for (var n in r)
+    new RegExp("(" + n + ")").test(t) && (t = t.replace(RegExp.$1, RegExp.$1.length === 1 ? r[n] : ("00" + r[n]).substr(("" + r[n]).length)));
   return t;
 };
 export {

package/common-tools/get-url-params/index.d.ts

@@ -37,7 +37,7 @@ export declare const objectToUrlparams: (params: any) => string;
  * @param pathParams 参数，数组格式
  * @returns
  */
-export declare const addPathParamsToUrl: (url: string, pathParams: any[]) => string;
+export declare const addPathParamsToUrl: (url: string, pathParams: string[]) => any;
 /**
  * 从URL中获取origin
  * @param url url

package/common-tools/get-url-params/index.js

@@ -1,60 +1,63 @@
-const a = (r, n) => {
+const i = (n, s) => {
   let e = window.location.search || "";
-  if (r && r !== location.href) {
-    const s = r.indexOf("?");
-    s !== -1 ? e = r.slice(s) : e = "";
+  if (n && n !== location.href) {
+    const t = n.indexOf("?");
+    t !== -1 ? e = n.slice(t) : e = "";
   }
-  const t = new URLSearchParams(e);
-  if (n)
-    return t.get(n);
+  const r = new URLSearchParams(e);
+  if (s)
+    return r.get(s);
   {
-    let s = {};
-    for (let [l, c] of t.entries())
-      s[l] = c;
-    return s;
+    let t = {};
+    for (let [o, l] of r.entries())
+      t[o] = l;
+    return t;
   }
-}, f = (r, n = {}) => {
-  let e = "", t = "";
-  const s = Object.keys(n);
-  return s && s.length && s.forEach((l, c) => {
-    c === s.length - 1 ? t += `${l}=${n[l]}` : t += `${l}=${n[l]}&`;
-  }), t ? e = location.origin + r + `?${t}` : e = location.origin + r, e;
-}, h = (r, n) => {
-  const e = n || location.href, t = a(e), s = Object.keys(t) || [];
-  if (!s || !s.length) return e.includes("?") ? e.split("?")[0] : e.split("&")[0];
-  let l = s.filter((i) => !r.includes(i));
-  if (!l || !l.length) return e.includes("?") ? e.split("?")[0] : e.split("&")[0];
-  let c = "";
-  return l.forEach((i, o) => {
-    o === s.length - 1 ? c += `${i}=${t[i]}` : c += `${i}=${t[i]}&`;
-  }), e.includes("?") ? e.split("?")[0] + `?${c}` : e.split("&")[0] + `?${c}`;
-}, u = (r) => {
-  const n = new URLSearchParams(r.split("?")[1]), e = {};
-  for (const [t, s] of n)
-    e.hasOwnProperty(t) ? Array.isArray(e[t]) ? e[t].push(s) : e[t] = [e[t], s] : e[t] = s;
+}, f = (n, s = {}) => {
+  let e = "", r = "";
+  const t = Object.keys(s);
+  return t && t.length && t.forEach((o, l) => {
+    l === t.length - 1 ? r += `${o}=${s[o]}` : r += `${o}=${s[o]}&`;
+  }), r ? e = location.origin + n + `?${r}` : e = location.origin + n, e;
+}, h = (n, s) => {
+  const e = s || location.href, r = i(e), t = Object.keys(r) || [];
+  if (!t || !t.length) return e.includes("?") ? e.split("?")[0] : e.split("&")[0];
+  let o = t.filter((a) => !n.includes(a));
+  if (!o || !o.length) return e.includes("?") ? e.split("?")[0] : e.split("&")[0];
+  let l = "";
+  return o.forEach((a, c) => {
+    c === t.length - 1 ? l += `${a}=${r[a]}` : l += `${a}=${r[a]}&`;
+  }), e.includes("?") ? e.split("?")[0] + `?${l}` : e.split("&")[0] + `?${l}`;
+}, u = (n) => {
+  const s = new URLSearchParams(n.split("?")[1]), e = {};
+  for (const [r, t] of s)
+    e.hasOwnProperty(r) ? Array.isArray(e[r]) ? e[r].push(t) : e[r] = [e[r], t] : e[r] = t;
   return e;
-}, p = (r) => {
-  let n = "";
-  const e = Object.keys(r);
-  return e && e.length && e.forEach((t, s) => {
-    s === e.length - 1 ? n += `${t}=${r[t]}` : n += `${t}=${r[t]}&`;
-  }), n;
-}, g = (r, n) => {
-  let e = r, t = "";
-  return r.includes("?") && (e = r.split("?")[0], t = "?" + r.split("?")[1]), Object.values(n).forEach((s) => {
-    e += `/${s}`;
-  }), e = e.replace(/\/\//g, "/"), t && (e = e + t), e;
+}, g = (n) => {
+  let s = "";
+  const e = Object.keys(n);
+  return e && e.length && e.forEach((r, t) => {
+    t === e.length - 1 ? s += `${r}=${n[r]}` : s += `${r}=${n[r]}&`;
+  }), s;
+}, p = (n, s) => {
+  const e = new URL(n, location.origin);
+  let { origin: r, pathname: t } = e;
+  t === "/" && (t = ""), s.map((l) => t += `/${l}`);
+  const o = new URL(`${r}${t}`);
+  return e.searchParams.forEach((l, a) => {
+    o.searchParams.append(a, l);
+  }), o.toString();
 };
-function $(r) {
-  const n = /^(https?:\/\/[^/]+)/, e = r.match(n);
+function $(n) {
+  const s = /^(https?:\/\/[^/]+)/, e = n.match(s);
   return e && e.length > 1 ? e[1] : null;
 }
 export {
-  g as addPathParamsToUrl,
+  p as addPathParamsToUrl,
   h as funcUrlDel,
   f as getFullPath,
   $ as getOriginFromUrl,
-  a as getUrlParams,
-  p as objectToUrlparams,
+  i as getUrlParams,
+  g as objectToUrlparams,
   u as urlParamsToObject
 };

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,