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

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

@@ -1,115 +1,130 @@
-import { getConfig as N } from "@das-fed/upf-utils/config";
-const h = /* @__PURE__ */ new Map(), $ = /* @__PURE__ */ new Map(), S = 3e5, b = (l) => l === null || typeof l > "u" || l === "", z = (l) => {
-  var e;
-  return (((e = N()) == null ? void 0 : e.systemLangList) || ["zh-CN", "en-US", "zh-MO"]).includes(l);
-}, B = async (l) => {
-  const y = l || {};
+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 || {};
   let {
-    currentLang: e = "zh-CN",
-    baseUrl: r = "/",
-    appName: c = "jc",
-    isPullBack: _ = !1,
-    isDasUI: L = !1,
-    urlObj: n = { frontEndUrl: "", backEndUrl: "", dasUiUrl: "" },
-    // 新增：当主地址加载失败时，用于针对失败项的本地回退地址
-    fallbackBaseUrl: s = ""
-  } = y;
-  (typeof e != "string" || !e) && (e = "zh-CN"), (typeof c != "string" || !c) && (c = "jc"), typeof r != "string" && (r = "/"), r || (r = "/"), r.endsWith("/") || (r = r + "/"), typeof s != "string" && (s = ""), s && !s.endsWith("/") && (s = s + "/");
-  const f = {
+    currentLang: t = "zh-CN",
+    baseUrl: o = "/",
+    appName: g = "jc",
+    isPullFrontEnd: _ = !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 = {
     frontEnd: null,
+    // 统一格式：{ appName1: data1, appName2: data2, ... }
     dasUiEnd: null,
     backMsg: null
+    // 统一格式：{ appName1: data1, appName2: data2, ... }
   };
-  let U = !1;
-  const w = async (g, d, I = "zh-CN", F = "资源") => {
-    const M = async (o) => {
+  let w = !1;
+  const k = async (a, s, h = "zh-CN", $ = "资源") => {
+    const u = async (l) => {
       try {
         if (typeof window < "u" && typeof window.fetch == "function") {
-          const t = await window.fetch(o, { cache: "no-cache" });
-          return !t || !t.ok ? null : await t.text();
+          const n = await window.fetch(l, { cache: "no-cache" });
+          return !n || !n.ok ? null : await n.text();
         } else
-          return await new Promise((t) => {
+          return await new Promise((n) => {
             try {
-              const a = new XMLHttpRequest();
-              a.open("GET", o, !0), a.onreadystatechange = function() {
-                a.readyState === 4 && t(a.status >= 200 && a.status < 300 ? a.responseText : null);
-              }, a.onerror = function() {
-                t(null);
-              }, a.send();
+              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();
             } catch {
-              t(null);
+              n(null);
             }
           });
       } catch {
         return null;
       }
-    }, D = (o) => {
-      const t = (o || "").replace(/^\uFEFF/, "");
+    }, C = (l) => {
+      const n = (l || "").replace(/^\uFEFF/, "");
       try {
-        const a = t.trim();
-        if (/^export\s+default\s*\{[\s\S]*\}\s*;?$/m.test(a)) {
-          let i = a.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|\n)\s*\/\/.*(?=\n|$)/g, "$1");
-          const u = i.indexOf("{"), p = i.lastIndexOf("}");
-          if (u !== -1 && p !== -1 && p > u)
-            return i = i.slice(u, p + 1), i = i.replace(/,\s*([}\]])/g, "$1"), JSON.parse(i);
+        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);
         }
       } catch {
         return null;
       }
-    }, E = async (o) => {
-      if (!o) return null;
-      const t = o, a = Date.now(), i = $.get(t);
-      if (i && a - i.t <= S)
+    }, 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 (h.has(t)) return h.get(t);
-      const u = (async () => {
-        const p = await M(t);
-        if (!p)
-          return $.set(t, { ok: !1, value: null, t: a }), null;
-        const m = D(p);
-        return $.set(t, { ok: !0, value: m, t: Date.now() }), m ?? 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;
       })();
-      h.set(t, u);
+      m.set(n, p);
       try {
-        return await u;
+        return await p;
       } finally {
-        h.delete(t);
+        m.delete(n);
       }
-    }, k = await E(g);
-    if (k) return k;
-    if (d && z(I)) {
-      const o = await E(d);
-      if (o) return o;
+    }, j = await b(a);
+    if (j) return j;
+    if (s && O(h)) {
+      const l = await b(s);
+      if (l) return l;
     }
     return null;
-  }, x = (n == null ? void 0 : n.frontEndUrl) || `${r}front-end/i18n/front-end-page/${c}_${e}.js`;
-  let C = !(n != null && n.frontEndUrl) && s ? `${s}front-end/i18n/front-end-page/${c}_${e}.js` : void 0;
-  if (f.frontEnd = await w(
-    x,
-    C,
-    e,
-    "前端业务语言资源"
-  ), f.frontEnd && (U = !0), _ && f.frontEnd || n != null && n.backEndUrl) {
-    const g = (n == null ? void 0 : n.backEndUrl) || `${r}front-end/i18n/return-msg/${c}_${e}.js`;
-    let d = !(n != null && n.backEndUrl) && s ? `${s}front-end/i18n/return-msg/${c}_${e}.js` : void 0;
-    f.backMsg = await w(g, d, e, "后端语言资源"), f.backMsg && (U = !0);
+  };
+  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,
+        $,
+        t,
+        `前端业务语言资源(${s})`
+      );
+      u && (a[s] = u, w = !0);
+    }
+    Object.keys(a).length > 0 && (d.frontEnd = a);
+  }
+  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,
+        $,
+        t,
+        `后端语言资源(${s})`
+      );
+      u && (a[s] = u, w = !0);
+    }
+    Object.keys(a).length > 0 && (d.backMsg = a);
   }
