@das-fed/upf-utils 6.4.0-dev.185 → 6.4.0-dev.187

package/common-tools/handle-data/index.js

@@ -1,130 +1,149 @@
-import { getConfig as I } from "@das-fed/upf-utils/config";
-const m = /* @__PURE__ */ new Map(), E = /* @__PURE__ */ new Map(), M = 3e5, F = (c) => c === null || typeof c > "u" || c === "", O = (c) => {
-  var t;
-  return (((t = I()) == null ? void 0 : t.systemLangList) || ["zh-CN", "en-US", "zh-MO"]).includes(c);
-}, S = async (c) => {
-  const U = c || {};
+import { getConfig as _ } from "@das-fed/upf-utils/config";
+const M = (f) => f === null || typeof f > "u" || f === "", z = (f) => {
+  var n;
+  return (((n = _()) == null ? void 0 : n.systemLangList) || ["zh-CN", "en-US", "zh-MO"]).includes(f);
+}, A = async (f) => {
+  const x = f || {};
   let {
-    currentLang: t = "zh-CN",
-    baseUrl: o = "/",
-    appName: g = "jc",
-    isPullFrontEnd: _ = !0,
+    currentLang: n = "zh-CN",
+    baseUrl: c = "/",
+    appName: h = "jc",
+    isPullFrontEnd: L = !0,
     isPullBack: N = !1,
-    isDasUI: x = !1,
-    fallbackBaseUrl: r = ""
-  } = U;
-  (typeof t != "string" || !t) && (t = "zh-CN");
-  let f = [];
-  Array.isArray(g) ? (f = g.filter((a) => typeof a == "string" && a), f.length === 0 && (f = ["jc"])) : typeof g == "string" && g ? f = [g] : f = ["jc"], typeof o != "string" && (o = "/"), o || (o = "/"), o.endsWith("/") || (o = o + "/"), typeof r != "string" && (r = ""), r && !r.endsWith("/") && (r = r + "/");
-  const d = {
+    isDasUI: O = !1,
+    fallbackBaseUrl: a = ""
+  } = x;
+  (typeof n != "string" || !n) && (n = "zh-CN");
+  let l = [];
+  Array.isArray(h) ? (l = h.filter((r) => typeof r == "string" && r), l.length === 0 && (l = ["jc"])) : typeof h == "string" && h ? l = [h] : l = ["jc"], typeof c != "string" && (c = "/"), c || (c = "/"), c.endsWith("/") || (c = c + "/"), typeof a != "string" && (a = ""), a && !a.endsWith("/") && (a = a + "/");
+  const y = {
     frontEnd: null,
     // 统一格式：{ appName1: data1, appName2: data2, ... }
     dasUiEnd: null,
     backMsg: null
     // 统一格式：{ appName1: data1, appName2: data2, ... }
   };
-  let w = !1;
-  const k = async (a, s, h = "zh-CN", $ = "资源") => {
-    const u = async (l) => {
+  let m = !1;
+  const j = async (r, s, $ = "zh-CN", w = "资源") => {
+    const u = async (i) => {
       try {
         if (typeof window < "u" && typeof window.fetch == "function") {
-          const n = await window.fetch(l, { cache: "no-cache" });
-          return !n || !n.ok ? null : await n.text();
+          const o = await window.fetch(i, { cache: "no-cache" });
+          return !o || !o.ok ? null : await o.text();
         } else
-          return await new Promise((n) => {
+          return await new Promise((o) => {
             try {
-              const e = new XMLHttpRequest();
-              e.open("GET", l, !0), e.onreadystatechange = function() {
-                e.readyState === 4 && n(e.status >= 200 && e.status < 300 ? e.responseText : null);
-              }, e.onerror = function() {
-                n(null);
-              }, e.send();
+              const t = new XMLHttpRequest();
+              t.open("GET", i, !0), t.onreadystatechange = function() {
+                t.readyState === 4 && o(t.status >= 200 && t.status < 300 ? t.responseText : null);
+              }, t.onerror = function() {
+                o(null);
+              }, t.send();
             } catch {
-              n(null);
+              o(null);
             }
           });
       } catch {
         return null;
       }
-    }, C = (l) => {
-      const n = (l || "").replace(/^\uFEFF/, "");
+    }, F = (i) => {
+      if (!i || typeof i != "string")
+        return null;
+      const t = i.replace(/^\uFEFF/, "").trim();
+      if (t.startsWith("{"))
+        try {
+          const e = JSON.parse(t);
+          if (e && typeof e == "object")
+            return e;
+        } catch {
+        }
+      const b = t.match(/export\s+default\s*/);
+      if (!b || b.index === void 0)
+        return null;
       try {
-        const e = n.trim();
-        if (/^export\s+default\s*\{[\s\S]*\}\s*;?$/m.test(e)) {
-          let i = e.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|\n)\s*\/\/.*(?=\n|$)/g, "$1");
-          const p = i.indexOf("{"), y = i.lastIndexOf("}");
-          if (p !== -1 && y !== -1 && y > p)
-            return i = i.slice(p, y + 1), i = i.replace(/,\s*([}\]])/g, "$1"), JSON.parse(i);
+        let e = t.substring(b.index);
+        if (e = e.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|\n)\s*\/\/.*(?=\n|$)/g, "$1").trim(), e = e.replace(/^\s*export\s+default\s*/, "").replace(/;?\s*$/, "").trim(), !e)
+          return null;
+        try {
+          const d = new Function(`return ${e}`)();
+          if (d && typeof d == "object")
+            return d;
+        } catch {
+        }
+        try {
+          const g = e.indexOf("{"), d = e.lastIndexOf("}");
+          if (g === -1 || d === -1 || d <= g)
+            return null;
+          let p = e.slice(g, d + 1);
+          p = p.replace(
+            /([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g,
+            '$1"$2":'
+          ), p = p.replace(/'([^'\\]*(\\.[^'\\]*)*)'/g, '"$1"'), p = p.replace(/,\s*([}\]])/g, "$1");
+          const E = JSON.parse(p);
+          if (E && typeof E == "object")
+            return E;
+        } catch {
         }
+        return null;
       } catch {
         return null;
       }
-    }, b = async (l) => {
-      if (!l) return null;
-      const n = l, e = Date.now(), i = E.get(n);
-      if (i && e - i.t <= M)
-        return i.ok ? i.value ?? null : null;
-      if (m.has(n)) return m.get(n);
-      const p = (async () => {
-        const y = await u(n);
-        if (!y)
-          return E.set(n, { ok: !1, value: null, t: e }), null;
-        const L = C(y);
-        return E.set(n, { ok: !0, value: L, t: Date.now() }), L ?? null;
-      })();
-      m.set(n, p);
-      try {
-        return await p;
-      } finally {
-        m.delete(n);
-      }
-    }, j = await b(a);
-    if (j) return j;
-    if (s && O(h)) {
-      const l = await b(s);
-      if (l) return l;
+    }, U = async (i) => {
+      if (!i) return null;
+      const o = await u(i);
+      if (!o)
+        return null;
+      const t = F(o);
+      return t !== null && typeof t == "object" ? t : null;
+    }, k = await U(r);
+    if (k)
+      return k;
+    if (s && z($)) {
+      const i = await U(s);
+      if (i)
+        return i;
     }
     return null;
   };
-  if (_) {
-    const a = {};
-    for (const s of f) {
-      const h = `${o}front-end/i18n/front-end-page/${s}_${t}.js`, $ = r ? `${r}front-end/i18n/front-end-page/${s}_${t}.js` : void 0, u = await k(
-        h,
+  if (L) {
+    const r = {};
+    for (const s of l) {
+      const $ = `${c}front-end/i18n/front-end-page/${s}_${n}.js`, w = a ? `${a}front-end/i18n/front-end-page/${s}_${n}.js` : void 0, u = await j(
         $,
-        t,
+        w,
+        n,
         `前端业务语言资源(${s})`
       );
-      u && (a[s] = u, w = !0);
+      u && (r[s] = u, m = !0);
     }
-    Object.keys(a).length > 0 && (d.frontEnd = a);
+    Object.keys(r).length > 0 && (y.frontEnd = r);
   }
   if (N) {
-    const a = {};
-    for (const s of f) {
-      const h = `${o}front-end/i18n/return-msg/${s}_${t}.js`, $ = r ? `${r}front-end/i18n/return-msg/${s}_${t}.js` : void 0, u = await k(
-        h,
+    const r = {};
+    for (const s of l) {
+      const $ = `${c}front-end/i18n/return-msg/${s}_${n}.js`, w = a ? `${a}front-end/i18n/return-msg/${s}_${n}.js` : void 0, u = await j(
         $,
-        t,
+        w,
+        n,
         `后端语言资源(${s})`
       );
-      u && (a[s] = u, w = !0);
+      u && (r[s] = u, m = !0);
     }
-    Object.keys(a).length > 0 && (d.backMsg = a);
+    Object.keys(r).length > 0 && (y.backMsg = r);
   }
-  if (x) {
-    const a = `${o}front-end/i18n/front-end-page/dasui_${t}.js`, s = r ? `${r}front-end/i18n/front-end-page/dasui_${t}.js` : void 0;
-    d.dasUiEnd = await k(
-      a,
+  if (O) {
+    const r = `${c}front-end/i18n/front-end-page/dasui_${n}.js`, s = a ? `${a}front-end/i18n/front-end-page/dasui_${n}.js` : void 0;
+    y.dasUiEnd = await j(
+      r,
       s,
-      t,
+      n,
       "UI组件库语言资源"
-    ), d.dasUiEnd && (w = !0);
+    ), y.dasUiEnd && (m = !0);
   }
-  return d;
+  return y;
 };
 export {
-  S as handleI18nData,
-  O as isCurrentLangInSysLang,
-  F as isEmpty
+  A as handleI18nData,
+  z as isCurrentLangInSysLang,
+  M as isEmpty
 };

package/directive/auth/es5.js

@@ -3,25 +3,24 @@
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var commonTools = require('@das-fed/upf-utils/common-tools/es5');
 var commonInfo = require('@das-fed/upf-utils/common-info/es5');
 var utils = require('@das-fed/upf-utils/directive/utils/es5');
-var A = function A(e, t) {
-    if (!e || !t) return false;
-    if (typeof t == "string") return !!e.find(function (s) {
-      return s.code === t;
+var m = function m(e, s) {
+    if (!e || !s) return false;
+    if (typeof s == "string") return !!e.find(function (r) {
+      return r.endsWith(s);
     });
     {
-      var r = false;
-      var _iterator = _createForOfIteratorHelper(t),
+      var t = false;
+      var _iterator = _createForOfIteratorHelper(s),
         _step;
       try {
         var _loop = function _loop() {
-          var s = _step.value;
-          if (e.find(function (a) {
-            return a.code === s;
+          var r = _step.value;
+          if (e.find(function (i) {
+            return i.endsWith(r);
           })) {
-            r = true;
+            t = true;
             return 1; // break
           }
         };
@@ -33,64 +32,51 @@ var A = function A(e, t) {
       } finally {
         _iterator.f();
       }
-      return r;
+      return t;
     }
   },
-  m = function m(e) {
-    var _ref, _ref2, _ref3, _ref4;
-    var n;
-    var t = (_ref = e == null ? undefined : e.code) !== null && _ref !== void 0 ? _ref : "",
-      r = (_ref2 = (_ref3 = e == null ? undefined : e.path) !== null && _ref3 !== void 0 ? _ref3 : location == null ? undefined : location.pathname) !== null && _ref2 !== void 0 ? _ref2 : "",
-      s = (_ref4 = e == null ? undefined : e.applicationCode) !== null && _ref4 !== void 0 ? _ref4 : commonTools.getUrlParams(location.href, "app");
-    var l = "";
-    if (l = e != null && e.menuCode ? e.menuCode : commonTools.getUrlParams(location.href, "menu"), !l) {
-      var _ref5;
-      var c = (_ref5 = (n = commonInfo.getSubApps().currentSubApp) == null ? undefined : n.menus) !== null && _ref5 !== void 0 ? _ref5 : [];
-      if (c && c.length) {
-        var d = commonTools.flatTree(c).filter(function (f) {
-          return f == null ? undefined : f.routeUrl;
-        });
-        if (d && d.length) {
-          var _ref6;
-          var f = d.find(function (u) {
-            return u != null && u.applicationPath ? r == null ? undefined : r.includes("/" + u.applicationPath + u.routeUrl) : r == null ? undefined : r.includes(u.routeUrl);
-          });
-          f && (l = (_ref6 = f == null ? undefined : f.code) !== null && _ref6 !== void 0 ? _ref6 : "");
-        }
+  n = function n(e) {
+    var _ref, _ref2;
+    var s = (_ref = e == null ? undefined : e.code) !== null && _ref !== void 0 ? _ref : "";
+    var t = (_ref2 = e == null ? undefined : e.menuCode) !== null && _ref2 !== void 0 ? _ref2 : "",
+      r = false;
+    if (s) {
+      var _commonInfo$getMenuIt;
+      var f = [];
+      if (!t) f = (_commonInfo$getMenuIt = commonInfo.getMenuItemInfo().authCodes) !== null && _commonInfo$getMenuIt !== void 0 ? _commonInfo$getMenuIt : [];else {
+        var i = commonInfo.getAuthobj()[t];
+        i && (r = i.some(function (l) {
+          return l.code === s;
+        }));
       }
-    }
-    var a = false;
-    if (t) {
-      var _commonInfo$getPageAu;
-      var _c = (_commonInfo$getPageAu = commonInfo.getPageAuth(l, s)) !== null && _commonInfo$getPageAu !== void 0 ? _commonInfo$getPageAu : [];
-      a = A(_c, t);
-    } else a = !!commonInfo.getPageAuth(l, s);
-    return a;
+      r = m(f, s);
+    } else t && (r = !!commonInfo.getAuthobj()[t]);
+    return r;
   },
-  g = function g(e, t) {
-    t === "hide" ? e.classList.add("is-hide") : (e.setAttribute("disabled", ""), e.classList.add("is-disabled"));
+  c = function c(e, s) {
+    s === "hide" ? e.classList.add("is-hide") : (e.setAttribute("disabled", ""), e.classList.add("is-disabled"));
   },
-  b = function b(e, t) {
-    t === "hide" ? e.classList.remove("is-hide") : (e.removeAttribute("disabled"), e.classList.remove("is-disabled"));
+  h = function h(e, s) {
+    s === "hide" ? e.classList.remove("is-hide") : (e.removeAttribute("disabled"), e.classList.remove("is-disabled"));
   },
-  U = function U(e, t) {
-    var _ref7;
-    var r = (e ? t.value : t) || {};
-    typeof r == "string" && (r = {
-      code: r
+  A = function A(e, s) {
+    var _ref3;
+    var t = (e ? s.value : s) || {};
+    typeof t == "string" && (t = {
+      code: t
     });
-    var s = (_ref7 = r == null ? undefined : r.type) !== null && _ref7 !== void 0 ? _ref7 : "hide",
-      l = m(r);
-    if (e) if (!t.oldValue) l || utils.getEl(e, r).then(function (a) {
-      g(a, s);
+    var r = (_ref3 = t == null ? undefined : t.type) !== null && _ref3 !== void 0 ? _ref3 : "hide",
+      f = n(t);
+    if (e) if (!s.oldValue) f || utils.getEl(e, t).then(function (i) {
+      c(i, r);
     });else {
-      var a = m(t.oldValue),
-        n = l;
-      if (a === n) return;
-      utils.getEl(e, r).then(function (c) {
-        n ? b(c, s) : g(c, s);
+      var i = n(s.oldValue),
+        l = f;
+      if (i === l) return;
+      utils.getEl(e, t).then(function (a) {
+        l ? h(a, r) : c(a, r);
       });
     }
-    return l;
+    return f;
   };
-exports.vAuth = U;
+exports.vAuth = A;

package/directive/auth/index.js

@@ -1,62 +1,55 @@
-import { getUrlParams as i, flatTree as P } from "@das-fed/upf-utils/common-tools";
-import { getSubApps as v, getPageAuth as o } from "@das-fed/upf-utils/common-info";
-import { getEl as h } from "@das-fed/upf-utils/directive/utils";
-const A = (e, t) => {
-  if (!e || !t) return !1;
-  if (typeof t == "string")
-    return !!e.find((s) => s.code === t);
+import { getMenuItemInfo as o, getAuthobj as d } from "@das-fed/upf-utils/common-info";
+import { getEl as u } from "@das-fed/upf-utils/directive/utils";
+const m = (e, s) => {
+  if (!e || !s) return !1;
+  if (typeof s == "string")
+    return !!e.find((r) => r.endsWith(s));
   {
-    let r = !1;
-    for (let s of t)
-      if (e.find((a) => a.code === s)) {
-        r = !0;
+    let t = !1;
+    for (let r of s)
+      if (e.find((i) => i.endsWith(r))) {
+        t = !0;
         break;
       }
-    return r;
+    return t;
   }
-}, 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) ?? "");
-      }
+}, 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));
     }
-  }
-  let a = !1;
-  if (t) {
-    const c = o(l, s) ?? [];
-    a = A(c, t);
+    r = m(f, s);
   } else
-    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);
+    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);
   if (e)
-    if (!t.oldValue)
-      l || h(e, r).then((a) => {
-        g(a, s);
+    if (!s.oldValue)
+      f || u(e, t).then((i) => {
+        c(i, r);
       });
     else {
-      const a = m(t.oldValue), n = l;
-      if (a === n) return;
-      h(e, r).then((c) => {
-        n ? b(c, s) : g(c, s);
+      const i = n(s.oldValue), l = f;
+      if (i === l) return;
+      u(e, t).then((a) => {
+        l ? h(a, r) : c(a, r);
       });
     }
-  return l;
+  return f;
 };
 export {
-  U as vAuth
+  A as vAuth
 };

package/esm-map.json

@@ -145,5 +145,7 @@
   "handleI18nData": "/common-tools/handle-data/index",
   "getToken": "/create-api-service/sso/index",
   "getValidAccessToken": "/create-api-service/check-token/index",
-  "isCurrentLangInSysLang": "/common-tools/handle-data/index"
+  "isCurrentLangInSysLang": "/common-tools/handle-data/index",
+  "getMenuItemInfo": "/common-info/index",
+  "getAuthobj": "/common-info/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/upf-utils",
-  "version": "6.4.0-dev.185",
+  "version": "6.4.0-dev.187",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/upf-utils": "6.4.0-dev.185",
+    "@das-fed/upf-utils": "6.4.0-dev.187",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -22,8 +22,8 @@
   },
   "devDependencies": {
     "@babel/preset-env": "7.26.0",
-    "@das-fed/upf-cli": "6.4.0-dev.185",
-    "@das-fed/upf-web": "6.4.0-dev.185",
+    "@das-fed/upf-cli": "6.4.0-dev.187",
+    "@das-fed/upf-web": "6.4.0-dev.187",
     "@rollup/plugin-babel": "6.0.4",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",