@das-fed/upf-web 6.4.0-dev.192 → 6.4.0-dev.193

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

@@ -1,59 +1,59 @@
-import { ref as o, createApp as x } from "vue";
-import { initTheme as w } from "@das-fed/upf-web/packages/theme/index";
-import { initI18n as O } from "@das-fed/upf-web/packages/i18n/index";
-import { DasWebLayout as P } from "@das-fed/upf-web/packages/layout/index";
-import { createPinia as W } from "pinia";
-import $ from "pinia-plugin-persistedstate";
-import { createRouter as j, createWebHistory as k } from "vue-router";
-const y = {
-  install: (e, u) => {
+import { ref as v, createApp as w } from "vue";
+import { initTheme as x } from "@das-fed/upf-web/packages/theme/index";
+import { initI18n as L } from "@das-fed/upf-web/packages/i18n/index";
+import { DasWebLayout as O } from "@das-fed/upf-web/packages/layout/index";
+import { createPinia as P } from "pinia";
+import W from "pinia-plugin-persistedstate";
+import { createRouter as $, createWebHistory as j } from "vue-router";
+const k = {
+  install: (e, a) => {
     var l;
-    const c = (l = u == null ? void 0 : u.plugins) == null ? void 0 : l.glob;
-    c && Object.values(c).sort((t, a) => (t.index ?? 0) - (a.index ?? 0)).filter((t) => t ? !!(t.default && t.default.install || t.install) : !1).forEach((t) => {
-      t.default && t.default.install && e.use(t.default, u), t.install && e.use(t, u);
+    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);
     });
   }
-}, d = W();
-d.use($);
-const D = (e) => {
-  var h, b, p, A, g;
-  const u = ((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)), a = [];
-  (A = e == null ? void 0 : e.microApps) == null || A.map((f) => {
-    var R;
-    const m = Object.values(((R = f.router) == null ? void 0 : R.glob) || {}).filter((r) => !!r).flat().sort((r, v) => (r.index ?? 0) - (v.index ?? 0));
-    a.push(
-      ...m.map((r) => ({ ...r, path: `/${f.microAppName}${r.path}` }))
-    ), a.push(
-      ...m.filter((r) => !!r.path).filter((r) => r.path !== "").filter((r) => r.path !== "/").filter((r) => !r.path.startsWith(`/${r.microAppName}`)).map((r) => ({
+}, i = P();
+i.use(W);
+const y = (e) => {
+  var d, h, b, g, p;
+  const a = ((d = e == null ? void 0 : e.router) == null ? void 0 : d.routerBase) ?? "/", c = ((h = e == null ? void 0 : e.router) == null ? void 0 : h.options) || {};
+  let l = Object.assign(((b = e == null ? void 0 : e.router) == null ? void 0 : b.glob) || {});
+  const t = Object.values(l).filter((s) => !!s).flat().sort((s, m) => (s.index ?? 0) - (m.index ?? 0)), u = [];
+  (g = e == null ? void 0 : e.microApps) == null || g.map((s) => {
+    var A;
+    const m = Object.values(((A = s.router) == null ? void 0 : A.glob) || {}).filter((r) => !!r).flat().sort((r, R) => (r.index ?? 0) - (R.index ?? 0));
+    u.push(
+      ...m.map((r) => ({ ...r, path: `/${s.microAppName}${r.path}` }))
+    ), u.push(
+      ...m.filter((r) => !!r.path).filter((r) => r.path !== "").filter((r) => r.path !== "/").filter((r) => !r.path.toLocaleLowerCase().startsWith(`/${r.microAppName}`.toLocaleLowerCase())).map((r) => ({
         path: r.path,
-        redirect: `/${f.microAppName}${r.path}`,
+        redirect: `/${s.microAppName}${r.path}`,
         meta: { ...r.meta || {}, isMicroAppRouteRedirect: !0 }
       }))
     );
   });
-  const s = ((g = e == null ? void 0 : e.router) == null ? void 0 : g.routers) || [], n = [
-    ...i(t, e),
-    ...i(s, e),
-    ...i(a, e)
+  const f = ((p = e == null ? void 0 : e.router) == null ? void 0 : p.routers) || [], n = [
+    ...o(t, e),
+    ...o(f, e),
+    ...o(u, e)
   ];
-  return { router: j({ history: k(u), routes: n, ...c }) };
-}, i = (e, u) => e.map((c) => {
+  return console.log("routerBase====", a), console.log("routes====", n), { router: $({ history: j(a), routes: n, ...c }) };
+}, o = (e, a) => e.map((c) => {
   const l = c.meta || {};
-  return l.keepAlive = l.keepAlive ?? (u == null ? void 0 : u.keepAlive) ?? !0, { ...c, meta: l };
-}), q = (e) => {
+  return l.keepAlive = l.keepAlive ?? (a == null ? void 0 : a.keepAlive) ?? !0, { ...c, meta: l };
+}), T = (e) => {
   var n;
   e || (e = {});
-  const u = o(!0);
-  Promise.all([w(e), O(e)]).then(() => {
-    u.value = !1;
+  const a = v(!0);
+  Promise.all([x(e), L(e)]).then(() => {
+    a.value = !1;
   });
-  const { container: c, component: l, props: t } = (e == null ? void 0 : e.root) || {}, a = x(l || P, t);
-  a.use(y, e), a.use(d);
-  const { router: s } = D(e);
-  return a.use(s), a.mount(c || "#app"), (n = window.top) != null && n.vueRouter || window.top && (window.top.vueRouter = s), { app: a, router: s, loading: u, store: d };
+  const { container: c, component: l, props: t } = (e == null ? void 0 : e.root) || {}, u = w(l || O, t);
+  u.use(k, e), u.use(i);
+  const { router: f } = y(e);
+  return u.use(f), u.mount(c || "#app"), (n = window.top) != null && n.vueRouter || window.top && (window.top.vueRouter = f), { app: u, router: f, loading: a, store: i };
 };
 export {
-  q as createDasWebApp
+  T as createDasWebApp
 };

package/packages/i18n/es5.js

@@ -867,6 +867,7 @@ var l = {
           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);
         }

package/packages/i18n/index.js

@@ -180,7 +180,8 @@ const l = {
   try {
     const n = await r.ant();
     return await r.dayjs(), n.default;
-  } catch {
+  } catch (n) {
+    console.warn(`未找到对应的语言包: ${n}`);
   }
 };
 export {