@das-fed/web 7.1.0-seres.2 → 7.1.0-seres.3

package/{packages/main-app-framework/index-BLOwaLgb.js → index-BXQDETIt.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as r } from "vue";
-import { _ as c } from "./index-CuDzwEwX.js";
+import { _ as c } from "./index-B2tm6y5q.js";
 const o = {};
 function t(n, _) {
   return r(), e("div");

package/{packages/main-app-framework/index-CwPhZ7VL.js → index-pdSO7wip.js}

@@ -6,7 +6,7 @@ import { DasSpin as T } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as b } from "@das-fed/utils/common-info";
 import { setShowLayout as E } from "@das-fed/utils/common-tools";
 import { createService as L } from "@das-fed/utils/create-api-service";
-import { u as P, p as q, a as u, c as d, b as B, l as K, g as M, d as N } from "./index-CuDzwEwX.js";
+import { u as P, p as q, a as u, c as d, b as B, l as K, g as M, d as N } from "./index-B2tm6y5q.js";
 const O = "v1", V = L(`/api/justauth/client/${O}`), F = V.get("/visitor/kingdee/auth/user/auth_code"), ee = /* @__PURE__ */ v({
   __name: "index",
   setup(G) {

package/index.js

@@ -1,4 +1,4 @@
-import { J as e, A as t, C as n, B as i, D as r, e as u, m as o, w as m, o as p, f as g, k as D, v as l, y as L, z as b, h as c, i as h, G as A, H as T, q as y, E as R, F as W, K as I, I as M, s as F, j as V, n as f, r as k, x as v, t as w } from "./index-BJDVxFOS.js";
+import { J as e, A as t, C as n, B as i, D as r, e as u, m as o, w as m, o as p, f as g, k as D, v as l, y as L, z as b, h as c, i as h, G as A, H as T, q as y, E as R, F as W, K as I, I as M, s as F, j as V, n as f, r as k, x as v, t as w } from "./index-B2tm6y5q.js";
 export {
   e as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "7.1.0-seres.2",
+  "version": "7.1.0-seres.3",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "7.1.0-seres.2",
-    "@das-fed/utils": "7.1.0-seres.2",
-    "@das-fed/web": "7.1.0-seres.2",
-    "@das-fed/web-components": "7.1.0-seres.2",
+    "@das-fed/ui": "7.1.0-seres.3",
+    "@das-fed/utils": "7.1.0-seres.3",
+    "@das-fed/web": "7.1.0-seres.3",
+    "@das-fed/web-components": "7.1.0-seres.3",
     "@microsoft/signalr": "^8.0.7",
     "@vueuse/core": "^9.13.0",
     "animate.css": "^4.1.1",
@@ -19,7 +19,7 @@
     "vue-router": "^4.4.0"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.1.0-seres.2",
+    "@das-fed/cli": "7.1.0-seres.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

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

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