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

package/packages/i18n/index.js

@@ -1,44 +1,74 @@
-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 = () => {
+import { reactive as p, ref as b, computed as j } from "vue";
+import { handleI18nData as D, getUrlParams as L } from "@das-fed/upf-utils/common-tools";
+import { getConfig as I } from "@das-fed/upf-utils/config";
+const x = {
+  loaded: {},
+  isLoaded(t, e) {
+    return !!(this.loaded[t] && this.loaded[t][e]);
+  },
+  markLoaded(t, e) {
+    this.loaded[t] || (this.loaded[t] = {}), this.loaded[t][e] = !0;
+  },
+  markUnloaded(t, e) {
+    this.loaded[t] && (delete this.loaded[t][e], Object.keys(this.loaded[t]).length === 0 && delete this.loaded[t]);
+  }
+}, U = async (t, e) => {
+  var m, u, g;
+  const o = I() || {}, a = ((m = o.i18n) == null ? void 0 : m.fromOss) ?? !0, s = ((u = o.i18n) == null ? void 0 : u.isPullBack) ?? !1, n = ((g = o.i18n) == null ? void 0 : g.isDasUI) ?? !0;
+  let r = "/oss/resource/";
+  try {
+    const l = await D({
+      baseUrl: a ? r : "/",
+      currentLang: e,
+      appName: t,
+      isPullBack: s,
+      fallbackBaseUrl: "/",
+      isDasUI: n
+    });
+    if (!l || !(l != null && l.frontEnd))
+      throw new Error("Failed to fetch i18n data");
+    return l;
+  } catch (h) {
+    throw new Error(`registerResources error: ${h}`);
+  }
+}, C = "language", i = p({}), c = p({}), d = p({}), M = L(location.href, "uiCulture") || "", O = M || window.localStorage.getItem(C) || window.navigator.language || "zh-CN", f = b(O), z = "dasI18n", E = () => {
   const t = document.documentElement;
-  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])
-      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) => {
+  t && t.setAttribute("lang", f.value);
+}, w = (t = {}, e) => {
+  const o = e === "global", a = !o, s = {};
+  for (const n in t)
+    for (const r in t[n])
+      s[r] || (s[r] = {}), s[r][n] = t[n][r] ?? "", o && (c[r] || (c[r] = {}), c[r][n] = s[r][n]), a && (i[r] || (i[r] = {}), i[r][n] = s[r][n]);
+  console.log("注册customLangeData", i);
+}, A = (t = {}, e) => {
   var s;
-  const e = a === "global", r = !e;
-  for (const o in t)
-    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]), l[o] || (l[o] = t[o]);
+  const o = e === "global", a = !o;
+  for (const n in t)
+    if (o && !c[n] && (c[n] = t[n]), a) {
+      const r = (s = t[n]) != null && s._appCode ? t[n]._appCode.toLowerCase() : "";
+      r && (d[r] || (d[r] = {}), d[r][n] = t[n]), i[n] || (i[n] = t[n]);
     }
-}, R = async (t) => {
-  p();
-  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 = l[t] || i[t] || r[t] || s[t] || t;
-  if (o === t) return t;
-  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, u = {
+  console.log("获取customLangeData", i);
+}, B = async (t) => {
+  E();
+  const e = window[z];
+  e && A(e, "global");
+}, N = (t) => {
+  let e = "";
+  const o = /\/([^\/]+)\/([^\/]+)\//, a = t.match(o);
+  return a && a.length >= 3 && (e = a[1] + "/" + a[2]), e ? e.toLowerCase() : "";
+}, R = (t, ...e) => j(() => {
+  const o = N(location.pathname);
+  let a = d.framework ?? {}, s = d[o] ?? {}, n = i[t] || c[t] || a[t] || s[t] || t;
+  if (n === t) return t;
+  typeof n == "string" && (n = { "zh-CN": n });
+  let r = n[f.value];
+  return f.value === "zh-CN" && n["zh-cn"] && !n["zh-CN"] && (r = n["zh-cn"]), e.map((m, u) => {
+    r && (r = r.replace(`$${u}`, m));
+  }), r;
+}), k = R, F = (t, ...e) => k(t, ...e).value, v = (t) => {
+  f.value = t, E();
+}, $ = () => f, y = {
   "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") },
