@das-fed/upf-utils 6.4.0-dev.167 → 6.4.0-dev.169

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

@@ -1,4 +1,4 @@
-const E = (e) => e === null || typeof e > "u" || e === "", u = [
+const k = (e) => e === null || typeof e > "u" || e === "", p = [
   "zh-CN",
   "zh-TW",
   "zh-HK",
@@ -15,7 +15,7 @@ const E = (e) => e === null || typeof e > "u" || e === "", u = [
   "nl-NL",
   "vi-VN",
   "tr-TR"
-], l = {
+], u = {
   3: "zh-HK",
   4: "zh-TW",
   6: "ru-RU",
@@ -29,68 +29,76 @@ const E = (e) => e === null || typeof e > "u" || e === "", u = [
   14: "nl-NL",
   15: "vi-VN",
   16: "tr-TR"
-}, h = (e) => {
-  const c = [...e, ...Object.values(l).filter((n) => e.includes(n))];
-  return u.filter((n) => c.includes(n) || Object.entries(l).some(
-    ([t, a]) => e.includes(t) && n === a || e.includes(a) && n === a
+}, w = (e) => {
+  const c = [...e, ...Object.values(u).filter((t) => e.includes(t))];
+  return p.filter((t) => c.includes(t) || Object.entries(u).some(
+    ([a, s]) => e.includes(a) && t === s || e.includes(s) && t === s
   ));
-}, p = ["zh-CN", "zh-MO", "en-US", "10"], y = async (e) => {
+}, b = ["zh-CN", "zh-MO", "en-US", "10"], g = async (e) => {
   const c = e || {};
   let {
-    currentLang: n = "zh-CN",
-    baseUrl: t = "/",
-    appName: a = "jc",
-    isPullBack: o = !1,
-    isDasUI: U = !1,
-    urlObj: r = { frontEndUrl: "", backEndUrl: "", dasUiUrl: "" }
+    currentLang: t = "zh-CN",
+    baseUrl: a = "/",
+    appName: s = "jc",
+    isPullBack: h = !1,
+    isDasUI: $ = !1,
+    urlObj: n = { frontEndUrl: "", backEndUrl: "", dasUiUrl: "" },
+    // 新增：当主地址加载失败时，用于针对失败项的本地回退地址
+    fallbackBaseUrl: r = ""
   } = c;
-  (typeof n != "string" || !n) && (n = "zh-CN"), (typeof a != "string" || !a) && (a = "jc"), typeof t != "string" && (t = "/"), t || (t = "/"), t.endsWith("/") || (t = t + "/");
+  (typeof t != "string" || !t) && (t = "zh-CN"), (typeof s != "string" || !s) && (s = "jc"), typeof a != "string" && (a = "/"), a || (a = "/"), a.endsWith("/") || (a = a + "/"), typeof r != "string" && (r = ""), r && !r.endsWith("/") && (r = r + "/");
   const i = {
     frontEnd: null,
     dasUiEnd: null,
     backMsg: null
   };
-  let f = !1;
-  try {
-    const s = await import(
-      /* @vite-ignore */
-      `${(r == null ? void 0 : r.frontEndUrl) || `${t}web-front-end/i18n/${a}_${n}.js`}`
-    );
-    i.frontEnd = (s == null ? void 0 : s.default) ?? null, i.frontEnd && (f = !0);
-  } catch {
-  }
-  if (o || r != null && r.backEndUrl)
-    try {
-      const s = await import(
-        /* @vite-ignore */
-        `${(r == null ? void 0 : r.backEndUrl) || `${t}web-back-end/i18n/${a}_${n}.js`}`
-      );
-      i.backMsg = (s == null ? void 0 : s.default) ?? null, i.backMsg && (f = !0);
-    } catch {
-    }
-  if (U)
+  let l = !1;
+  const E = async (o, d, y = "资源") => {
     try {
-      const s = await import(
+      const f = await import(
         /* @vite-ignore */
-        `${(r == null ? void 0 : r.dasUiUrl) || `${t}web-front-end/i18n/dasui_${n}.js`}`
+        `${o}`
       );
-      i.dasUiEnd = (s == null ? void 0 : s.default) ?? null, i.dasUiEnd && (f = !0);
+      return (f == null ? void 0 : f.default) ?? null;
     } catch {
+      if (d)
+        try {
+          const U = await import(
+            /* @vite-ignore */
+            `${d}`
+          );
+          return (U == null ? void 0 : U.default) ?? null;
+        } catch {
+        }
+      return null;
     }
-  if (!f)
+  };
+  {
+    const o = (n == null ? void 0 : n.frontEndUrl) || `${a}web-front-end/i18n/${s}_${t}.js`, d = !(n != null && n.frontEndUrl) && r ? `${r}web-front-end/i18n/${s}_${t}.js` : void 0;
+    i.frontEnd = await E(o, d, "前端业务语言资源"), i.frontEnd && (l = !0);
+  }
+  if (h && i.frontEnd || n != null && n.backEndUrl) {
+    const o = (n == null ? void 0 : n.backEndUrl) || `${a}web-back-end/i18n/${s}_${t}.js`, d = !(n != null && n.backEndUrl) && r ? `${r}web-back-end/i18n/${s}_${t}.js` : void 0;
+    i.backMsg = await E(o, d, "后端语言资源"), i.backMsg && (l = !0);
+  }
+  if ($) {
+    const o = (n == null ? void 0 : n.dasUiUrl) || `${a}web-front-end/i18n/dasui_${t}.js`, d = !(n != null && n.dasUiUrl) && r ? `${r}web-front-end/i18n/dasui_${t}.js` : void 0;
+    i.dasUiEnd = await E(o, d, "UI组件库语言资源"), i.dasUiEnd && (l = !0);
+  }
+  if (!l)
     throw new Error("语言包加载失败");
   return i;
-}, $ = async (e = "front-end") => {
-  let c = {}, t = await import(
+}, z = async (e = "front-end") => {
+  let c = {}, a = await import(
     /* @vite-ignore */
     `/i18n/${e}/global.js`
   );
-  return c = (t == null ? void 0 : t.default) || {}, c;
+  return c = (a == null ? void 0 : a.default) || {}, c;
 };
 export {
-  p as getCurrentSysLang,
-  h as getSysLangArr,
-  $ as handleGlobalI18n,
-  y as handleI18nData,
-  E as isEmpty
+  b as getCurrentSysLang,
+  w as getSysLangArr,
+  z as handleGlobalI18n,
+  g as handleI18nData,
+  k as isEmpty
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/upf-utils",
-  "version": "6.4.0-dev.167",
+  "version": "6.4.0-dev.169",
   "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.167",
+    "@das-fed/upf-utils": "6.4.0-dev.169",
     "@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/upf-cli": "6.4.0-dev.167",
-    "@das-fed/upf-web": "6.4.0-dev.167",
+    "@das-fed/upf-cli": "6.4.0-dev.169",
+    "@das-fed/upf-web": "6.4.0-dev.169",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",