@das-fed/utils 6.4.0-hot.45 → 6.4.0-hot.46

package/directive/auth/index.js

@@ -1,55 +1,62 @@
-import { getMenuItemInfo as o, getAuthobj as d } from "@das-fed/utils/common-info";
-import { getEl as u } from "@das-fed/utils/directive/utils";
-const m = (e, s) => {
-  if (!e || !s) return !1;
-  if (typeof s == "string")
-    return !!e.find((r) => r.endsWith(s));
+import { getUrlParams as i, flatTree as P } from "@das-fed/utils/common-tools";
+import { getSubApps as v, getPageAuth as o } from "@das-fed/utils/common-info";
+import { getEl as h } from "@das-fed/utils/directive/utils";
+const A = (e, t) => {
+  if (!e || !t) return !1;
+  if (typeof t == "string")
+    return !!e.find((s) => s.code === t);
   {
-    let t = !1;
-    for (let r of s)
-      if (e.find((i) => i.endsWith(r))) {
-        t = !0;
+    let r = !1;
+    for (let s of t)
+      if (e.find((a) => a.code === s)) {
+        r = !0;
         break;
       }
-    return t;
+    return r;
   }
-}, n = (e) => {
-  const s = (e == null ? void 0 : e.code) ?? "";
-  let t = (e == null ? void 0 : e.menuCode) ?? "", r = !1;
-  if (s) {
-    let f = [];
-    if (!t)
-      f = o().authCodes ?? [];
-    else {
-      const i = d()[t];
-      i && (r = i.some((l) => l.code === s));
+}, m = (e) => {
+  var n;
+  const t = (e == null ? void 0 : e.code) ?? "", r = (e == null ? void 0 : e.path) ?? (location == null ? void 0 : location.pathname) ?? "", s = (e == null ? void 0 : e.applicationCode) ?? i(location.href, "app");
+  let l = "";
+  if (l = e != null && e.menuCode ? e.menuCode : i(location.href, "menu"), !l) {
+    const c = ((n = v().currentSubApp) == null ? void 0 : n.menus) ?? [];
+    if (c && c.length) {
+      const d = P(c).filter((f) => f == null ? void 0 : f.routeUrl);
+      if (d && d.length) {
+        const f = d.find((u) => u != null && u.applicationPath ? r == null ? void 0 : r.includes("/" + u.applicationPath + u.routeUrl) : r == null ? void 0 : r.includes(u.routeUrl));
+        f && (l = (f == null ? void 0 : f.code) ?? "");
+      }
     }
-    r = m(f, s);
+  }
+  let a = !1;
+  if (t) {
+    const c = o(l, s) ?? [];
+    a = A(c, t);
   } else
-    t && (r = !!d()[t]);
-  return r;
-}, c = (e, s) => {
-  s === "hide" ? e.classList.add("is-hide") : (e.setAttribute("disabled", ""), e.classList.add("is-disabled"));
-}, h = (e, s) => {
-  s === "hide" ? e.classList.remove("is-hide") : (e.removeAttribute("disabled"), e.classList.remove("is-disabled"));
-}, A = (e, s) => {
-  let t = (e ? s.value : s) || {};
-  typeof t == "string" && (t = { code: t });
-  const r = (t == null ? void 0 : t.type) ?? "hide", f = n(t);
+    a = !!o(l, s);
+  return a;
+}, g = (e, t) => {
+  t === "hide" ? e.classList.add("is-hide") : (e.setAttribute("disabled", ""), e.classList.add("is-disabled"));
+}, b = (e, t) => {
+  t === "hide" ? e.classList.remove("is-hide") : (e.removeAttribute("disabled"), e.classList.remove("is-disabled"));
+}, U = (e, t) => {
+  let r = (e ? t.value : t) || {};
+  typeof r == "string" && (r = { code: r });
+  const s = (r == null ? void 0 : r.type) ?? "hide", l = m(r);
   if (e)
-    if (!s.oldValue)
-      f || u(e, t).then((i) => {
-        c(i, r);
+    if (!t.oldValue)
+      l || h(e, r).then((a) => {
+        g(a, s);
       });
     else {
-      const i = n(s.oldValue), l = f;
-      if (i === l) return;
-      u(e, t).then((a) => {
-        l ? h(a, r) : c(a, r);
+      const a = m(t.oldValue), n = l;
+      if (a === n) return;
+      h(e, r).then((c) => {
+        n ? b(c, s) : g(c, s);
       });
     }
-  return f;
+  return l;
 };
 export {
-  A as vAuth
+  U as vAuth
 };

package/esm-map.json

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

package/package.json

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