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

package/packages/i18n/es5.js

@@ -8,14 +8,14 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var vue = require('vue');
 var commonTools = require('@das-fed/upf-utils/common-tools');
-var D = "language",
-  i = vue.reactive({}),
+var C = "language",
   l = vue.reactive({}),
+  i = vue.reactive({}),
   m = vue.reactive({}),
   h = commonTools.getUrlParams(location.href, "uiCulture") || "",
-  j = h || window.localStorage.getItem(D) || window.navigator.language || "zh-CN",
+  j = h || window.localStorage.getItem(C) || window.navigator.language || "zh-CN",
   c = vue.ref(j),
-  y = "dasI18n",
+  b = "dasI18n",
   p = function p() {
     var t = document.documentElement;
     t && t.setAttribute("lang", c.value);
@@ -29,19 +29,19 @@ 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 && (i[n] || (i[n] = {}), i[n][o] = s[n][o]), r && (l[n] || (l[n] = {}, console.log("".concat(l[n], "\u4E3A\u7A7A\uFF0C\u91CD\u65B0\u8BBE\u7F6E\u4E3A{}"))), l[n][o] = s[n][o]);
     }
-    console.log("customLangeData===", i), console.log("globalLangeData===", l);
+    console.log("customLangeData===注入", l), console.log("globalLangeData===注入", i);
   },
-  b = function b() {
+  y = function y() {
     var t = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var a = arguments.length > 1 ? arguments[1] : undefined;
     var s;
     var e = a === "global",
       r = !e;
-    for (var o in t) if (e && !l[o] && (l[o] = t[o]), r) {
+    for (var o in t) if (e && !i[o] && (i[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]);
+      n && (m[n] || (m[n] = {}), m[n][o] = t[o]), l[o] || (l[o] = t[o]);
     }
   },
   R = /*#__PURE__*/function () {
@@ -51,8 +51,8 @@ var D = "language",
         while (1) switch (_context.n) {
           case 0:
             p();
-            a = window[y];
-            a && b(a, "global");
+            a = window[b];
+            a && y(a, "global");
           case 1:
             return _context.a(2);
         }
@@ -77,9 +77,9 @@ 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] || l[t] || r[t] || s[t] || t;
+        o = l[t] || i[t] || r[t] || s[t] || t;
       if (o === t) return t;
-      console.log("customLangeData===222", i), typeof o == "string" && (o = {
+      console.log("customLangeData===获取时", l, l[t]), console.log("globalLangeData===获取时", i, i[t]), typeof o == "string" && (o = {
         "zh-CN": o
       });
       var n = o[c.value];
@@ -101,7 +101,7 @@ var D = "language",
   _ = function _() {
     return c;
   },
-  g = {
+  u = {
     "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 = g[t] || g["zh-CN"];
+          a = u[t] || u["zh-CN"];
           _context2.p = 1;
           _context2.n = 2;
           return a.ant();
@@ -294,15 +294,15 @@ var O = /*#__PURE__*/function () {
   };
 }();
 exports.currentLang = c;
-exports.customLangeData = i;
+exports.customLangeData = l;
 exports.getDateFormat = x;
 exports.getI18nRule = A;
 exports.getLang = _;
 exports.i18n = I;
 exports.initI18n = R;
-exports.languageKey = D;
+exports.languageKey = C;
 exports.loadLocale = O;
-exports.setI18nRule = b;
+exports.setI18nRule = y;
 exports.setLang = T;
 exports.setLangRule = M;
 exports.t = N;

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", p = () => {
+import { reactive as g, ref as L, computed as w } from "vue";
+import { getUrlParams as D } from "@das-fed/upf-utils/common-tools";
+const C = "language", l = g({}), i = g({}), m = g({}), h = D(location.href, "uiCulture") || "", j = h || window.localStorage.getItem(C) || window.navigator.language || "zh-CN", c = L(j), b = "dasI18n", p = () => {
   const t = document.documentElement;
   t && t.setAttribute("lang", c.value);
 }, M = (t = {}, a) => {
@@ -9,36 +9,36 @@ 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]);
-  console.log("customLangeData===", i), console.log("globalLangeData===", l);
-}, b = (t = {}, a) => {
+      s[n] || (s[n] = {}), s[n][o] = t[o][n] ?? "", e && (i[n] || (i[n] = {}), i[n][o] = s[n][o]), r && (l[n] || (l[n] = {}, console.log(`${l[n]}为空，重新设置为{}`)), l[n][o] = s[n][o]);
+  console.log("customLangeData===注入", l), console.log("globalLangeData===注入", i);
+}, y = (t = {}, a) => {
   var s;
   const e = a === "global", r = !e;
   for (const o in t)
-    if (e && !l[o] && (l[o] = t[o]), r) {
+    if (e && !i[o] && (i[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]);
+      n && (m[n] || (m[n] = {}), m[n][o] = t[o]), l[o] || (l[o] = t[o]);
     }
 }, R = async (t) => {
   p();
-  const a = window[y];
-  a && b(a, "global");
+  const a = window[b];
+  a && y(a, "global");
 }, v = (t) => {
   let a = "";
   const e = /\/([^\/]+)\/([^\/]+)\//, r = t.match(e);
   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] || l[t] || r[t] || s[t] || t;
+  let r = m.framework ?? {}, s = m[e] ?? {}, o = l[t] || i[t] || r[t] || s[t] || t;
   if (o === t) return t;
-  console.log("customLangeData===222", i), typeof o == "string" && (o = { "zh-CN": o });
+  console.log("customLangeData===获取时", l, l[t]), console.log("globalLangeData===获取时", i, i[t]), 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), p();
-}, _ = () => c, g = {
+}, _ = () => c, u = {
   "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 = g[t] || g["zh-CN"];
+  const a = u[t] || u["zh-CN"];
   try {
     const e = await a.ant();
     return await a.dayjs(), e.default;
@@ -69,15 +69,15 @@ const O = async (t) => {
 };
 export {
   c as currentLang,
-  i as customLangeData,
+  l as customLangeData,
   x as getDateFormat,
   A as getI18nRule,
   _ as getLang,
   I as i18n,
   R as initI18n,
-  D as languageKey,
+  C as languageKey,
   O as loadLocale,
-  b as setI18nRule,
+  y as setI18nRule,
   T as setLang,
   M as setLangRule,
   N as t