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

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

@@ -1,59 +1,137 @@
-import { ref as v, createApp as x } from "vue";
-import { initTheme as w } from "@das-fed/upf-web/packages/theme/index";
-import { DasWebLayout as O } from "@das-fed/upf-web/packages/layout/index";
-import { registerMicroI18nData as P } from "@das-fed/upf-web/packages/i18n/register";
-import { createPinia as W } from "pinia";
-import $ from "pinia-plugin-persistedstate";
-import { createRouter as j, createWebHistory as D } from "vue-router";
-const k = {
-  install: (e, a) => {
-    var l;
-    const c = (l = a == null ? void 0 : a.plugins) == null ? void 0 : l.glob;
-    c && Object.values(c).sort((t, u) => (t.index ?? 0) - (u.index ?? 0)).filter((t) => t ? !!(t.default && t.default.install || t.install) : !1).forEach((t) => {
-      t.default && t.default.install && e.use(t.default, a), t.install && e.use(t, a);
+import { reactive as L, ref as j, 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);
     });
   }
-}, d = W();
-d.use($);
-const y = (e) => {
-  var h, b, p, g, A;
-  const a = ((h = e == null ? void 0 : e.router) == null ? void 0 : h.routerBase) ?? "/", c = ((b = e == null ? void 0 : e.router) == null ? void 0 : b.options) || {};
-  let l = Object.assign(((p = e == null ? void 0 : e.router) == null ? void 0 : p.glob) || {});
-  const t = Object.values(l).filter((f) => !!f).flat().sort((f, m) => (f.index ?? 0) - (m.index ?? 0)), u = [];
-  (g = e == null ? void 0 : e.microApps) == null || g.map((f) => {
-    var R;
-    const m = Object.values(((R = f.router) == null ? void 0 : R.glob) || {}).filter((r) => !!r).flat().sort((r, o) => (r.index ?? 0) - (o.index ?? 0));
-    u.push(
-      ...m.map((r) => ({ ...r, path: `/${f.microAppName}${r.path}` }))
-    ), u.push(
-      ...m.filter((r) => !!r.path).filter((r) => r.path !== "").filter((r) => r.path !== "/").filter((r) => !r.path.startsWith(`/${r.microAppName}`)).map((r) => ({
-        path: r.path,
-        redirect: `/${f.microAppName}${r.path}`,
-        meta: { ...r.meta || {}, isMicroAppRouteRedirect: !0 }
+}, 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 = () => {
+  const e = document.documentElement;
+  e && e.setAttribute("lang", $.value);
+}, R = (e = {}, n) => {
+  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 = {
+  loaded: {},
+  isLoaded(e) {
+    return !!this.loaded[e];
+  },
+  markLoaded(e) {
+    this.loaded[e] = !0;
+  },
+  markUnloaded(e) {
+    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;
+  let i = "/oss/resource/";
+  try {
+    const f = await S({
+      baseUrl: a ? i : "/",
+      currentLang: n,
+      appName: e,
+      isPullBack: t,
+      fallbackBaseUrl: "/",
+      isDasUI: s
+    });
+    if (!f || !(f != null && f.frontEnd))
+      throw new Error("Failed to fetch i18n data");
+    return f;
+  } catch (h) {
+    throw new Error(`registerResources error: ${h}`);
+  }
+}, Q = async (e = []) => {
+  const n = O(location.href, "uiCulture") || window.localStorage.getItem(P) || window.navigator.language || "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);
+  } 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) => ({
+        path: c.path,
+        redirect: `/${u.microAppName}${c.path}`,
+        meta: { ...c.meta || {}, isMicroAppRouteRedirect: !0 }
       }))
     );
   });
-  const s = ((A = e == null ? void 0 : e.router) == null ? void 0 : A.routers) || [], n = [
-    ...i(t, e),
-    ...i(s, e),
-    ...i(u, e)
-  ];
-  return { router: j({ history: D(a), routes: n, ...c }) };
-}, i = (e, a) => e.map((c) => {
-  const l = c.meta || {};
-  return l.keepAlive = l.keepAlive ?? (a == null ? void 0 : a.keepAlive) ?? !0, { ...c, meta: l };
-}), q = (e) => {
-  var n;
+  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) => {
+      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 x = typeof m == "string" ? [m] : m;
+          typeof l.markLoaded == "function" && l.markLoaded(b);
+          try {
+            await Q(x);
+          } catch {
+            typeof l.markUnloaded == "function" && l.markUnloaded(b);
+          }
+          break;
+        }
+      } catch {
+      } finally {
+        c();
+      }
+    });
+  }
+  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;
   e || (e = {});
-  const a = v(!0);
-  Promise.all([w(e), P(e)]).then(() => {
-    a.value = !1;
+  const n = j(!0);
+  Promise.all([I(e)]).then(() => {
+    n.value = !1;
   });
-  const { container: c, component: l, props: t } = (e == null ? void 0 : e.root) || {}, u = x(l || O, t);
-  u.use(k, e), u.use(d);
-  const { router: s } = y(e);
-  return u.use(s), u.mount(c || "#app"), (n = window.top) != null && n.vueRouter || window.top && (window.top.vueRouter = s), { app: u, router: s, loading: a, store: d };
+  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 };
 };
 export {
-  q as createDasWebApp
+  ce as createDasWebApp
 };

package/types/i18n/microI18n.d.ts

@@ -0,0 +1,13 @@
+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;
+};
+export declare const registerI18nData: (appName: string[], currentLang: langType) => Promise<Record<string, any>>;
+export declare const registerMicroI18nData: (i18nCodes?: string[]) => Promise<void>;

package/types/index.d.ts

@@ -1,6 +1,5 @@
 export * from './create-das-web-app';
 export * from './i18n';
-export * from './i18n/register';
 export * from './theme';
 export * from './layout';
 export * from './micro-frontend';

package/types/i18n/register.d.ts

@@ -1,4 +0,0 @@
-import { langType } from './type';
-
-export declare const registerI18nData: (appName: string[], currentLang: langType, cb: any) => Promise<void>;
-export declare const registerMicroI18nData: (opt?: any) => void;