@@ -53,32 +83,43 @@ const C = "language", l = g({}), i = g({}), m = g({}), h = D(location.href, "uiC
   "nl-NL": { ant: () => import("ant-design-vue/es/locale/nl_NL"), dayjs: () => import("dayjs/locale/nl") },
   "tr-TR": { ant: () => import("ant-design-vue/es/locale/tr_TR"), dayjs: () => import("dayjs/locale/tr") }
 };
-function x(t, a) {
-  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";
+function G(t, e) {
+  var a;
+  const o = window.DATE_FORMAT_MAP;
+  return o && o[t] && o[t][e] ? o[t][e] : ((a = window.DATE_FORMAT_MAP[t]) == null ? void 0 : a[e]) || "YYYY-MM-DD";
 }
-const O = async (t) => {
-  const a = u[t] || u["zh-CN"];
+const Y = async (t) => {
+  const e = y[t] || y["zh-CN"];
+  try {
+    const o = await e.ant();
+    return await e.dayjs(), o.default;
+  } catch (o) {
+    console.warn(`未找到对应的语言包: ${o}`);
+  }
+}, K = async (t = [], e = "zh-CN") => {
   try {
-    const e = await a.ant();
-    return await a.dayjs(), e.default;
-  } catch (e) {
-    console.warn(`未找到对应的语言包: ${e}`);
+    const o = await U(t, e);
+    o != null && o.frontEnd && typeof o.frontEnd == "object" && Object.keys(o.frontEnd).length && t.forEach((a) => {
+      o.frontEnd[a] && typeof o.frontEnd[a] == "object" && Object.keys(o.frontEnd[a]).length ? w({ [e]: o.frontEnd[a] }) : console.warn(`No front-end i18n data found for app: ${a}`);
+    }), o != null && o.dasUiEnd && typeof o.dasUiEnd == "object" && Object.keys(o.dasUiEnd).length && w({ [e]: o.dasUiEnd }), v(e);
+  } catch (o) {
+    console.error("registerMicroI18nData error:", o);
   }
 };
 export {
-  c as currentLang,
-  l as customLangeData,
-  x as getDateFormat,
-  A as getI18nRule,
-  _ as getLang,
-  I as i18n,
-  R as initI18n,
+  f as currentLang,
+  i as customLangeData,
+  G as getDateFormat,
+  R as getI18nRule,
+  $ as getLang,
+  k as i18n,
+  B as initI18n,
   C as languageKey,
-  O as loadLocale,
-  y as setI18nRule,
-  T as setLang,
-  M as setLangRule,
-  N as t
+  Y as loadLocale,
+  x as microI18nStore,
+  K as registerMicroI18nData,
+  A as setI18nRule,
+  v as setLang,
+  w as setLangRule,
+  F as t
 };

package/types/i18n/{microI18n.d.ts → getMicroI18nData.d.ts}

@@ -9,5 +9,4 @@ export declare const microI18nStore: {
     markLoaded(lang: langType, name: string): void;
     markUnloaded(lang: langType, name: string): void;
 };
-export declare const registerI18nData: (appName: string[], currentLang: langType) => Promise<Record<string, any>>;
-export declare const registerMicroI18nData: (i18nCodes?: string[], currentLang?: langType) => Promise<void>;
+export declare const getMicroI18nData: (appName: string[], currentLang: langType) => Promise<Record<string, any>>;

package/types/i18n/index.d.ts

@@ -1,3 +1,4 @@
+import { microI18nStore } from './getMicroI18nData';
 import { langType } from './type';
 
 declare const languageKey = "language";
@@ -25,4 +26,5 @@ declare const setLang: (lang: langType) => void;
 declare const getLang: () => import('vue').Ref<any, any>;
 export declare function getDateFormat(type: 'month' | 'date' | 'datetime' | 'time', lang: string): string;
 declare const loadLocale: (lang: string) => unknown;
-export { languageKey, initI18n, setI18nRule, getI18nRule, i18n, t, setLang, getLang, currentLang, setLangRule, customLangeData, loadLocale, };
+declare const registerMicroI18nData: (i18nCodes?: string[], currentLang?: langType) => Promise<void>;
+export { langType, languageKey, initI18n, setI18nRule, getI18nRule, i18n, t, setLang, getLang, currentLang, setLangRule, customLangeData, loadLocale, microI18nStore, registerMicroI18nData, };