@das-fed/utils 7.0.2-beta.4 → 7.0.2-beta.6

package/esm-map.json

@@ -142,5 +142,6 @@
   "analyApi": "/api-services/modules/iot/index",
   "calcTextWidth": "/common-tools/calc-text-width/index",
   "getFileExtension": "/common-tools/get-file-extension/index",
-  "getLanguages": "/common-info/index"
+  "getLanguages": "/common-info/index",
+  "appendQueryParams": "/common-tools/get-url-params/index"
 }

package/hooks/use-get-auth/index.d.ts

@@ -1,6 +1,6 @@
 export declare const useGetAuth: () => {
     getApplication: (code?: string, appName?: "superadmin" | "enterpriseadmin") => unknown;
-    getMenu: (code: string, menuCode?: string, path?: string, appName?: "superadmin" | "enterpriseadmin") => unknown;
+    getMenu: (code: string, menuCode?: string | null, path?: string | null, appName?: "superadmin" | "enterpriseadmin", ignorePath?: boolean) => unknown;
     getAuth: (options: {
         applicationCode: string;
         menuCode: string;

package/hooks/use-get-auth/index.js

@@ -1,53 +1,53 @@
-import { flatTree as w } from "@das-fed/utils/common-tools";
-import { projectNextTick as A } from "@das-fed/utils/nextTiken";
-import { vAuth as M } from "@das-fed/utils/directive/auth";
-import { portal as T, superadminPortal as y, enterpriseright as U } from "@das-fed/utils/api-services/modules";
-const v = T.get("/appcategory"), B = y.get("/appcategory"), C = U.get("/permissionset/user-portal-menu"), L = y.get("/user-menu"), k = () => {
+import { flatTree as M } from "@das-fed/utils/common-tools";
+import { projectNextTick as y } from "@das-fed/utils/nextTiken";
+import { vAuth as T } from "@das-fed/utils/directive/auth";
+import { portal as U, superadminPortal as w, enterpriseright as v } from "@das-fed/utils/api-services/modules";
+const B = U.get("/appcategory"), C = w.get("/appcategory"), L = v.get("/permissionset/user-portal-menu"), P = w.get("/user-menu"), G = () => {
   const d = async (r, i = "enterpriseadmin") => {
     let t = null, s = {};
-    await A(), i === "superadmin" ? t = B().run : (s = { userType: 1 }, t = v().run);
-    const [a, l] = await t(s);
-    if (a || !l || !l.length) return null;
-    const f = l.map((o) => o.apps).flat();
-    return r ? f.find((o) => o.code === r) : f;
-  }, g = async (r, i, t, s = "enterpriseadmin") => {
-    var c;
-    await A();
-    let a = null, l = {
+    await y(), i === "superadmin" ? t = C().run : (s = { userType: 1 }, t = B().run);
+    const [o, l] = await t(s);
+    if (o || !l || !l.length) return null;
+    const p = l.map((e) => e.apps).flat();
+    return r ? p.find((e) => e.code === r) : p;
+  }, g = async (r, i, t, s = "enterpriseadmin", o = !1) => {
+    var h;
+    await y();
+    let l = null, p = {
       code: r,
       showBtn: !0
     };
-    s === "superadmin" ? a = L().run : (l.userType = 1, a = C().run);
-    const [f, e] = await a(l);
-    if (f || !e || !e.length)
+    s === "superadmin" ? l = P().run : (p.userType = 1, l = L().run);
+    const [a, e] = await l(p);
+    if (a || !e || !e.length)
       return i || t ? void 0 : [];
     if (!i && !t) return e;
-    const o = e != null && e.length ? e.filter((n) => n.routeUrl) : [], m = e != null && e.length ? e.filter((n) => !n.routeUrl && n.children).map((n) => n.children).flat() : [], p = [...o, ...m];
-    let u;
+    const m = e != null && e.length ? o ? e : e.filter((n) => n.routeUrl) : [], f = e != null && e.length ? e.filter((n) => !n.routeUrl && n.children).map((n) => n.children).flat() : [], u = [...m, ...f];
+    let c;
     if (i)
-      u = p.find((n) => n.code === i || n.originalCode === i);
+      c = u.find((n) => n.code === i || n.originalCode === i);
     else if (t) {
-      const n = t.replace(((c = p[0]) == null ? void 0 : c.applicationPath) ?? "", "").replace(/\/\//g, "/");
-      u = p.find((h) => h.routeUrl && h.routeUrl === n);
+      const n = t.replace(((h = u[0]) == null ? void 0 : h.applicationPath) ?? "", "").replace(/\/\//g, "/");
+      c = u.find((A) => A.routeUrl && A.routeUrl === n);
     }
-    return u;
+    return c;
   };
   return {
     getApplication: d,
     getMenu: g,
     getAuth: async (r, i = "enterpriseadmin") => {
-      var p;
-      const t = (r == null ? void 0 : r.applicationCode) ?? "", s = (r == null ? void 0 : r.menuCode) ?? "", a = (r == null ? void 0 : r.code) ?? "";
-      if (JSON.parse(sessionStorage.getItem("permission-btn") || "{}")[s]) return M(null, { applicationCode: t, menuCode: s, code: a });
+      var f;
+      const t = (r == null ? void 0 : r.applicationCode) ?? "", s = (r == null ? void 0 : r.menuCode) ?? "", o = (r == null ? void 0 : r.code) ?? "";
+      if (JSON.parse(sessionStorage.getItem("permission-btn") || "{}")[s]) return T(null, { applicationCode: t, menuCode: s, code: o });
       if (!await d(t, i)) return !1;
-      const e = await g(t, s, i);
-      return !e || !(e != null && e.children) || !((p = e.children) != null && p.length) ? !1 : !!w(e.children).find((u) => {
+      const a = await g(t, s, i);
+      return !a || !(a != null && a.children) || !((f = a.children) != null && f.length) ? !1 : !!M(a.children).find((u) => {
         let c = (u == null ? void 0 : u.originalCode) ?? u.code;
-        return c.includes(s + ".") && (c = c.replace(s + ".", "").replaceAll(".", "-")), c === a;
+        return c.includes(s + ".") && (c = c.replace(s + ".", "").replaceAll(".", "-")), c === o;
       });
     }
   };
 };
 export {
-  k as useGetAuth
+  G as useGetAuth
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.2-beta.4",
+  "version": "7.0.2-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.2-beta.4",
+    "@das-fed/utils": "7.0.2-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.2-beta.4",
-    "@das-fed/web": "7.0.2-beta.4",
+    "@das-fed/cli": "7.0.2-beta.6",
+    "@das-fed/web": "7.0.2-beta.6",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/process-engine-info/index.js

@@ -1,15 +1,16 @@
-const s = (e) => {
-  sessionStorage.setItem("hotentToken", e.accessToken || ""), sessionStorage.setItem("currentUser", JSON.stringify({ token: e.accessToken || "" }));
-}, o = () => {
+const o = (e) => {
+  var s;
+  (s = window.webConfig) != null && s.disableSaveToken || (sessionStorage.setItem("hotentToken", e.accessToken || ""), sessionStorage.setItem("currentUser", JSON.stringify({ token: e.accessToken || "" })));
+}, n = () => {
   sessionStorage.removeItem("hotentToken"), sessionStorage.removeItem("currentUser");
 }, t = (e) => {
   sessionStorage.setItem("project", e);
-}, n = () => {
+}, r = () => {
   sessionStorage.removeItem("project");
 };
 export {
-  n as removeProcessEngineProject,
-  o as removeProcessEngineToken,
+  r as removeProcessEngineProject,
+  n as removeProcessEngineToken,
   t as setProcessEngineProject,
-  s as setProcessEngineToken
+  o as setProcessEngineToken
 };

package/style/index.js

@@ -1,5 +1,5 @@
 /**
-* @vue/shared v3.5.13
+* @vue/shared v3.5.18
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/

package/token-tools/index.js

@@ -1,11 +1,83 @@
-const o = "accessToken", r = "accessTokenExpiredAt", c = "refreshToken", s = "redirectUri", a = () => localStorage.getItem(o) ?? sessionStorage.getItem(o) ?? "", n = (e) => localStorage.getItem(e) ?? sessionStorage.getItem(e) ?? "", l = (e, t = {}) => {
-  localStorage.setItem(o, e), localStorage.setItem(r, t.accessTokenExpiredAt ?? "0"), localStorage.setItem(c, t.refreshToken ?? ""), t.redirectUri && localStorage.setItem(s, t.redirectUri);
-}, g = () => {
-  localStorage.removeItem(o), localStorage.removeItem(r), localStorage.removeItem(c), localStorage.removeItem(s);
+/*! js-cookie v3.0.5 | MIT */
+function l(e) {
+  for (var t = 1; t < arguments.length; t++) {
+    var n = arguments[t];
+    for (var g in n)
+      e[g] = n[g];
+  }
+  return e;
+}
+var k = {
+  read: function(e) {
+    return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
+  },
+  write: function(e) {
+    return encodeURIComponent(e).replace(
+      /%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g,
+      decodeURIComponent
+    );
+  }
+};
+function d(e, t) {
+  function n(r, i, o) {
+    if (!(typeof document > "u")) {
+      o = l({}, t, o), typeof o.expires == "number" && (o.expires = new Date(Date.now() + o.expires * 864e5)), o.expires && (o.expires = o.expires.toUTCString()), r = encodeURIComponent(r).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
+      var c = "";
+      for (var s in o)
+        o[s] && (c += "; " + s, o[s] !== !0 && (c += "=" + o[s].split(";")[0]));
+      return document.cookie = r + "=" + e.write(i, r) + c;
+    }
+  }
+  function g(r) {
+    if (!(typeof document > "u" || arguments.length && !r)) {
+      for (var i = document.cookie ? document.cookie.split("; ") : [], o = {}, c = 0; c < i.length; c++) {
+        var s = i[c].split("="), I = s.slice(1).join("=");
+        try {
+          var f = decodeURIComponent(s[0]);
+          if (o[f] = e.read(I, f), r === f)
+            break;
+        } catch {
+        }
+      }
+      return r ? o[r] : o;
+    }
+  }
+  return Object.create(
+    {
+      set: n,
+      get: g,
+      remove: function(r, i) {
+        n(
+          r,
+          "",
+          l({}, i, {
+            expires: -1
+          })
+        );
+      },
+      withAttributes: function(r) {
+        return d(this.converter, l({}, this.attributes, r));
+      },
+      withConverter: function(r) {
+        return d(l({}, this.converter, r), this.attributes);
+      }
+    },
+    {
+      attributes: { value: Object.freeze(t) },
+      converter: { value: Object.freeze(e) }
+    }
+  );
+}
+var p = d(k, { path: "/" });
+const a = "accessToken", m = "accessTokenExpiredAt", v = "refreshToken", u = "redirectUri", S = "csrf-token", h = () => localStorage.getItem(a) ?? p.get(a) ?? sessionStorage.getItem(a) ?? "", C = (e) => localStorage.getItem(e) ?? p.get(e) ?? sessionStorage.getItem(e) ?? "", x = (e, t = {}) => {
+  var n;
+  (n = window.webConfig) != null && n.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(m, t.accessTokenExpiredAt ?? "0"), localStorage.setItem(v, t.refreshToken ?? ""), t.redirectUri && localStorage.setItem(u, t.redirectUri));
+}, U = () => {
+  localStorage.removeItem(a), localStorage.removeItem(m), localStorage.removeItem(v), localStorage.removeItem(u), localStorage.removeItem(S);
 };
 export {
-  a as getAccessToken,
-  n as getAccessTokenInfo,
-  g as removeAccessToken,
-  l as setAccessToken
+  h as getAccessToken,
+  C as getAccessTokenInfo,
+  U as removeAccessToken,
+  x as setAccessToken
 };

package/vue/hooks/use-model-value/index.d.ts

@@ -1,5 +1,9 @@
 import { Ref } from 'vue';
 
 /** 简化组件内使用modelValue时的watch过程 */
-declare const useModelValue: (props: any, propKey: string) => Ref;
+declare const useModelValue: (
+/** 组件的props */
+props: any, 
+/** 组件props需要使用modelValue的key */
+propKey: string) => Ref;
 export { useModelValue };