@das-fed/web 6.4.0-dev.10 → 6.4.0-dev.12

package/{index-3xCfFiyN.js → index-DCv0mp9Q.js}

@@ -2,7 +2,7 @@ import { defineComponent as v, ref as r, nextTick as u, watch as p, onMounted as
 import { useRoute as P } from "vue-router";
 import { DasSpin as S } from "@das-fed/ui/packages/components/spin/index";
 import { layout as C } from "@das-fed/web/packages/layout/index";
-import { I as R, e as L, _ as M } from "./index-Cp6SD-TQ.js";
+import { I as R, e as L, _ as M } from "./index-C2ZSdOo4.js";
 import { getToken as j, getPersonalInfo as B, getProjectInfo as D } from "@das-fed/utils/common-info";
 import { getUrlParams as E } from "@das-fed/utils/common-tools";
 const N = {

package/{packages/main-app-framework/index-DQRCs8SS.js → index-E3_VNsYI.js}

@@ -1,13 +1,14 @@
-import { defineComponent as w, computed as y, openBlock as _, createBlock as k, unref as p, withCtx as U, createVNode as A } from "vue";
+import { defineComponent as _, computed as w, openBlock as y, createBlock as k, unref as p, withCtx as U, createVNode as A } from "vue";
 import { DasAppContainer as C } from "@das-fed/ui/packages/business-components/app-container/index";
 import { DasSpin as v } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as I } from "@das-fed/utils/common-info";
+import { setShowLayout as S } from "@das-fed/utils/common-tools";
 import { createService as j } from "@das-fed/utils/create-api-service";
-import { u as S, a as c, c as l, b as $, l as x, d as L } from "./index-DtmpkTTl.js";
-const T = "v1", b = j(`/api/justauth/client/${T}`), D = b.get("/visitor/kingdee/auth/user/auth_code"), V = /* @__PURE__ */ w({
+import { u as $, a as c, c as l, b as x, l as T, d as b } from "./index-C2ZSdOo4.js";
+const D = "v1", E = j(`/api/justauth/client/${D}`), L = E.get("/visitor/kingdee/auth/user/auth_code"), G = /* @__PURE__ */ _({
   __name: "index",
-  setup(E) {
-    const { beforeEntryApp: f, entryApp: d } = S(), g = y(() => {
+  setup(q) {
+    const { beforeEntryApp: f, entryApp: d } = $(), g = w(() => {
       if (!c.value || !c.value.length) return [];
       const o = l(c.value);
       return Array.isArray(o) ? o.length ? (o.forEach((n) => n.apps = h(n.apps, 4)), o) : [] : [];
@@ -23,7 +24,7 @@ const T = "v1", b = j(`/api/justauth/client/${T}`), D = b.get("/visitor/kingdee/
         return;
       }
       const e = l(o);
-      if (x.innerSet = !0, e.routeUrl) {
+      if (T.innerSet = !0, e.routeUrl) {
         if (o.code === "Ioc") {
           window.open(e.routeUrl, "_blank");
           return;
@@ -31,9 +32,9 @@ const T = "v1", b = j(`/api/justauth/client/${T}`), D = b.get("/visitor/kingdee/
         if (o.code === "wojiacloud") {
           const t = sessionStorage.getItem("kingdee_token") || "";
           if (t) {
-            const [a, i] = await D().run({ accessToken: t });
-            if (i) {
-              const s = (i == null ? void 0 : i.auth_code) ?? "";
+            const [i, a] = await L().run({ accessToken: t });
+            if (a) {
+              const s = (a == null ? void 0 : a.auth_code) ?? "";
               e.routeUrl = e.routeUrl.includes("?") ? `${e.routeUrl}&code=${s}` : `${e.routeUrl}?code=${s}`;
             }
           }
@@ -42,17 +43,17 @@ const T = "v1", b = j(`/api/justauth/client/${T}`), D = b.get("/visitor/kingdee/
       const r = (o == null ? void 0 : o.openType) ?? 1, u = (o == null ? void 0 : o.type) ?? 1;
       if (r === 1) {
         if (!await f(o)) return;
-        const a = I().preTab[o.code], i = (a == null ? void 0 : a.code) ?? "", s = { ...(a == null ? void 0 : a.query) ?? {} };
-        d({ microApp: e, menuCode: i, route: { query: s } });
+        const i = I().preTab[o.code], a = (i == null ? void 0 : i.code) ?? "", s = { ...(i == null ? void 0 : i.query) ?? {} };
+        d({ microApp: e, menuCode: a, route: { query: s } });
       }
       if (r === 2 && e.routeUrl) {
         let t = "";
-        u === 1 ? t = e != null && e.applicationPath ? location.origin + "/" + e.applicationPath + e.routeUrl + "?showLayout=false" : location.origin + e.routeUrl + "?showLayout=false" : u === 2 && (t = L(e.routeUrl)), window.open(t, "_blank");
+        u === 1 ? (t = e != null && e.applicationPath ? location.origin + "/" + e.applicationPath + e.routeUrl : location.origin + e.routeUrl, t = S(t)) : u === 2 && (t = b(e.routeUrl)), window.open(t, "_blank");
       }
     };
-    return (o, n) => (_(), k(p(v), {
+    return (o, n) => (y(), k(p(v), {
       full: "",
-      spinning: p($)
+      spinning: p(x)
     }, {
       default: U(() => [
         A(p(C), {
@@ -66,5 +67,5 @@ const T = "v1", b = j(`/api/justauth/client/${T}`), D = b.get("/visitor/kingdee/
   }
 });
 export {
-  V as default
+  G as default
 };

package/index.js

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

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "6.4.0-dev.10",
+  "version": "6.4.0-dev.12",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "6.4.0-dev.10",
-    "@das-fed/utils": "6.4.0-dev.10",
-    "@das-fed/web": "6.4.0-dev.10",
-    "@das-fed/web-components": "6.4.0-dev.10",
+    "@das-fed/ui": "6.4.0-dev.12",
+    "@das-fed/utils": "6.4.0-dev.12",
+    "@das-fed/web": "6.4.0-dev.12",
+    "@das-fed/web-components": "6.4.0-dev.12",
     "@microsoft/signalr": "^8.0.7",
     "@vueuse/core": "^9.13.0",
     "animate.css": "^4.1.1",
@@ -18,7 +18,7 @@
     "vue-router": "^4.4.0"
   },
   "devDependencies": {
-    "@das-fed/cli": "6.4.0-dev.10",
+    "@das-fed/cli": "6.4.0-dev.12",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",
     "@vitejs/plugin-vue": "^5.1.0",

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

@@ -1,58 +1,58 @@
-import { ref as O, createApp as P } from "vue";
-import { initTheme as j } 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 { 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 B = {
-  install: (e, t) => {
-    var a;
-    const c = (a = t == null ? void 0 : t.plugins) == null ? void 0 : a.glob;
-    c && Object.values(c).sort((r, u) => (r.index ?? 0) - (u.index ?? 0)).filter((r) => r ? !!(r.default && r.default.install || r.install) : !1).forEach((r) => {
-      r.default && r.default.install && e.use(r.default, t), r.install && e.use(r, t);
+const N = {
+  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);
     });
   }
-}, d = $();
+}, d = j();
 d.use(k);
-const N = (e) => {
-  var b, i, g, h, A;
-  const t = ((b = e == null ? void 0 : e.router) == null ? void 0 : b.routerBase) ?? "/", c = ((i = e == null ? void 0 : e.router) == null ? void 0 : i.options) || {};
-  let a = Object.assign(((g = e == null ? void 0 : e.router) == null ? void 0 : g.glob) || {});
-  const r = Object.values(a).filter((f) => !!f).flat().sort((f, m) => (f.index ?? 0) - (m.index ?? 0)), u = [];
-  (h = e == null ? void 0 : e.microApps) == null || h.map((f) => {
-    var R;
-    const m = Object.values(((R = f.router) == null ? void 0 : R.glob) || {}).filter((l) => !!l).flat().sort((l, x) => (l.index ?? 0) - (x.index ?? 0));
+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));
     u.push(
-      ...m.map((l) => ({ ...l, path: `/${f.microAppName}${l.path}` }))
+      ...m.map((r) => ({ ...r, path: `/${f.microAppName}${r.path}` }))
     ), u.push(
-      ...m.map((l) => ({
-        path: l.path,
-        redirect: `/${f.microAppName}${l.path}`,
-        meta: { ...l.meta || {}, isMicroAppRouteRedirect: !0 }
+      ...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 }
       }))
     );
   });
-  const s = ((A = e == null ? void 0 : e.router) == null ? void 0 : A.routers) || [], v = [
-    ...n(r, e),
+  const s = ((g = e == null ? void 0 : e.router) == null ? void 0 : g.routers) || [], R = [
+    ...n(t, e),
     ...n(s, e),
     ...n(u, e)
   ];
-  return { router: y({ history: D(t), routes: v, ...c }) };
-}, n = (e, t) => e.map((c) => {
-  const a = c.meta || {};
-  return a.keepAlive = a.keepAlive ?? (t == null ? void 0 : t.keepAlive) ?? !0, { ...c, meta: a };
-}), z = (e) => {
+  return { router: y({ history: D(a), routes: R, ...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 t = O(!0);
-  Promise.all([j(e), p(e)]).then(() => {
-    t.value = !1;
+  const a = x(!0);
+  Promise.all([P(e), W(e)]).then(() => {
+    a.value = !1;
   });
-  const { container: c, component: a, props: r } = (e == null ? void 0 : e.root) || {}, u = P(a || W, r);
-  u.use(B, e), u.use(d);
-  const { router: s } = N(e);
-  return u.use(s), u.mount(c || "#app"), { app: u, router: s, loading: t, store: d };
+  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 };
 };
 export {
-  z as createDasWebApp
+  w as createDasWebApp
 };