@das-fed/upf-utils 6.4.0-dev.226 → 6.4.0-dev.228

package/directive/auth/es5.js

@@ -2,54 +2,73 @@
 
 var commonInfo = require('@das-fed/upf-utils/common-info/es5');
 var utils = require('@das-fed/upf-utils/directive/utils/es5');
-var d = function d(s, t) {
-    var e = s.btnList,
-      r = s.menuCode;
-    return !e || !t ? false : (Array.isArray(t) ? t : [t]).some(function (a) {
-      return e.includes(r ? "".concat(r, ".").concat(a) : a);
-    });
+var A = function A(r) {
+    var s = /* @__PURE__ */new Set();
+    return r.forEach(function (t) {
+      var n = String(t !== null && t !== void 0 ? t : "").trim();
+      if (!n) return;
+      var i = n.lastIndexOf("."),
+        d = n.lastIndexOf("_"),
+        c = Math.max(i, d),
+        o = c >= 0 ? n.slice(c + 1) : n;
+      o && s.add(o);
+    }), s;
   },
-  m = function m(s) {
-    var _ref, _ref2;
-    var t = (_ref = s == null ? undefined : s.code) !== null && _ref !== void 0 ? _ref : "";
-    var e = (_ref2 = s == null ? undefined : s.menuCode) !== null && _ref2 !== void 0 ? _ref2 : "",
-      r = false;
-    if (t) {
-      var _commonInfo$getMenuIt;
-      var o = [];
-      var a = typeof t == "string" ? t.replace(/-/g, ".") : t.map(function (i) {
-        return i.replace(/-/g, ".");
-      });
-      if (!e) o = (_commonInfo$getMenuIt = commonInfo.getMenuItemInfo().authCodes) !== null && _commonInfo$getMenuIt !== void 0 ? _commonInfo$getMenuIt : [];else {
-        var i = commonInfo.getAuthobj()[e];
-        i && (o = i.map(function (n) {
-          return n.code;
-        }));
-      }
-      r = d({
-        btnList: o,
-        menuCode: e || commonInfo.getMenuItemInfo().routeCode
-      }, a);
-    } else e && (r = !!commonInfo.getAuthobj()[e]);
-    return r;
+  x = function x(r) {
+    var _ref;
+    var s = (_ref = r == null ? undefined : r.code) !== null && _ref !== void 0 ? _ref : "";
+    var t = false;
+    if (!s) return t;
+    var n = Array.isArray(s) ? s : [s],
+      i = commonInfo.getCurrentModulePermissionData("all"),
+      d = Array.isArray(i == null ? undefined : i.idList) ? i.idList : commonInfo.getCurrentModulePermissionData("id"),
+      c = Array.isArray(i == null ? undefined : i.codeList) ? i.codeList : commonInfo.getCurrentModulePermissionData("code"),
+      o = new Set((Array.isArray(d) ? d : []).map(function (a) {
+        return String(a);
+      })),
+      f = new Set((Array.isArray(c) ? c : []).map(function (a) {
+        return String(a);
+      })),
+      l = n.some(function (a) {
+        var e = String(a !== null && a !== void 0 ? a : "").trim();
+        return e && !/^[0-9]{3,}$/.test(e) && !e.includes(".") && !e.includes("_");
+      }) ? A(f) : /* @__PURE__ */new Set(),
+      S = function S(a) {
+        if (!a) return false;
+        var e = String(a || "").trim();
+        if (!e) return false;
+        if (e.includes(".") || e.includes("_")) return f.has(e);
+        var m = {
+          search: "q",
+          add: "a",
+          "delete": "d",
+          edit: "m",
+          view: "v"
+        }[e] || "";
+        return l.has(e) || (m ? l.has(m) : false);
+      };
+    return (o.size > 0 || f.size > 0) && (t = n.some(function (a) {
+      var e = String(a !== null && a !== void 0 ? a : "").trim();
+      return e ? /^[0-9]{3,}$/.test(e) ? o.has(e) : S(e) : false;
+    }), t) ? true : t;
   },
-  f = function f(s, t) {
-    t === "hide" ? s.classList.remove("is-hide") : (s.removeAttribute("disabled"), s.classList.remove("is-disabled"));
+  y = function y(r, s) {
+    s === "hide" ? r.classList.remove("is-hide") : (r.removeAttribute("disabled"), r.classList.remove("is-disabled"));
   },
-  y = function y(s, t) {
-    var _ref3;
-    var e = (s ? t.value : t) || {};
-    typeof e == "string" && (e = {
-      code: e
+  M = function M(r, s) {
+    var _ref2;
+    var t = (r ? s.value : s) || {};
+    typeof t == "string" && (t = {
+      code: t
     });
-    var r = (_ref3 = e == null ? undefined : e.type) !== null && _ref3 !== void 0 ? _ref3 : "hide",
-      o = true;
-    if (s && t.oldValue) {
-      if (m(t.oldValue) === o) return;
-      utils.getEl(s, e).then(function (n) {
-        f(n, r);
+    var n = (_ref2 = t == null ? undefined : t.type) !== null && _ref2 !== void 0 ? _ref2 : "hide",
+      i = true;
+    if (r && s.oldValue) {
+      if (x(s.oldValue) === i) return;
+      utils.getEl(r, t).then(function (o) {
+        y(o, n);
       });
     }
-    return o;
+    return i;
   };
-exports.vAuth = y;
+exports.vAuth = M;

package/directive/auth/index.js

@@ -1,38 +1,47 @@
-import { getMenuItemInfo as l, getAuthobj as u } from "@das-fed/upf-utils/common-info";
-import { getEl as c } from "@das-fed/upf-utils/directive/utils";
-const d = (s, t) => {
-  const { btnList: e, menuCode: r } = s;
-  return !e || !t ? !1 : (Array.isArray(t) ? t : [t]).some((a) => e.includes(r ? `${r}.${a}` : a));
-}, m = (s) => {
-  const t = (s == null ? void 0 : s.code) ?? "";
-  let e = (s == null ? void 0 : s.menuCode) ?? "", r = !1;
-  if (t) {
-    let o = [];
-    const a = typeof t == "string" ? t.replace(/-/g, ".") : t.map((i) => i.replace(/-/g, "."));
-    if (!e)
-      o = l().authCodes ?? [];
-    else {
-      const i = u()[e];
-      i && (o = i.map((n) => n.code));
-    }
-    r = d({ btnList: o, menuCode: e || l().routeCode }, a);
-  } else
-    e && (r = !!u()[e]);
-  return r;
-}, f = (s, t) => {
-  t === "hide" ? s.classList.remove("is-hide") : (s.removeAttribute("disabled"), s.classList.remove("is-disabled"));
-}, y = (s, t) => {
-  let e = (s ? t.value : t) || {};
-  typeof e == "string" && (e = { code: e });
-  const r = (e == null ? void 0 : e.type) ?? "hide", o = !0;
-  if (s && t.oldValue) {
-    if (m(t.oldValue) === o) return;
-    c(s, e).then((n) => {
-      f(n, r);
+import { getCurrentModulePermissionData as u } from "@das-fed/upf-utils/common-info";
+import { getEl as h } from "@das-fed/upf-utils/directive/utils";
+const A = (r) => {
+  const s = /* @__PURE__ */ new Set();
+  return r.forEach((t) => {
+    const n = String(t ?? "").trim();
+    if (!n) return;
+    const i = n.lastIndexOf("."), d = n.lastIndexOf("_"), c = Math.max(i, d), o = c >= 0 ? n.slice(c + 1) : n;
+    o && s.add(o);
+  }), s;
+}, x = (r) => {
+  const s = (r == null ? void 0 : r.code) ?? "";
+  let t = !1;
+  if (!s)
+    return t;
+  const n = Array.isArray(s) ? s : [s], i = u("all"), d = Array.isArray(i == null ? void 0 : i.idList) ? i.idList : u("id"), c = Array.isArray(i == null ? void 0 : i.codeList) ? i.codeList : u("code"), o = new Set((Array.isArray(d) ? d : []).map((a) => String(a))), f = new Set((Array.isArray(c) ? c : []).map((a) => String(a))), l = n.some((a) => {
+    const e = String(a ?? "").trim();
+    return e && !/^[0-9]{3,}$/.test(e) && !e.includes(".") && !e.includes("_");
+  }) ? A(f) : /* @__PURE__ */ new Set(), S = (a) => {
+    if (!a) return !1;
+    const e = String(a || "").trim();
+    if (!e) return !1;
+    if (e.includes(".") || e.includes("_")) return f.has(e);
+    const m = { search: "q", add: "a", delete: "d", edit: "m", view: "v" }[e] || "";
+    return l.has(e) || (m ? l.has(m) : !1);
+  };
+  return (o.size > 0 || f.size > 0) && (t = n.some((a) => {
+    const e = String(a ?? "").trim();
+    return e ? /^[0-9]{3,}$/.test(e) ? o.has(e) : S(e) : !1;
+  }), t) ? !0 : t;
+}, y = (r, s) => {
+  s === "hide" ? r.classList.remove("is-hide") : (r.removeAttribute("disabled"), r.classList.remove("is-disabled"));
+}, M = (r, s) => {
+  let t = (r ? s.value : s) || {};
+  typeof t == "string" && (t = { code: t });
+  const n = (t == null ? void 0 : t.type) ?? "hide", i = !0;
+  if (r && s.oldValue) {
+    if (x(s.oldValue) === i) return;
+    h(r, t).then((o) => {
+      y(o, n);
     });
   }
-  return o;
+  return i;
 };
 export {
-  y as vAuth
+  M as vAuth
 };

package/esm-map.json

@@ -150,5 +150,11 @@
   "getAuthobj": "/common-info/index",
   "getMenuListnfo": "/common-info/index",
   "setI18nBridge": "/i18n-bridge/index",
-  "getI18nBridge": "/i18n-bridge/index"
+  "getI18nBridge": "/i18n-bridge/index",
+  "groupPermissionListByModuleAndCode": "/common-info/index",
+  "getGroupedCurrentUserPermissionList": "/common-info/index",
+  "getCurrentModulePermissionData": "/common-info/getPermissionMethod/index",
+  "getCurrentUserPermissionsList": "/common-info/getPermissionMethod/index",
+  "getCurrentUserMenuPermissionsList": "/common-info/getPermissionMethod/index",
+  "handleUnauthorized": "/create-api-service/index"
 }

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

@@ -6,27 +6,23 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var commonTools = require('@das-fed/upf-utils/common-tools/es5');
 var nextTiken = require('@das-fed/upf-utils/nextTiken/es5');
-var createApiService = require('@das-fed/upf-utils/create-api-service/es5');
-var p = "v1",
-  l = createApiService.createService("/api/admin/basic-application/log/".concat(p));
-l.post("/dependency/rights/list");
-var w = function w() {
+var l = function l() {
   return {
     getApplication: function () {
       var _getApplication = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(t) {
-        var r;
+        var i;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
               _context.n = 1;
               return nextTiken.projectNextTick();
             case 1:
-              r = JSON.parse(sessionStorage.getItem("menuList") || "[]").filter(function (e) {
+              i = JSON.parse(sessionStorage.getItem("menuList") || "[]").filter(function (e) {
                 return e.type === "application";
               });
-              return _context.a(2, t ? r.find(function (e) {
+              return _context.a(2, t ? i.find(function (e) {
                 return e.appId === t;
-              }) : r);
+              }) : i);
           }
         }, _callee);
       }));
@@ -37,15 +33,15 @@ var w = function w() {
     }(),
     getMenu: function () {
       var _getMenu = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(t, n) {
-        var r, e, a;
+        var i, e, a;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
               _context2.n = 1;
               return nextTiken.projectNextTick();
             case 1:
-              r = JSON.parse(sessionStorage.getItem("menuList") || "[]"), e = commonTools.flatTree(r).filter(function (i) {
-                return i.type === "menu";
+              i = JSON.parse(sessionStorage.getItem("menuList") || "[]"), e = commonTools.flatTree(i).filter(function (r) {
+                return r.type === "menu";
               });
               if (!(!t && !n)) {
                 _context2.n = 2;
@@ -53,10 +49,10 @@ var w = function w() {
               }
               return _context2.a(2, e);
             case 2:
-              return _context2.a(2, (t ? a = e.find(function (i) {
-                return i.routeCode === t || i.originalCode === t;
-              }) : n && (a = e.find(function (i) {
-                return i.routeUrl === n;
+              return _context2.a(2, (t ? a = e.find(function (r) {
+                return r.routeCode === t || r.originalCode === t;
+              }) : n && (a = e.find(function (r) {
+                return r.routeUrl === n;
               })), a));
           }
         }, _callee2);
@@ -68,4 +64,4 @@ var w = function w() {
     }()
   };
 };
-exports.useGetAuth = w;
+exports.useGetAuth = l;

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

@@ -1,22 +1,19 @@
-import { flatTree as s } from "@das-fed/upf-utils/common-tools";
-import { projectNextTick as o } from "@das-fed/upf-utils/nextTiken";
-import { createService as c } from "@das-fed/upf-utils/create-api-service";
-const p = "v1", l = c(`/api/admin/basic-application/log/${p}`);
-l.post("/dependency/rights/list");
-const w = () => ({
+import { flatTree as o } from "@das-fed/upf-utils/common-tools";
+import { projectNextTick as s } from "@das-fed/upf-utils/nextTiken";
+const l = () => ({
   getApplication: async (t) => {
-    await o();
-    const r = JSON.parse(sessionStorage.getItem("menuList") || "[]").filter((e) => e.type === "application");
-    return t ? r.find((e) => e.appId === t) : r;
+    await s();
+    const i = JSON.parse(sessionStorage.getItem("menuList") || "[]").filter((e) => e.type === "application");
+    return t ? i.find((e) => e.appId === t) : i;
   },
   getMenu: async (t, n) => {
-    await o();
-    const r = JSON.parse(sessionStorage.getItem("menuList") || "[]"), e = s(r).filter((i) => i.type === "menu");
+    await s();
+    const i = JSON.parse(sessionStorage.getItem("menuList") || "[]"), e = o(i).filter((r) => r.type === "menu");
     if (!t && !n) return e;
     let a;
-    return t ? a = e.find((i) => i.routeCode === t || i.originalCode === t) : n && (a = e.find((i) => i.routeUrl === n)), a;
+    return t ? a = e.find((r) => r.routeCode === t || r.originalCode === t) : n && (a = e.find((r) => r.routeUrl === n)), a;
   }
 });
 export {
-  w as useGetAuth
+  l as useGetAuth
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/upf-utils",
-  "version": "6.4.0-dev.226",
+  "version": "6.4.0-dev.228",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -21,8 +21,8 @@
   },
   "devDependencies": {
     "@babel/preset-env": "7.26.0",
-    "@das-fed/upf-cli": "6.4.0-dev.226",
-    "@das-fed/upf-web": "6.4.0-dev.226",
+    "@das-fed/upf-cli": "6.4.0-dev.228",
+    "@das-fed/upf-web": "6.4.0-dev.228",
     "@rollup/plugin-babel": "6.0.4",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",

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

@@ -1 +0,0 @@
-export declare const getRightsListApi: any;