@das-fed/utils 7.0.5-test.1 → 7.0.5-test.2

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

@@ -38,6 +38,13 @@ export declare const objectToUrlparams: (params: any) => string;
  * @returns
  */
 export declare const addPathParamsToUrl: (url: string, pathParams: string[]) => any;
+/**
+ * 给url拼接query参数
+ * @param url 路径
+ * @param params 参数，object
+ * @returns
+ */
+export declare function appendQueryParams(url: string, params: Record<string, any>): any;
 /**
  * 从URL中获取origin
  * @param url url

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

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

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

@@ -4,7 +4,7 @@ const f = (t, r) => {
     if (r[e] === void 0) return !1;
     if (typeof r[e] == "function" || typeof t[e] == "function") throw new Error("type error");
     if (typeof r[e] != typeof t[e]) return !1;
-    if (typeof t[e] == "object") return f(t[e], r[e]);
+    if (t[e] !== null && typeof t[e] == "object") return f(t[e], r[e]);
     if (t[e] !== r[e]) return !1;
   }
   return !0;

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
 };