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

package/packages/i18n/es5.js

@@ -8,38 +8,40 @@ 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 h = "language",
-  s = vue.reactive({}),
-  c = vue.reactive({}),
+var D = "language",
+  i = vue.reactive({}),
   l = vue.reactive({}),
-  j = commonTools.getUrlParams(location.href, "uiCulture") || "",
-  y = j || window.localStorage.getItem(h) || window.navigator.language || "zh-CN",
-  m = vue.ref(y),
-  D = "dasI18n",
+  m = vue.reactive({}),
+  h = commonTools.getUrlParams(location.href, "uiCulture") || "",
+  j = h || window.localStorage.getItem(D) || window.navigator.language || "zh-CN",
+  c = vue.ref(j),
+  y = "dasI18n",
   g = function g() {
     var t = document.documentElement;
-    t && t.setAttribute("lang", m.value);
+    t && t.setAttribute("lang", c.value);
   },
-  v = function v() {
+  M = function M() {
     var t = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var a = arguments.length > 1 ? arguments[1] : undefined;
-    var r = a === "global",
-      e = !r,
-      i = {};
+    var e = a === "global",
+      r = !e;
+    console.log("setLangRule===", t, a);
+    var s = {};
     for (var o in t) for (var n in t[o]) {
       var _t$o$n;
-      i[n] || (i[n] = {}), i[n][o] = (_t$o$n = t[o][n]) !== null && _t$o$n !== void 0 ? _t$o$n : "", r && (c[n] || (c[n] = {}), c[n][o] = i[n][o]), e && (s[n] || (s[n] = {}), s[n][o] = i[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] : {};
     var a = arguments.length > 1 ? arguments[1] : undefined;
-    var i;
-    var r = a === "global",
-      e = !r;
-    for (var o in t) if (r && !c[o] && (c[o] = t[o]), e) {
-      var n = (i = t[o]) != null && i._appCode ? t[o]._appCode.toLowerCase() : "";
-      n && (l[n] || (l[n] = {}), l[n][o] = t[o]), s[o] || (s[o] = t[o]);
+    var s;
+    var e = a === "global",
+      r = !e;
+    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]);
     }
   },
   R = /*#__PURE__*/function () {
@@ -49,7 +51,7 @@ var h = "language",
         while (1) switch (_context.n) {
           case 0:
             g();
-            a = window[D];
+            a = window[y];
             a && b(a, "global");
           case 1:
             return _context.a(2);
@@ -60,46 +62,46 @@ var h = "language",
       return _ref.apply(this, arguments);
     };
   }(),
-  A = function A(t) {
+  v = function v(t) {
     var a = "";
-    var r = /\/([^\/]+)\/([^\/]+)\//,
-      e = t.match(r);
-    return e && e.length >= 3 && (a = e[1] + "/" + e[2]), a ? a.toLowerCase() : "";
+    var e = /\/([^\/]+)\/([^\/]+)\//,
+      r = t.match(e);
+    return r && r.length >= 3 && (a = r[1] + "/" + r[2]), a ? a.toLowerCase() : "";
   },
-  I = function I(t) {
+  A = function A(t) {
     for (var _len = arguments.length, a = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       a[_key - 1] = arguments[_key];
     }
     return vue.computed(function () {
-      var _l$framework, _l$r;
-      var r = A(location.pathname);
-      var e = (_l$framework = l.framework) !== null && _l$framework !== void 0 ? _l$framework : {},
-        i = (_l$r = l[r]) !== null && _l$r !== void 0 ? _l$r : {},
-        o = s[t] || c[t] || e[t] || i[t] || t;
+      var _m$framework, _m$e;
+      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;
       if (o === t) return t;
       typeof o == "string" && (o = {
         "zh-CN": o
       });
-      var n = o[m.value];
-      return m.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;
     });
   },
-  z = I,
+  I = A,
   N = function N(t) {
     for (var _len2 = arguments.length, a = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
       a[_key2 - 1] = arguments[_key2];
     }
-    return z.apply(void 0, [t].concat(a)).value;
+    return I.apply(void 0, [t].concat(a)).value;
   },
   T = function T(t) {
-    m.value = t, g();
+    c.value = t, console.log("currentLang.value===", c.value), g();
   },
   _ = function _() {
-    return m;
+    return c;
   },
-  u = {
+  p = {
     "en-US": {
       ant: function ant() {
         return Promise.resolve().then(function () {
@@ -258,29 +260,30 @@ var h = "language",
     }
   };
 function x(t, a) {
-  var e;
-  var r = window.DATE_FORMAT_MAP;
-  return r && r[t] && r[t][a] ? r[t][a] : ((e = window.DATE_FORMAT_MAP[t]) == null ? undefined : e[a]) || "YYYY-MM-DD";
+  var r;
+  var e = window.DATE_FORMAT_MAP;
+  return e && e[t] && e[t][a] ? e[t][a] : ((r = window.DATE_FORMAT_MAP[t]) == null ? undefined : r[a]) || "YYYY-MM-DD";
 }
 var O = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(t) {
-    var a, r, _t;
+    var a, e, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          a = u[t] || u["zh-CN"];
+          a = p[t] || p["zh-CN"];
           _context2.p = 1;
           _context2.n = 2;
           return a.ant();
         case 2:
-          r = _context2.v;
+          e = _context2.v;
           _context2.n = 3;
           return a.dayjs();
         case 3:
-          return _context2.a(2, r["default"]);
+          return _context2.a(2, e["default"]);
         case 4:
           _context2.p = 4;
           _t = _context2.v;
+          console.warn("\u672A\u627E\u5230\u5BF9\u5E94\u7684\u8BED\u8A00\u5305: ".concat(_t));
         case 5:
           return _context2.a(2);
       }
@@ -290,16 +293,16 @@ var O = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-exports.currentLang = m;
-exports.customLangeData = s;
+exports.currentLang = c;
+exports.customLangeData = i;
 exports.getDateFormat = x;
-exports.getI18nRule = I;
+exports.getI18nRule = A;
 exports.getLang = _;
-exports.i18n = z;
+exports.i18n = I;
 exports.initI18n = R;
-exports.languageKey = h;
+exports.languageKey = D;
 exports.loadLocale = O;
 exports.setI18nRule = b;
 exports.setLang = T;
-exports.setLangRule = v;
+exports.setLangRule = M;
 exports.t = N;

package/packages/i18n/index.js

@@ -1,41 +1,44 @@
-import { reactive as p, ref as w, computed as C } from "vue";
-import { getUrlParams as L } from "@das-fed/upf-utils/common-tools";
-const h = "language", s = p({}), c = p({}), l = p({}), j = L(location.href, "uiCulture") || "", y = j || window.localStorage.getItem(h) || window.navigator.language || "zh-CN", m = w(y), D = "dasI18n", g = () => {
+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 t = document.documentElement;
-  t && t.setAttribute("lang", m.value);
-}, v = (t = {}, a) => {
-  const r = a === "global", e = !r, i = {};
+  t && t.setAttribute("lang", c.value);
+}, M = (t = {}, a) => {
+  const e = a === "global", r = !e;
+  console.log("setLangRule===", t, a);
+  const s = {};
   for (const o in t)
     for (const n in t[o])
-      i[n] || (i[n] = {}), i[n][o] = t[o][n] ?? "", r && (c[n] || (c[n] = {}), c[n][o] = i[n][o]), e && (s[n] || (s[n] = {}), s[n][o] = i[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 i;
-  const r = a === "global", e = !r;
+  var s;
+  const e = a === "global", r = !e;
   for (const o in t)
-    if (r && !c[o] && (c[o] = t[o]), e) {
-      const n = (i = t[o]) != null && i._appCode ? t[o]._appCode.toLowerCase() : "";
-      n && (l[n] || (l[n] = {}), l[n][o] = t[o]), s[o] || (s[o] = t[o]);
+    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]);
     }
 }, R = async (t) => {
   g();
-  const a = window[D];
+  const a = window[y];
   a && b(a, "global");
-}, A = (t) => {
+}, v = (t) => {
   let a = "";
-  const r = /\/([^\/]+)\/([^\/]+)\//, e = t.match(r);
-  return e && e.length >= 3 && (a = e[1] + "/" + e[2]), a ? a.toLowerCase() : "";
-}, I = (t, ...a) => C(() => {
-  const r = A(location.pathname);
-  let e = l.framework ?? {}, i = l[r] ?? {}, o = s[t] || c[t] || e[t] || i[t] || t;
+  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;
   if (o === t) return t;
   typeof o == "string" && (o = { "zh-CN": o });
-  let n = o[m.value];
-  return m.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (n = o["zh-cn"]), a.map((f, d) => {
+  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;
-}), z = I, N = (t, ...a) => z(t, ...a).value, T = (t) => {
-  m.value = t, g();
-}, _ = () => m, u = {
+}), I = A, N = (t, ...a) => I(t, ...a).value, T = (t) => {
+  c.value = t, console.log("currentLang.value===", c.value), g();
+}, _ = () => c, p = {
   "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") },
@@ -51,30 +54,31 @@ const h = "language", s = p({}), c = p({}), l = p({}), j = L(location.href, "uiC
   "tr-TR": { ant: () => import("ant-design-vue/es/locale/tr_TR"), dayjs: () => import("dayjs/locale/tr") }
 };
 function x(t, a) {
-  var e;
-  const r = window.DATE_FORMAT_MAP;
-  return r && r[t] && r[t][a] ? r[t][a] : ((e = window.DATE_FORMAT_MAP[t]) == null ? void 0 : e[a]) || "YYYY-MM-DD";
+  var r;
+  const e = window.DATE_FORMAT_MAP;
+  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 = u[t] || u["zh-CN"];
+  const a = p[t] || p["zh-CN"];
   try {
-    const r = await a.ant();
-    return await a.dayjs(), r.default;
-  } catch {
+    const e = await a.ant();
+    return await a.dayjs(), e.default;
+  } catch (e) {
+    console.warn(`未找到对应的语言包: ${e}`);
   }
 };
 export {
-  m as currentLang,
-  s as customLangeData,
+  c as currentLang,
+  i as customLangeData,
   x as getDateFormat,
-  I as getI18nRule,
+  A as getI18nRule,
   _ as getLang,
-  z as i18n,
+  I as i18n,
   R as initI18n,
-  h as languageKey,
+  D as languageKey,
   O as loadLocale,
   b as setI18nRule,
   T as setLang,
-  v as setLangRule,
+  M as setLangRule,
   N as t
 };