@das-fed/upf-web 6.4.0-hot.2 → 6.4.0-hot.4

package/packages/create-das-web-app/es5.js

@@ -45,30 +45,32 @@ var F = {
   },
   v = pinia.createPinia();
 v.use(S);
-var I = "language",
-  E = vue.reactive({});
+var $ = "language",
+  y = vue.reactive({}),
+  G = vue.reactive({});
 vue.reactive({});
-vue.reactive({});
-var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
-  T = G || window.localStorage.getItem(I) || window.navigator.language || "zh-CN",
-  R = vue.ref(T),
-  J = function J() {
+var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
+  J = T || window.localStorage.getItem($) || window.navigator.language || "zh-CN",
+  R = vue.ref(J),
+  Q = function Q() {
     var e = document.documentElement;
     e && e.setAttribute("lang", R.value);
   },
-  O = function O() {
+  j = function j() {
     var e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var t = arguments.length > 1 ? arguments[1] : undefined;
+    console.log("setLangRule===", e, t);
     var r = {};
     for (var o in e) for (var a in e[o]) {
       var _e$o$a;
-      r[a] || (r[a] = {}), r[a][o] = (_e$o$a = e[o][a]) !== null && _e$o$a !== void 0 ? _e$o$a : "", E[a] || (E[a] = {}), E[a][o] = r[a][o];
+      r[a] || (r[a] = {}), r[a][o] = (_e$o$a = e[o][a]) !== null && _e$o$a !== void 0 ? _e$o$a : "", y[a] || (y[a] = {}), y[a][o] = r[a][o];
     }
+    console.log("customLangeData===", y), console.log("globalLangeData===", G);
   },
-  Q = function Q(e) {
-    R.value = e, console.log("currentLang.value===", R.value), J();
+  V = function V(e) {
+    R.value = e, console.log("currentLang.value===", R.value), Q();
   },
-  V = {
+  X = {
     loaded: {},
     isLoaded: function isLoaded(e, t) {
       return !!(this.loaded[e] && this.loaded[e][t]);
@@ -80,7 +82,7 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
       this.loaded[e] && (delete this.loaded[e][t], Object.keys(this.loaded[e]).length === 0 && delete this.loaded[e]);
     }
   },
-  X = /*#__PURE__*/function () {
+  Y = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e, t) {
       var _ref2, _ref3, _ref4;
       var f, b, d, r, o, a, c, i, u, _t;
@@ -117,11 +119,11 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
         }
       }, _callee, null, [[1, 4]]);
     }));
-    return function X(_x, _x2) {
+    return function Y(_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }(),
-  Y = /*#__PURE__*/function () {
+  Z = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var e,
         t,
@@ -135,13 +137,14 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
             t = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "zh-CN";
             console.log("registerMicroI18nData===", e, t);
             _context2.p = 1;
+            V(t);
             _context2.n = 2;
-            return X(e, t);
+            return Y(e, t);
           case 2:
             r = _context2.v;
-            r != null && r.frontEnd && _typeof(r.frontEnd) == "object" && Object.keys(r.frontEnd).length && e.forEach(function (o) {
-              r.frontEnd[o] && _typeof(r.frontEnd[o]) == "object" && Object.keys(r.frontEnd[o]).length ? O(_defineProperty({}, t, r.frontEnd[o])) : console.warn("No front-end i18n data found for app: ".concat(o));
-            }), r != null && r.dasUiEnd && _typeof(r.dasUiEnd) == "object" && Object.keys(r.dasUiEnd).length && O(_defineProperty({}, t, r.dasUiEnd)), Q(t);
+            console.log("i18nData===", r), r != null && r.frontEnd && _typeof(r.frontEnd) == "object" && Object.keys(r.frontEnd).length && e.forEach(function (o) {
+              r.frontEnd[o] && _typeof(r.frontEnd[o]) == "object" && Object.keys(r.frontEnd[o]).length ? j(_defineProperty({}, t, r.frontEnd[o])) : console.warn("No front-end i18n data found for app: ".concat(o));
+            }), r != null && r.dasUiEnd && _typeof(r.dasUiEnd) == "object" && Object.keys(r.dasUiEnd).length && j(_defineProperty({}, t, r.dasUiEnd));
             _context2.n = 4;
             break;
           case 3:
@@ -153,15 +156,15 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
         }
       }, _callee2, null, [[1, 3]]);
     }));
