@das-fed/upf-utils 6.4.0-dev.168 → 6.4.0-dev.170

package/common-tools/handle-data/index.d.ts

@@ -4,8 +4,7 @@
  * @returns
  */
 export declare const isEmpty: (value: any) => boolean;
-export declare const getSysLangArr: (langArr: string[]) => any;
-export declare const getCurrentSysLang: {};
+export declare const isCurrentLangInSysLang: (lang: string) => any;
 /**
  * 处理多语言在打包时的数据
  * @param opt

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

@@ -1,71 +1,39 @@
-const k = (e) => e === null || typeof e > "u" || e === "", p = [
-  "zh-CN",
-  "zh-TW",
-  "zh-HK",
-  "zh-MO",
-  "en-US",
-  "ru-RU",
-  "sv-SE",
-  "fr-FR",
-  "de-DE",
-  "ar-SA",
-  "es-ES",
-  "it-IT",
-  "pt-PT",
-  "nl-NL",
-  "vi-VN",
-  "tr-TR"
-], u = {
-  3: "zh-HK",
-  4: "zh-TW",
-  6: "ru-RU",
-  7: "sv-SE",
-  8: "fr-FR",
-  9: "de-DE",
-  10: "ar-SA",
-  11: "es-ES",
-  12: "it-IT",
-  13: "pt-PT",
-  14: "nl-NL",
-  15: "vi-VN",
-  16: "tr-TR"
-}, 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
-  ));
-}, b = ["zh-CN", "zh-MO", "en-US", "10"], g = async (e) => {
-  const c = e || {};
+import { getConfig as k } from "@das-fed/upf-utils/config";
+const w = (e) => e === null || typeof e > "u" || e === "", g = (e) => {
+  var t;
+  return (((t = k()) == null ? void 0 : t.systemLangList) || []).includes(e);
+}, b = async (e) => {
+  const d = e || {};
   let {
     currentLang: t = "zh-CN",
     baseUrl: a = "/",
-    appName: s = "jc",
-    isPullBack: h = !1,
-    isDasUI: $ = !1,
+    appName: l = "jc",
+    isPullBack: p = !1,
+    isDasUI: y = !1,
     urlObj: n = { frontEndUrl: "", backEndUrl: "", dasUiUrl: "" },
     // 新增：当主地址加载失败时，用于针对失败项的本地回退地址
     fallbackBaseUrl: r = ""
-  } = c;
-  (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 = {
+  } = d;
+  (typeof t != "string" || !t) && (t = "zh-CN"), (typeof l != "string" || !l) && (l = "jc"), typeof a != "string" && (a = "/"), a || (a = "/"), a.endsWith("/") || (a = a + "/"), typeof r != "string" && (r = ""), r && !r.endsWith("/") && (r = r + "/");
+  const s = {
     frontEnd: null,
     dasUiEnd: null,
     backMsg: null
   };
-  let l = !1;
-  const E = async (o, d, y = "资源") => {
+  let f = !1;
+  const $ = async (o, i, E = "zh-CN", u = "资源") => {
     try {
-      const f = await import(
+      const c = await import(
         /* @vite-ignore */
         `${o}`
       );
-      return (f == null ? void 0 : f.default) ?? null;
+      return (c == null ? void 0 : c.default) ?? null;
     } catch {
-      if (d)
+      if (i && g(E))
         try {
           const U = await import(
             /* @vite-ignore */
-            `${d}`
+            `${i}`
           );
           return (U == null ? void 0 : U.default) ?? null;
         } catch {
@@ -73,32 +41,32 @@ const k = (e) => e === null || typeof e > "u" || e === "", p = [
       return null;
     }
   };
-  {
-    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 (!y) {
+    const o = (n == null ? void 0 : n.frontEndUrl) || `${a}web-front-end/i18n/${l}_${t}.js`;
+    let i = !(n != null && n.frontEndUrl) && r ? `${r}web-front-end/i18n/${l}_${t}.js` : void 0;
+    s.frontEnd = await $(o, i, t, "前端业务语言资源"), s.frontEnd && (f = !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 (p && s.frontEnd || n != null && n.backEndUrl) {
+    const o = (n == null ? void 0 : n.backEndUrl) || `${a}web-back-end/i18n/${l}_${t}.js`;
+    let i = !(n != null && n.backEndUrl) && r ? `${r}web-back-end/i18n/${l}_${t}.js` : void 0;
+    s.backMsg = await $(o, i, t, "后端语言资源"), s.backMsg && (f = !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 (y) {
+    const o = (n == null ? void 0 : n.dasUiUrl) || `${a}web-front-end/i18n/dasui_${t}.js`;
+    let i = !(n != null && n.dasUiUrl) && r ? `${r}web-front-end/i18n/dasui_${t}.js` : void 0;
+    s.dasUiEnd = await $(o, i, t, "UI组件库语言资源"), s.dasUiEnd && (f = !0);
   }
-  if (!l)
-    throw new Error("语言包加载失败");
-  return i;
-}, z = async (e = "front-end") => {
-  let c = {}, a = await import(
+  return s;
+}, m = async (e = "front-end") => {
+  let d = {}, a = await import(
     /* @vite-ignore */
     `/i18n/${e}/global.js`
   );
-  return c = (a == null ? void 0 : a.default) || {}, c;
+  return d = (a == null ? void 0 : a.default) || {}, d;
 };
 export {
-  b as getCurrentSysLang,
-  w as getSysLangArr,
-  z as handleGlobalI18n,
-  g as handleI18nData,
-  k as isEmpty
+  m as handleGlobalI18n,
+  b as handleI18nData,
+  g as isCurrentLangInSysLang,
+  w as isEmpty
 };

package/esm-map.json

@@ -146,6 +146,5 @@
   "handleGlobalI18n": "/common-tools/handle-data/index",
   "getToken": "/create-api-service/sso/index",
   "getValidAccessToken": "/create-api-service/check-token/index",
-  "getSysLangArr": "/common-tools/handle-data/index",
-  "getCurrentSysLang": "/common-tools/handle-data/index"
+  "isCurrentLangInSysLang": "/common-tools/handle-data/index"
 }

package/package.json

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