@das-fed/upf-web 6.4.0-hot.3 → 6.4.0-hot.5

package/packages/i18n/es5.js

@@ -16,7 +16,7 @@ var D = "language",
   j = h || window.localStorage.getItem(D) || window.navigator.language || "zh-CN",
   c = vue.ref(j),
   y = "dasI18n",
-  g = function g() {
+  p = function p() {
     var t = document.documentElement;
     t && t.setAttribute("lang", c.value);
   },
@@ -29,7 +29,7 @@ var D = "language",
     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 && (l[n] || (l[n] = {}), l[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] = {}, console.log("".concat(i[n], "\u4E3A\u7A7A\uFF0C\u91CD\u65B0\u8BBE\u7F6E\u4E3A{}"))), i[n][o] = s[n][o]);
     }
     console.log("customLangeData===", i), console.log("globalLangeData===", l);
   },
@@ -50,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:
@@ -79,7 +79,7 @@ var D = "language",
         s = (_m$e = m[e]) !== null && _m$e !== void 0 ? _m$e : {},
         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[c.value];
@@ -96,12 +96,12 @@ var D = "language",
     return I.apply(void 0, [t].concat(a)).value;
   },
   T = function T(t) {
-    c.value = t, console.log("currentLang.value===", c.value), g();
+    c.value = t, console.log("currentLang.value===", c.value), p();
   },
   _ = function _() {
     return c;
   },
-  p = {
+  g = {
     "en-US": {
       ant: function ant() {
         return Promise.resolve().then(function () {
@@ -270,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();

package/packages/i18n/index.js

@@ -1,6 +1,6 @@
 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({}), 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", 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", c.value);
 }, M = (t = {}, a) => {
@@ -9,7 +9,7 @@ const D = "language", i = u({}), l = u({}), m = u({}), h = C(location.href, "uiC
   const s = {};
   for (const o in t)
     for (const n in t[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]);
+      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] = {}, console.log(`${i[n]}为空，重新设置为{}`)), i[n][o] = s[n][o]);
   console.log("customLangeData===", i), console.log("globalLangeData===", l);
 }, b = (t = {}, a) => {
   var s;
@@ -20,7 +20,7 @@ const D = "language", i = u({}), l = u({}), m = u({}), h = C(location.href, "uiC
       n && (m[n] || (m[n] = {}), m[n][o] = t[o]), i[o] || (i[o] = t[o]);
     }
 }, R = async (t) => {
-  g();
+  p();
   const a = window[y];
   a && b(a, "global");
 }, v = (t) => {
@@ -31,14 +31,14 @@ const D = "language", i = u({}), l = u({}), m = u({}), h = C(location.href, "uiC
   const e = v(location.pathname);
   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 });
+  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) => {
-  c.value = t, console.log("currentLang.value===", c.value), g();
-}, _ = () => c, 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") },
@@ -59,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;