-    return function Y() {
+    return function Z() {
       return _ref5.apply(this, arguments);
     };
   }(),
-  Z = function Z(e) {
+  _ = function _(e) {
     var _ref6;
-    var p, y, u, j, L;
+    var p, A, u, U, D;
     var t = (_ref6 = (p = e == null ? undefined : e.router) == null ? undefined : p.routerBase) !== null && _ref6 !== void 0 ? _ref6 : "/",
-      r = ((y = e == null ? undefined : e.router) == null ? undefined : y.options) || {};
+      r = ((A = e == null ? undefined : e.router) == null ? undefined : A.options) || {};
     var o = Object.assign(((u = e == null ? undefined : e.router) == null ? undefined : u.glob) || {});
     var a = Object.values(o).filter(function (l) {
         return !!l;
@@ -170,9 +173,9 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
         return ((_l$index = l.index) !== null && _l$index !== void 0 ? _l$index : 0) - ((_s$index = s.index) !== null && _s$index !== void 0 ? _s$index : 0);
       }),
       c = [];
-    (j = e == null ? undefined : e.microApps) == null || j.map(function (l) {
-      var A;
-      var s = Object.values(((A = l.router) == null ? undefined : A.glob) || {}).filter(function (n) {
+    (U = e == null ? undefined : e.microApps) == null || U.map(function (l) {
+      var E;
+      var s = Object.values(((E = l.router) == null ? undefined : E.glob) || {}).filter(function (n) {
         return !!n;
       }).flat().sort(function (n, w) {
         var _n$index, _w$index;
@@ -200,13 +203,13 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
         };
       })));
     });
-    var i = ((L = e == null ? undefined : e.router) == null ? undefined : L.routers) || [],
+    var i = ((D = e == null ? undefined : e.router) == null ? undefined : D.routers) || [],
       f = [].concat(_toConsumableArray(k(a, e)), _toConsumableArray(k(i, e)), _toConsumableArray(k(c, e))),
       b = vueRouter.createRouter(_objectSpread({
         history: vueRouter.createWebHistory(t),
         routes: f
       }, r)),
-      d = V;
+      d = X;
     if (Array.isArray(e == null ? undefined : e.microApps) && e.microApps.length && d) {
       var l = /* @__PURE__ */new Map();
       var _iterator = _createForOfIteratorHelper(e.microApps),
@@ -222,13 +225,13 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
         _iterator.f();
       }
       b.beforeEach(/*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(s, A, n) {
-          var w, h, N, _iterator2, _step2, _step2$value, g, m, D, _t3, _t4, _t5;
+        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(s, E, n) {
+          var w, g, I, _iterator2, _step2, _step2$value, h, m, N, _t3, _t4, _t5;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
                 _context3.p = 0;
-                h = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem(I) || window.navigator.language || "zh-CN", N = s.path || "";
+                g = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem($) || window.navigator.language || "zh-CN", I = s.path || "";
                 _iterator2 = _createForOfIteratorHelper(l.entries());
                 _context3.p = 1;
                 _iterator2.s();
@@ -237,31 +240,31 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
                   _context3.n = 10;
                   break;
                 }
-                _step2$value = _slicedToArray(_step2.value, 2), g = _step2$value[0], m = _step2$value[1];
-                if (!(!g || !N.toLowerCase().startsWith("/".concat(g.toLowerCase())))) {
+                _step2$value = _slicedToArray(_step2.value, 2), h = _step2$value[0], m = _step2$value[1];
+                if (!(!h || !I.toLowerCase().startsWith("/".concat(h.toLowerCase())))) {
                   _context3.n = 3;
                   break;
                 }
                 return _context3.a(3, 9);
               case 3:
-                if (!(d.isLoaded(h, g) || !m || !(m != null && m.length))) {
+                if (!(d.isLoaded(g, h) || !m || !(m != null && m.length))) {
                   _context3.n = 4;
                   break;
                 }
                 return _context3.a(3, 10);
               case 4:
-                D = typeof m == "string" ? [m] : m;
-                d.markLoaded(h, g);
+                N = typeof m == "string" ? [m] : m;
+                d.markLoaded(g, h);
                 _context3.p = 5;
                 _context3.n = 6;
-                return Y(D, h);
+                return Z(N, g);
               case 6:
                 _context3.n = 8;
                 break;
               case 7:
                 _context3.p = 7;
                 _t3 = _context3.v;
-                d.markUnloaded(h, g), console.error("[initRouter] load micro app i18n failed for ".concat(g, ":"), _t3);
+                d.markUnloaded(g, h), console.error("[initRouter] load micro app i18n failed for ".concat(h, ":"), _t3);
               case 8:
                 return _context3.a(3, 10);
               case 9:
@@ -312,7 +315,7 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
       });
     });
   },
-  ce = function ce(e) {
+  le = function le(e) {
     var f;
     e || (e = {});
     var t = vue.ref(true);
@@ -325,8 +328,8 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
       a = _ref9.props,
       c = vue.createApp(o || index$1.DasWebLayout, a);
     c.use(F, e), c.use(v);
-    var _Z = Z(e),
-      i = _Z.router;
+    var _ref0 = _(e),
+      i = _ref0.router;
     return c.use(i), c.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = i), {
       app: c,
       router: i,
@@ -334,4 +337,4 @@ var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
       store: v
     };
   };
-exports.createDasWebApp = ce;
+exports.createDasWebApp = le;

package/packages/create-das-web-app/index.js

@@ -1,4 +1,4 @@
-import { reactive as U, ref as $, createApp as x } from "vue";
+import { reactive as L, ref as O, createApp as x } from "vue";
 import { initTheme as B } from "@das-fed/upf-web/packages/theme/index";
 import { DasWebLayout as M } from "@das-fed/upf-web/packages/layout/index";
 import { createPinia as W } from "pinia";
@@ -16,20 +16,21 @@ const F = {
   }
 }, v = W();
 v.use(S);
-const I = "language", E = U({});
-U({});
-U({});
-const G = H(location.href, "uiCulture") || "", T = G || window.localStorage.getItem(I) || window.navigator.language || "zh-CN", R = $(T), J = () => {
+const $ = "language", y = L({}), G = L({});
+L({});
+const T = H(location.href, "uiCulture") || "", J = T || window.localStorage.getItem($) || window.navigator.language || "zh-CN", R = O(J), Q = () => {
   const e = document.documentElement;
   e && e.setAttribute("lang", R.value);
-}, O = (e = {}, t) => {
+}, j = (e = {}, t) => {
+  console.log("setLangRule===", e, t);
   const r = {};
   for (const o in e)
     for (const a in e[o])
-      r[a] || (r[a] = {}), r[a][o] = e[o][a] ?? "", E[a] || (E[a] = {}), E[a][o] = r[a][o];
-}, Q = (e) => {
-  R.value = e, console.log("currentLang.value===", R.value), J();
-}, V = {
+      r[a] || (r[a] = {}), r[a][o] = e[o][a] ?? "", y[a] || (y[a] = {}), y[a][o] = r[a][o];
+  console.log("customLangeData===", y), console.log("globalLangeData===", G);
+}, V = (e) => {
+  R.value = e, console.log("currentLang.value===", R.value), Q();
+}, X = {
   loaded: {},
   isLoaded(e, t) {
     return !!(this.loaded[e] && this.loaded[e][t]);
@@ -40,7 +41,7 @@ const G = H(location.href, "uiCulture") || "", T = G || window.localStorage.getI
   markUnloaded(e, t) {
     this.loaded[e] && (delete this.loaded[e][t], Object.keys(this.loaded[e]).length === 0 && delete this.loaded[e]);
   }
-}, X = async (e, t) => {
+}, Y = async (e, t) => {
   var f, b, d;
   const r = q() || {}, o = ((f = r.i18n) == null ? void 0 : f.fromOss) ?? !0, a = ((b = r.i18n) == null ? void 0 : b.isPullBack) ?? !1, c = ((d = r.i18n) == null ? void 0 : d.isDasUI) ?? !0;
   let i = "/oss/resource/";
@@ -59,24 +60,25 @@ const G = H(location.href, "uiCulture") || "", T = G || window.localStorage.getI
   } catch (p) {
     throw new Error(`registerResources error: ${p}`);
   }
-}, Y = async (e = [], t = "zh-CN") => {
+}, Z = async (e = [], t = "zh-CN") => {
   console.log("registerMicroI18nData===", e, t);
   try {
-    const r = await X(e, t);
-    r != null && r.frontEnd && typeof r.frontEnd == "object" && Object.keys(r.frontEnd).length && e.forEach((o) => {
-      r.frontEnd[o] && typeof r.frontEnd[o] == "object" && Object.keys(r.frontEnd[o]).length ? O({ [t]: r.frontEnd[o] }) : console.warn(`No front-end i18n data found for app: ${o}`);
-    }), r != null && r.dasUiEnd && typeof r.dasUiEnd == "object" && Object.keys(r.dasUiEnd).length && O({ [t]: r.dasUiEnd }), Q(t);
+    V(t);
+    const r = await Y(e, t);
+    console.log("i18nData===", r), r != null && r.frontEnd && typeof r.frontEnd == "object" && Object.keys(r.frontEnd).length && e.forEach((o) => {
+      r.frontEnd[o] && typeof r.frontEnd[o] == "object" && Object.keys(r.frontEnd[o]).length ? j({ [t]: r.frontEnd[o] }) : console.warn(`No front-end i18n data found for app: ${o}`);
+    }), r != null && r.dasUiEnd && typeof r.dasUiEnd == "object" && Object.keys(r.dasUiEnd).length && j({ [t]: r.dasUiEnd });
   } catch (r) {
     console.error("registerMicroI18nData error:", r);
   }
-}, Z = (e) => {
-  var p, y, u, j, L;
-  const t = ((p = e == null ? void 0 : e.router) == null ? void 0 : p.routerBase) ?? "/", r = ((y = e == null ? void 0 : e.router) == null ? void 0 : y.options) || {};
+}, _ = (e) => {
+  var p, A, u, U, D;
+  const t = ((p = e == null ? void 0 : e.router) == null ? void 0 : p.routerBase) ?? "/", r = ((A = e == null ? void 0 : e.router) == null ? void 0 : A.options) || {};
   let o = Object.assign(((u = e == null ? void 0 : e.router) == null ? void 0 : u.glob) || {});
   const a = Object.values(o).filter((l) => !!l).flat().sort((l, s) => (l.index ?? 0) - (s.index ?? 0)), c = [];
-  (j = e == null ? void 0 : e.microApps) == null || j.map((l) => {
-    var A;
-    const s = Object.values(((A = l.router) == null ? void 0 : A.glob) || {}).filter((n) => !!n).flat().sort((n, w) => (n.index ?? 0) - (w.index ?? 0));
+  (U = e == null ? void 0 : e.microApps) == null || U.map((l) => {
+    var E;
+    const s = Object.values(((E = l.router) == null ? void 0 : E.glob) || {}).filter((n) => !!n).flat().sort((n, w) => (n.index ?? 0) - (w.index ?? 0));
     c.push(
       ...s.map((n) => ({ ...n, path: `/${l.microAppName}${n.path}` }))
     ), c.push(
@@ -87,33 +89,33 @@ const G = H(location.href, "uiCulture") || "", T = G || window.localStorage.getI
       }))
     );
   });
-  const i = ((L = e == null ? void 0 : e.router) == null ? void 0 : L.routers) || [], f = [
+  const i = ((D = e == null ? void 0 : e.router) == null ? void 0 : D.routers) || [], f = [
     ...k(a, e),
     ...k(i, e),
     ...k(c, e)
-  ], b = z({ history: C(t), routes: f, ...r }), d = V;
+  ], b = z({ history: C(t), routes: f, ...r }), d = X;
   if (Array.isArray(e == null ? void 0 : e.microApps) && e.microApps.length && d) {
     const l = /* @__PURE__ */ new Map();
     for (const s of e.microApps)
       s != null && s.microAppName && (s != null && s.i18n) && l.set(s.microAppName, s.i18n);
-    b.beforeEach(async (s, A, n) => {
+    b.beforeEach(async (s, E, n) => {
       var w;
       try {
-        const h = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem(I) || window.navigator.language || "zh-CN", N = s.path || "";
-        for (const [g, m] of l.entries()) {
-          if (!g || !N.toLowerCase().startsWith(`/${g.toLowerCase()}`)) continue;
-          if (d.isLoaded(h, g) || !m || !(m != null && m.length)) break;
-          const D = typeof m == "string" ? [m] : m;
-          d.markLoaded(h, g);
+        const g = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem($) || window.navigator.language || "zh-CN", I = s.path || "";
+        for (const [h, m] of l.entries()) {
+          if (!h || !I.toLowerCase().startsWith(`/${h.toLowerCase()}`)) continue;
+          if (d.isLoaded(g, h) || !m || !(m != null && m.length)) break;
+          const N = typeof m == "string" ? [m] : m;
+          d.markLoaded(g, h);
           try {
-            await Y(D, h);
+            await Z(N, g);
           } catch (P) {
-            d.markUnloaded(h, g), console.error(`[initRouter] load micro app i18n failed for ${g}:`, P);
+            d.markUnloaded(g, h), console.error(`[initRouter] load micro app i18n failed for ${h}:`, P);
           }
           break;
         }
-      } catch (h) {
-        console.error("[initRouter] microApps i18n beforeEach handler error:", h);
+      } catch (g) {
+        console.error("[initRouter] microApps i18n beforeEach handler error:", g);
       } finally {
         n();
       }
@@ -123,18 +125,18 @@ const G = H(location.href, "uiCulture") || "", T = G || window.localStorage.getI
 }, k = (e, t) => e.map((r) => {
   const o = r.meta || {};
   return o.keepAlive = o.keepAlive ?? (t == null ? void 0 : t.keepAlive) ?? !0, { ...r, meta: o };
-}), ce = (e) => {
+}), le = (e) => {
   var f;
   e || (e = {});
-  const t = $(!0);
+  const t = O(!0);
   Promise.all([B(e)]).then(() => {
     t.value = !1;
   });
   const { container: r, component: o, props: a } = (e == null ? void 0 : e.root) || {}, c = x(o || M, a);
   c.use(F, e), c.use(v);
-  const { router: i } = Z(e);
+  const { router: i } = _(e);
   return c.use(i), c.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = i), { app: c, router: i, loading: t, store: v };
 };
 export {
-  ce as createDasWebApp
+  le as createDasWebApp
 };

package/packages/i18n/es5.js

@@ -10,26 +10,28 @@ var vue = require('vue');
 var commonTools = require('@das-fed/upf-utils/common-tools');
 var D = "language",
   i = vue.reactive({}),
-  c = vue.reactive({}),
+  l = vue.reactive({}),
   m = vue.reactive({}),
   h = commonTools.getUrlParams(location.href, "uiCulture") || "",
   j = h || window.localStorage.getItem(D) || window.navigator.language || "zh-CN",
-  l = vue.ref(j),
+  c = vue.ref(j),
   y = "dasI18n",
-  g = function g() {
+  p = function p() {
     var t = document.documentElement;
-    t && t.setAttribute("lang", l.value);
+    t && t.setAttribute("lang", c.value);
   },
   M = function M() {
     var t = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var a = arguments.length > 1 ? arguments[1] : undefined;
     var e = a === "global",
-      r = !e,
-      s = {};
+      r = !e;
+    console.log("setLangRule===", t, a);
+    var s = {};
     for (var o in t) for (var n in t[o]) {
       var _t$o$n;
-      s[n] || (s[n] = {}), s[n][o] = (_t$o$n = t[o][n]) !== null && _t$o$n !== void 0 ? _t$o$n : "", e && (c[n] || (c[n] = {}), c[n][o] = s[n][o]), r && (i[n] || (i[n] = {}), i[n][o] = s[n][o]);
+      s[n] || (s[n] = {}), s[n][o] = (_t$o$n = t[o][n]) !== null && _t$o$n !== void 0 ? _t$o$n : "", e && (l[n] || (l[n] = {}), l[n][o] = s[n][o]), r && (i[n] || (i[n] = {}), i[n][o] = s[n][o]);
     }
+    console.log("customLangeData===", i), console.log("globalLangeData===", l);
   },
   b = function b() {
     var t = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -37,11 +39,10 @@ var D = "language",
     var s;
     var e = a === "global",
       r = !e;
-    for (var o in t) if (e && !c[o] && (c[o] = t[o]), r) {
+    for (var o in t) if (e && !l[o] && (l[o] = t[o]), r) {
       var n = (s = t[o]) != null && s._appCode ? t[o]._appCode.toLowerCase() : "";
       n && (m[n] || (m[n] = {}), m[n][o] = t[o]), i[o] || (i[o] = t[o]);
     }
-    console.log("customLangeData===", i), console.log("globalLangeData===", c);
   },
   R = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(t) {
@@ -49,7 +50,7 @@ var D = "language",
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
-            g();
+            p();
             a = window[y];
             a && b(a, "global");
           case 1:
@@ -76,13 +77,13 @@ var D = "language",
       var e = v(location.pathname);
       var r = (_m$framework = m.framework) !== null && _m$framework !== void 0 ? _m$framework : {},
         s = (_m$e = m[e]) !== null && _m$e !== void 0 ? _m$e : {},
-        o = i[t] || c[t] || r[t] || s[t] || t;
+        o = i[t] || l[t] || r[t] || s[t] || t;
       if (o === t) return t;
-      typeof o == "string" && (o = {
+      console.log("customLangeData===222", i), typeof o == "string" && (o = {
         "zh-CN": o
       });
-      var n = o[l.value];
-      return l.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (n = o["zh-cn"]), a.map(function (f, d) {
+      var n = o[c.value];
+      return c.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (n = o["zh-cn"]), a.map(function (f, d) {
         n && (n = n.replace("$".concat(d), f));
       }), n;
     });
@@ -95,12 +96,12 @@ var D = "language",
     return I.apply(void 0, [t].concat(a)).value;
   },
   T = function T(t) {
-    l.value = t, console.log("currentLang.value===", l.value), g();
+    c.value = t, console.log("currentLang.value===", c.value), p();
   },
   _ = function _() {
-    return l;
+    return c;
   },
-  p = {
+  g = {
     "en-US": {
       ant: function ant() {
         return Promise.resolve().then(function () {
@@ -269,7 +270,7 @@ var O = /*#__PURE__*/function () {
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          a = p[t] || p["zh-CN"];
+          a = g[t] || g["zh-CN"];
           _context2.p = 1;
           _context2.n = 2;
           return a.ant();
@@ -292,7 +293,7 @@ var O = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-exports.currentLang = l;
+exports.currentLang = c;
 exports.customLangeData = i;
 exports.getDateFormat = x;
 exports.getI18nRule = A;

package/packages/i18n/index.js

@@ -1,24 +1,26 @@
 import { reactive as u, ref as L, computed as w } from "vue";
 import { getUrlParams as C } from "@das-fed/upf-utils/common-tools";
-const D = "language", i = u({}), c = u({}), m = u({}), h = C(location.href, "uiCulture") || "", j = h || window.localStorage.getItem(D) || window.navigator.language || "zh-CN", l = L(j), y = "dasI18n", g = () => {
+const D = "language", i = u({}), l = u({}), m = u({}), h = C(location.href, "uiCulture") || "", j = h || window.localStorage.getItem(D) || window.navigator.language || "zh-CN", c = L(j), y = "dasI18n", p = () => {
   const t = document.documentElement;
-  t && t.setAttribute("lang", l.value);
+  t && t.setAttribute("lang", c.value);
 }, M = (t = {}, a) => {
-  const e = a === "global", r = !e, s = {};
+  const e = a === "global", r = !e;
+  console.log("setLangRule===", t, a);
+  const s = {};
   for (const o in t)
     for (const n in t[o])
-      s[n] || (s[n] = {}), s[n][o] = t[o][n] ?? "", e && (c[n] || (c[n] = {}), c[n][o] = s[n][o]), r && (i[n] || (i[n] = {}), i[n][o] = s[n][o]);
+      s[n] || (s[n] = {}), s[n][o] = t[o][n] ?? "", e && (l[n] || (l[n] = {}), l[n][o] = s[n][o]), r && (i[n] || (i[n] = {}), i[n][o] = s[n][o]);
+  console.log("customLangeData===", i), console.log("globalLangeData===", l);
 }, b = (t = {}, a) => {
   var s;
   const e = a === "global", r = !e;
   for (const o in t)
-    if (e && !c[o] && (c[o] = t[o]), r) {
+    if (e && !l[o] && (l[o] = t[o]), r) {
       const n = (s = t[o]) != null && s._appCode ? t[o]._appCode.toLowerCase() : "";
       n && (m[n] || (m[n] = {}), m[n][o] = t[o]), i[o] || (i[o] = t[o]);
     }
-  console.log("customLangeData===", i), console.log("globalLangeData===", c);
 }, R = async (t) => {
-  g();
+  p();
   const a = window[y];
   a && b(a, "global");
 }, v = (t) => {
@@ -27,16 +29,16 @@ const D = "language", i = u({}), c = u({}), m = u({}), h = C(location.href, "uiC
   return r && r.length >= 3 && (a = r[1] + "/" + r[2]), a ? a.toLowerCase() : "";
 }, A = (t, ...a) => w(() => {
   const e = v(location.pathname);
-  let r = m.framework ?? {}, s = m[e] ?? {}, o = i[t] || c[t] || r[t] || s[t] || t;
+  let r = m.framework ?? {}, s = m[e] ?? {}, o = i[t] || l[t] || r[t] || s[t] || t;
   if (o === t) return t;
-  typeof o == "string" && (o = { "zh-CN": o });
-  let n = o[l.value];
-  return l.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (n = o["zh-cn"]), a.map((f, d) => {
+  console.log("customLangeData===222", i), typeof o == "string" && (o = { "zh-CN": o });
+  let n = o[c.value];
+  return c.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (n = o["zh-cn"]), a.map((f, d) => {
     n && (n = n.replace(`$${d}`, f));
   }), n;
 }), I = A, N = (t, ...a) => I(t, ...a).value, T = (t) => {
-  l.value = t, console.log("currentLang.value===", l.value), g();
-}, _ = () => l, p = {
+  c.value = t, console.log("currentLang.value===", c.value), p();
+}, _ = () => c, g = {
   "en-US": { ant: () => import("ant-design-vue/es/locale/en_US"), dayjs: () => import("dayjs/locale/en") },
   "zh-CN": { ant: () => import("ant-design-vue/es/locale/zh_CN"), dayjs: () => import("dayjs/locale/zh-cn") },
   "zh-MO": { ant: () => import("ant-design-vue/es/locale/zh_TW"), dayjs: () => import("dayjs/locale/zh-tw") },
@@ -57,7 +59,7 @@ function x(t, a) {
   return e && e[t] && e[t][a] ? e[t][a] : ((r = window.DATE_FORMAT_MAP[t]) == null ? void 0 : r[a]) || "YYYY-MM-DD";
 }
 const O = async (t) => {
-  const a = p[t] || p["zh-CN"];
+  const a = g[t] || g["zh-CN"];
   try {
     const e = await a.ant();
     return await a.dayjs(), e.default;
@@ -66,7 +68,7 @@ const O = async (t) => {
   }
 };
 export {
-  l as currentLang,
+  c as currentLang,
   i as customLangeData,
   x as getDateFormat,
   A as getI18nRule,