@das-fed/upf-web 6.4.0-dev.203 → 6.4.0-dev.204

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

@@ -1,112 +1,112 @@
-import { reactive as L, ref as j, createApp as B } from "vue";
+import { reactive as U, ref as O, createApp as B } from "vue";
 import { initTheme as I } from "@das-fed/upf-web/packages/theme/index";
-import { DasWebLayout as N } from "@das-fed/upf-web/packages/layout/index";
-import { createPinia as D } from "pinia";
-import W from "pinia-plugin-persistedstate";
-import { createRouter as C, createWebHistory as M } from "vue-router";
-import { getUrlParams as O, handleI18nData as S } from "@das-fed/upf-utils/common-tools";
-import { getConfig as z } from "@das-fed/upf-utils/config";
-const H = {
-  install: (e, n) => {
-    var a;
-    const r = (a = n == null ? void 0 : n.plugins) == null ? void 0 : a.glob;
-    r && Object.values(r).sort((t, s) => (t.index ?? 0) - (s.index ?? 0)).filter((t) => t ? !!(t.default && t.default.install || t.install) : !1).forEach((t) => {
-      t.default && t.default.install && e.use(t.default, n), t.install && e.use(t, n);
+import { DasWebLayout as D } from "@das-fed/upf-web/packages/layout/index";
+import { createPinia as W } from "pinia";
+import C from "pinia-plugin-persistedstate";
+import { createRouter as M, createWebHistory as S } from "vue-router";
+import { getUrlParams as z, handleI18nData as H } from "@das-fed/upf-utils/common-tools";
+import { getConfig as K } from "@das-fed/upf-utils/config";
+const q = {
+  install: (e, t) => {
+    var s;
+    const r = (s = t == null ? void 0 : t.plugins) == null ? void 0 : s.glob;
+    r && Object.values(r).sort((a, o) => (a.index ?? 0) - (o.index ?? 0)).filter((a) => a ? !!(a.default && a.default.install || a.install) : !1).forEach((a) => {
+      a.default && a.default.install && e.use(a.default, t), a.install && e.use(a, t);
     });
   }
-}, E = D();
-E.use(W);
-const P = "language", A = L({});
-L({});
-L({});
-const K = O(location.href, "uiCulture") || "", F = K || window.localStorage.getItem(P) || window.navigator.language || "zh-CN", $ = j(F), G = () => {
+}, v = W();
+v.use(C);
+const N = "language", k = U({});
+U({});
+U({});
+const F = z(location.href, "uiCulture") || "", G = F || window.localStorage.getItem(N) || window.navigator.language || "zh-CN", P = O(G), T = () => {
   const e = document.documentElement;
-  e && e.setAttribute("lang", $.value);
-}, R = (e = {}, n) => {
+  e && e.setAttribute("lang", P.value);
+}, L = (e = {}, t) => {
   const r = {};
-  for (const a in e)
-    for (const t in e[a])
-      r[t] || (r[t] = {}), r[t][a] = e[a][t] ?? "", A[t] || (A[t] = {}), A[t][a] = r[t][a];
-}, T = (e) => {
-  $.value = e, G();
-}, q = {
+  for (const s in e)
+    for (const a in e[s])
+      r[a] || (r[a] = {}), r[a][s] = e[s][a] ?? "", k[a] || (k[a] = {}), k[a][s] = r[a][s];
+}, J = (e) => {
+  P.value = e, T();
+}, Q = {
   loaded: {},
-  isLoaded(e) {
-    return !!this.loaded[e];
+  isLoaded(e, t) {
+    return !!(this.loaded[e] && this.loaded[e][t]);
   },
-  markLoaded(e) {
-    this.loaded[e] = !0;
+  markLoaded(e, t) {
+    this.loaded[e] || (this.loaded[e] = {}), this.loaded[e][t] = !0;
   },
-  markUnloaded(e) {
-    delete this.loaded[e];
+  markUnloaded(e, t) {
+    this.loaded[e] && (delete this.loaded[e][t], Object.keys(this.loaded[e]).length === 0 && delete this.loaded[e]);
   }
-}, J = async (e, n) => {
-  var d, g, l;
-  const r = z() || {}, a = ((d = r.i18n) == null ? void 0 : d.fromOss) ?? !0, t = ((g = r.i18n) == null ? void 0 : g.isPullBack) ?? !1, s = ((l = r.i18n) == null ? void 0 : l.isDasUI) ?? !0;
+}, V = async (e, t) => {
+  var f, h, d;
+  const r = K() || {}, s = ((f = r.i18n) == null ? void 0 : f.fromOss) ?? !0, a = ((h = r.i18n) == null ? void 0 : h.isPullBack) ?? !1, o = ((d = r.i18n) == null ? void 0 : d.isDasUI) ?? !0;
   let i = "/oss/resource/";
   try {
-    const f = await S({
-      baseUrl: a ? i : "/",
-      currentLang: n,
+    const u = await H({
+      baseUrl: s ? i : "/",
+      currentLang: t,
       appName: e,
-      isPullBack: t,
+      isPullBack: a,
       fallbackBaseUrl: "/",
-      isDasUI: s
+      isDasUI: o
     });
-    if (!f || !(f != null && f.frontEnd))
+    if (!u || !(u != null && u.frontEnd))
       throw new Error("Failed to fetch i18n data");
-    return f;
-  } catch (h) {
-    throw new Error(`registerResources error: ${h}`);
+    return u;
+  } catch (g) {
+    throw new Error(`registerResources error: ${g}`);
   }
-}, Q = async (e = []) => {
-  const n = O(location.href, "uiCulture") || window.localStorage.getItem(P) || window.navigator.language || "zh-CN";
+}, X = async (e = [], t = "zh-CN") => {
   try {
-    const r = await J(e, n);
-    r != null && r.frontEnd && typeof r.frontEnd == "object" && Object.keys(r.frontEnd).length && e.forEach((a) => {
-      r.frontEnd[a] && typeof r.frontEnd[a] == "object" && Object.keys(r.frontEnd[a]).length && R({ [n]: r.frontEnd[a] });
-    }), r != null && r.dasUiEnd && typeof r.dasUiEnd == "object" && Object.keys(r.dasUiEnd).length && R({ [n]: r.dasUiEnd }), T(n);
+    const r = await V(e, t);
+    r != null && r.frontEnd && typeof r.frontEnd == "object" && Object.keys(r.frontEnd).length && e.forEach((s) => {
+      r.frontEnd[s] && typeof r.frontEnd[s] == "object" && Object.keys(r.frontEnd[s]).length && L({ [t]: r.frontEnd[s] });
+    }), r != null && r.dasUiEnd && typeof r.dasUiEnd == "object" && Object.keys(r.dasUiEnd).length && L({ [t]: r.dasUiEnd }), J(t);
   } catch {
   }
-}, V = (e) => {
-  var h, p, f, U, v;
-  const n = ((h = e == null ? void 0 : e.router) == null ? void 0 : h.routerBase) ?? "/", r = ((p = e == null ? void 0 : e.router) == null ? void 0 : p.options) || {};
-  let a = Object.assign(((f = e == null ? void 0 : e.router) == null ? void 0 : f.glob) || {});
-  const t = Object.values(a).filter((u) => !!u).flat().sort((u, o) => (u.index ?? 0) - (o.index ?? 0)), s = [];
-  (U = e == null ? void 0 : e.microApps) == null || U.map((u) => {
-    var w;
-    const o = Object.values(((w = u.router) == null ? void 0 : w.glob) || {}).filter((c) => !!c).flat().sort((c, y) => (c.index ?? 0) - (y.index ?? 0));
-    s.push(
-      ...o.map((c) => ({ ...c, path: `/${u.microAppName}${c.path}` }))
-    ), s.push(
-      ...o.filter((c) => !!c.path).filter((c) => c.path !== "").filter((c) => c.path !== "/").filter((c) => !c.path.startsWith(`/${c.microAppName}`)).map((c) => ({
+}, Y = (e) => {
+  var g, p, u, R, j;
+  const t = ((g = e == null ? void 0 : e.router) == null ? void 0 : g.routerBase) ?? "/", r = ((p = e == null ? void 0 : e.router) == null ? void 0 : p.options) || {};
+  let s = Object.assign(((u = e == null ? void 0 : e.router) == null ? void 0 : u.glob) || {});
+  const a = Object.values(s).filter((l) => !!l).flat().sort((l, n) => (l.index ?? 0) - (n.index ?? 0)), o = [];
+  (R = e == null ? void 0 : e.microApps) == null || R.map((l) => {
+    var A;
+    const n = Object.values(((A = l.router) == null ? void 0 : A.glob) || {}).filter((c) => !!c).flat().sort((c, w) => (c.index ?? 0) - (w.index ?? 0));
+    o.push(
+      ...n.map((c) => ({ ...c, path: `/${l.microAppName}${c.path}` }))
+    ), o.push(
+      ...n.filter((c) => !!c.path).filter((c) => c.path !== "").filter((c) => c.path !== "/").filter((c) => !c.path.startsWith(`/${c.microAppName}`)).map((c) => ({
         path: c.path,
-        redirect: `/${u.microAppName}${c.path}`,
+        redirect: `/${l.microAppName}${c.path}`,
         meta: { ...c.meta || {}, isMicroAppRouteRedirect: !0 }
       }))
     );
   });
-  const i = ((v = e == null ? void 0 : e.router) == null ? void 0 : v.routers) || [], d = [
-    ...k(t, e),
-    ...k(i, e),
-    ...k(s, e)
-  ], g = C({ history: M(n), routes: d, ...r }), l = q;
-  if (Array.isArray(e == null ? void 0 : e.microApps) && e.microApps.length && l) {
-    const u = /* @__PURE__ */ new Map();
-    for (const o of e.microApps)
-      o != null && o.microAppName && (o != null && o.i18n) && u.set(o.microAppName, o.i18n);
-    g.beforeEach(async (o, w, c) => {
+  const i = ((j = e == null ? void 0 : e.router) == null ? void 0 : j.routers) || [], f = [
+    ...E(a, e),
+    ...E(i, e),
+    ...E(o, e)
+  ], h = M({ history: S(t), routes: f, ...r }), d = Q;
+  if (Array.isArray(e == null ? void 0 : e.microApps) && e.microApps.length && d) {
+    const l = /* @__PURE__ */ new Map();
+    for (const n of e.microApps)
+      n != null && n.microAppName && (n != null && n.i18n) && l.set(n.microAppName, n.i18n);
+    h.beforeEach(async (n, A, c) => {
+      var w;
       try {
-        const y = o.path || "";
-        for (const [b, m] of u.entries()) {
-          if (!b || !y.toLowerCase().startsWith(`/${b.toLowerCase()}`)) continue;
-          if (typeof l.isLoaded == "function" && l.isLoaded(b) || !m || !(m != null && m.length)) break;
+        const b = ((w = n.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem(N) || window.navigator.language || "zh-CN", $ = n.path || "";
+        for (const [y, m] of l.entries()) {
+          if (!y || !$.toLowerCase().startsWith(`/${y.toLowerCase()}`)) continue;
+          if (d.isLoaded(b, y) || !m || !(m != null && m.length)) break;
           const x = typeof m == "string" ? [m] : m;
-          typeof l.markLoaded == "function" && l.markLoaded(b);
+          d.markLoaded(b, y);
           try {
-            await Q(x);
+            await X(x, b);
           } catch {
-            typeof l.markUnloaded == "function" && l.markUnloaded(b);
+            d.markUnloaded(b, y);
           }
           break;
         }
@@ -116,22 +116,22 @@ const K = O(location.href, "uiCulture") || "", F = K || window.localStorage.getI
       }
     });
   }
-  return { router: g };
-}, k = (e, n) => e.map((r) => {
-  const a = r.meta || {};
-  return a.keepAlive = a.keepAlive ?? (n == null ? void 0 : n.keepAlive) ?? !0, { ...r, meta: a };
-}), ce = (e) => {
-  var d;
+  return { router: h };
+}, E = (e, t) => e.map((r) => {
+  const s = r.meta || {};
+  return s.keepAlive = s.keepAlive ?? (t == null ? void 0 : t.keepAlive) ?? !0, { ...r, meta: s };
+}), oe = (e) => {
+  var f;
   e || (e = {});
-  const n = j(!0);
+  const t = O(!0);
   Promise.all([I(e)]).then(() => {
-    n.value = !1;
+    t.value = !1;
   });
-  const { container: r, component: a, props: t } = (e == null ? void 0 : e.root) || {}, s = B(a || N, t);
-  s.use(H, e), s.use(E);
-  const { router: i } = V(e);
-  return s.use(i), s.mount(r || "#app"), (d = window.top) != null && d.vueRouter || window.top && (window.top.vueRouter = i), { app: s, router: i, loading: n, store: E };
+  const { container: r, component: s, props: a } = (e == null ? void 0 : e.root) || {}, o = B(s || D, a);
+  o.use(q, e), o.use(v);
+  const { router: i } = Y(e);
+  return o.use(i), o.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = i), { app: o, router: i, loading: t, store: v };
 };
 export {
-  ce as createDasWebApp
+  oe as createDasWebApp
 };

package/types/i18n/microI18n.d.ts

@@ -4,10 +4,10 @@ import { langType } from './type';
  * 内存存储：记录本次页面会话中哪些 micro app 的 i18n 已加载。
  */
 export declare const microI18nStore: {
-    loaded: Record<string, boolean>;
-    isLoaded(name: string): boolean;
-    markLoaded(name: string): void;
-    markUnloaded(name: string): void;
+    loaded: Record<string, Record<string, boolean>>;
+    isLoaded(lang: langType, name: string): boolean;
+    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[]) => Promise<void>;
+export declare const registerMicroI18nData: (i18nCodes?: string[], currentLang?: langType) => Promise<void>;