-  if (L) {
-    const g = (n == null ? void 0 : n.dasUiUrl) || `${r}front-end/i18n/front-end-page/dasui_${e}.js`;
-    let d = !(n != null && n.dasUiUrl) && s ? `${s}front-end/i18n/front-end-page/dasui_${e}.js` : void 0;
-    f.dasUiEnd = await w(g, d, e, "UI组件库语言资源"), f.dasUiEnd && (U = !0);
+  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,
+      s,
+      t,
+      "UI组件库语言资源"
+    ), d.dasUiEnd && (w = !0);
   }
-  return f;
-}, P = async (l = "front-end") => {
-  let y = {}, r = await import(
-    /* @vite-ignore */
-    `/i18n/${l}/global.js`
-  );
-  return y = (r == null ? void 0 : r.default) || {}, y;
+  return d;
 };
 export {
-  P as handleGlobalI18n,
-  B as handleI18nData,
-  z as isCurrentLangInSysLang,
-  b as isEmpty
+  S as handleI18nData,
+  O as isCurrentLangInSysLang,
+  F as isEmpty
 };

package/esm-map.json

@@ -143,7 +143,6 @@
   "getFileExtension": "/common-tools/get-file-extension/index",
   "getLanguages": "/common-info/index",
   "handleI18nData": "/common-tools/handle-data/index",
-  "handleGlobalI18n": "/common-tools/handle-data/index",
   "getToken": "/create-api-service/sso/index",
   "getValidAccessToken": "/create-api-service/check-token/index",
   "isCurrentLangInSysLang": "/common-tools/handle-data/index"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/upf-utils",
-  "version": "6.4.0-dev.183",
+  "version": "6.4.0-dev.185",
   "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.183",
+    "@das-fed/upf-utils": "6.4.0-dev.185",
     "@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.183",
-    "@das-fed/upf-web": "6.4.0-dev.183",
+    "@das-fed/upf-cli": "6.4.0-dev.185",
+    "@das-fed/upf-web": "6.4.0-dev.185",
     "@rollup/plugin-babel": "6.0.4",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",