@das-fed/web 7.0.2-beta.3 → 7.0.2-beta.4

package/{index-C_grfTQZ.js → index-C-qAkI--.js}

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

package/{packages/main-app-framework/index-DNhkfPVq.js → index-CRYQ2SBN.js}

@@ -6,72 +6,71 @@ import { DasSpin as x } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as T } from "@das-fed/utils/common-info";
 import { setShowLayout as b } from "@das-fed/utils/common-tools";
 import { createService as E } from "@das-fed/utils/create-api-service";
-import { u as L, p as P, a as u, c as f, b as q, l as B, g as K, d as M } from "./index-B33l8Tr8.js";
+import { u as L, p as P, a as u, c as f, b as q, l as B, g as K, d as M } from "./index-BpJ7eFCg.js";
 const N = "v1", O = E(`/api/justauth/client/${N}`), V = O.get("/visitor/kingdee/auth/user/auth_code"), z = /* @__PURE__ */ k({
   __name: "index",
   setup(F) {
-    const { beforeEntryApp: d, entryApp: g } = L(), m = p(() => P.value.skinStyle), h = p(() => !!j.menu.items.length), w = p(() => {
+    const { beforeEntryApp: d, entryApp: g } = L(), h = p(() => P.value.skinStyle), m = p(() => !!j.menu.items.length), w = p(() => {
       if (!u.value || !u.value.length) return [];
-      const o = f(u.value);
-      return Array.isArray(o) ? o.length ? (o.forEach((r) => {
+      const t = f(u.value);
+      return Array.isArray(t) ? t.length ? (t.forEach((r) => {
         r.apps = y(
-          r.apps,
-          // element.apps.filter((item: any) => item?.code && item.code !== 'dasaiassistant'),
+          r.apps.filter((o) => (o == null ? void 0 : o.code) && o.code !== "dasaiassistant"),
           4
         );
-      }), o) : [] : [];
-    }), y = (o, r) => {
-      const t = [];
-      for (let a = 0; a < o.length; a += r)
-        t.push(o.slice(a, a + r));
-      return t;
-    }, _ = async (o) => {
-      if (!o) return;
+      }), t) : [] : [];
+    }), y = (t, r) => {
+      const o = [];
+      for (let a = 0; a < t.length; a += r)
+        o.push(t.slice(a, a + r));
+      return o;
+    }, _ = async (t) => {
+      if (!t) return;
       if (!sessionStorage.getItem("projectInfo")) {
         window.confirm(D("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
         return;
       }
-      const t = f(o);
-      if (B.innerSet = !0, t.routeUrl) {
-        if (o.code === "Ioc") {
-          window.open(t.routeUrl, "_blank");
+      const o = f(t);
+      if (B.innerSet = !0, o.routeUrl) {
+        if (t.code === "Ioc") {
+          window.open(o.routeUrl, "_blank");
           return;
         }
-        if (o.code === "wojiacloud") {
+        if (t.code === "wojiacloud") {
           const e = sessionStorage.getItem("kingdee_token") || "";
           if (e) {
-            const [n, i] = await V().run({ accessToken: e });
-            if (i) {
-              const s = (i == null ? void 0 : i.auth_code) ?? "";
-              t.routeUrl = t.routeUrl.includes("?") ? `${t.routeUrl}&code=${s}` : `${t.routeUrl}?code=${s}`;
+            const [n, s] = await V().run({ accessToken: e });
+            if (s) {
+              const i = (s == null ? void 0 : s.auth_code) ?? "";
+              o.routeUrl = o.routeUrl.includes("?") ? `${o.routeUrl}&code=${i}` : `${o.routeUrl}?code=${i}`;
             }
           }
         }
       }
-      const a = (o == null ? void 0 : o.openType) ?? 1, l = (o == null ? void 0 : o.type) ?? 1;
+      const a = (t == null ? void 0 : t.openType) ?? 1, l = (t == null ? void 0 : t.type) ?? 1;
       if (a === 1) {
-        if (!await d(o)) return;
-        const n = T().preTab[o.code], i = (n == null ? void 0 : n.code) ?? "", s = { ...(n == null ? void 0 : n.query) ?? {} };
-        g({ microApp: t, menuCode: i, route: { query: s } });
+        if (!await d(t)) return;
+        const n = T().preTab[t.code], s = (n == null ? void 0 : n.code) ?? "", i = { ...(n == null ? void 0 : n.query) ?? {} };
+        g({ microApp: o, menuCode: s, route: { query: i } });
       }
-      if (a === 2 && t.routeUrl) {
+      if (a === 2 && o.routeUrl) {
         let e = "";
         if (l === 1)
-          e = t != null && t.applicationPath ? location.origin + "/" + t.applicationPath + t.routeUrl : location.origin + t.routeUrl, e = b(e);
+          e = o != null && o.applicationPath ? location.origin + "/" + o.applicationPath + o.routeUrl : location.origin + o.routeUrl, e = b(e);
         else if (l === 2) {
-          const n = await K(t.routeUrl, (t == null ? void 0 : t.param) ?? []);
+          const n = await K(o.routeUrl, (o == null ? void 0 : o.param) ?? []);
           e = M(n);
         }
         window.open(e, "_blank");
       }
     };
-    return (o, r) => v((C(), U(c(x), {
+    return (t, r) => v((C(), U(c(x), {
       full: "",
       spinning: c(q)
     }, {
       default: A(() => [
         S(c($), {
-          theme: m.value,
+          theme: h.value,
           appCategorys: w.value,
           onOpenApp: _
         }, null, 8, ["theme", "appCategorys"])
@@ -79,7 +78,7 @@ const N = "v1", O = E(`/api/justauth/client/${N}`), V = O.get("/visitor/kingdee/
       _: 1
       /* STABLE */
     }, 8, ["spinning"])), [
-      [I, !h.value]
+      [I, !m.value]
     ]);
   }
 });

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-Daq7bCIL.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-BpJ7eFCg.js";
 export {
   e as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "7.0.2-beta.3",
+  "version": "7.0.2-beta.4",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "7.0.2-beta.3",
-    "@das-fed/utils": "7.0.2-beta.3",
-    "@das-fed/web": "7.0.2-beta.3",
-    "@das-fed/web-components": "7.0.2-beta.3",
+    "@das-fed/ui": "7.0.2-beta.4",
+    "@das-fed/utils": "7.0.2-beta.4",
+    "@das-fed/web": "7.0.2-beta.4",
+    "@das-fed/web-components": "7.0.2-beta.4",
     "@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.0.2-beta.3",
+    "@das-fed/cli": "7.0.2-beta.4",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

package/packages/main-app-framework/{index-D4IiPdL0.js → index-BYf4ulrf.js}

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

package/{index-fgIF10qZ.js → packages/main-app-framework/index-CFltJXQt.js}

@@ -6,72 +6,71 @@ import { DasSpin as x } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as T } from "@das-fed/utils/common-info";
 import { setShowLayout as b } from "@das-fed/utils/common-tools";
 import { createService as E } from "@das-fed/utils/create-api-service";
-import { u as L, p as P, a as u, c as f, b as q, l as B, g as K, d as M } from "./index-Daq7bCIL.js";
+import { u as L, p as P, a as u, c as f, b as q, l as B, g as K, d as M } from "./index-DBBYpCdx.js";
 const N = "v1", O = E(`/api/justauth/client/${N}`), V = O.get("/visitor/kingdee/auth/user/auth_code"), z = /* @__PURE__ */ k({
   __name: "index",
   setup(F) {
-    const { beforeEntryApp: d, entryApp: g } = L(), m = p(() => P.value.skinStyle), h = p(() => !!j.menu.items.length), w = p(() => {
+    const { beforeEntryApp: d, entryApp: g } = L(), h = p(() => P.value.skinStyle), m = p(() => !!j.menu.items.length), w = p(() => {
       if (!u.value || !u.value.length) return [];
-      const o = f(u.value);
-      return Array.isArray(o) ? o.length ? (o.forEach((r) => {
+      const t = f(u.value);
+      return Array.isArray(t) ? t.length ? (t.forEach((r) => {
         r.apps = y(
-          r.apps,
-          // element.apps.filter((item: any) => item?.code && item.code !== 'dasaiassistant'),
+          r.apps.filter((o) => (o == null ? void 0 : o.code) && o.code !== "dasaiassistant"),
           4
         );
-      }), o) : [] : [];
-    }), y = (o, r) => {
-      const t = [];
-      for (let a = 0; a < o.length; a += r)
-        t.push(o.slice(a, a + r));
-      return t;
-    }, _ = async (o) => {
-      if (!o) return;
+      }), t) : [] : [];
+    }), y = (t, r) => {
+      const o = [];
+      for (let a = 0; a < t.length; a += r)
+        o.push(t.slice(a, a + r));
+      return o;
+    }, _ = async (t) => {
+      if (!t) return;
       if (!sessionStorage.getItem("projectInfo")) {
         window.confirm(D("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
         return;
       }
-      const t = f(o);
-      if (B.innerSet = !0, t.routeUrl) {
-        if (o.code === "Ioc") {
-          window.open(t.routeUrl, "_blank");
+      const o = f(t);
+      if (B.innerSet = !0, o.routeUrl) {
+        if (t.code === "Ioc") {
+          window.open(o.routeUrl, "_blank");
           return;
         }
-        if (o.code === "wojiacloud") {
+        if (t.code === "wojiacloud") {
           const e = sessionStorage.getItem("kingdee_token") || "";
           if (e) {
-            const [n, i] = await V().run({ accessToken: e });
-            if (i) {
-              const s = (i == null ? void 0 : i.auth_code) ?? "";
-              t.routeUrl = t.routeUrl.includes("?") ? `${t.routeUrl}&code=${s}` : `${t.routeUrl}?code=${s}`;
+            const [n, s] = await V().run({ accessToken: e });
+            if (s) {
+              const i = (s == null ? void 0 : s.auth_code) ?? "";
+              o.routeUrl = o.routeUrl.includes("?") ? `${o.routeUrl}&code=${i}` : `${o.routeUrl}?code=${i}`;
             }
           }
         }
       }
-      const a = (o == null ? void 0 : o.openType) ?? 1, l = (o == null ? void 0 : o.type) ?? 1;
+      const a = (t == null ? void 0 : t.openType) ?? 1, l = (t == null ? void 0 : t.type) ?? 1;
       if (a === 1) {
-        if (!await d(o)) return;
-        const n = T().preTab[o.code], i = (n == null ? void 0 : n.code) ?? "", s = { ...(n == null ? void 0 : n.query) ?? {} };
-        g({ microApp: t, menuCode: i, route: { query: s } });
+        if (!await d(t)) return;
+        const n = T().preTab[t.code], s = (n == null ? void 0 : n.code) ?? "", i = { ...(n == null ? void 0 : n.query) ?? {} };
+        g({ microApp: o, menuCode: s, route: { query: i } });
       }
-      if (a === 2 && t.routeUrl) {
+      if (a === 2 && o.routeUrl) {
         let e = "";
         if (l === 1)
-          e = t != null && t.applicationPath ? location.origin + "/" + t.applicationPath + t.routeUrl : location.origin + t.routeUrl, e = b(e);
+          e = o != null && o.applicationPath ? location.origin + "/" + o.applicationPath + o.routeUrl : location.origin + o.routeUrl, e = b(e);
         else if (l === 2) {
-          const n = await K(t.routeUrl, (t == null ? void 0 : t.param) ?? []);
+          const n = await K(o.routeUrl, (o == null ? void 0 : o.param) ?? []);
           e = M(n);
         }
         window.open(e, "_blank");
       }
     };
-    return (o, r) => v((C(), U(c(x), {
+    return (t, r) => v((C(), U(c(x), {
       full: "",
       spinning: c(q)
     }, {
       default: A(() => [
         S(c($), {
-          theme: m.value,
+          theme: h.value,
           appCategorys: w.value,
           onOpenApp: _
         }, null, 8, ["theme", "appCategorys"])
@@ -79,7 +78,7 @@ const N = "v1", O = E(`/api/justauth/client/${N}`), V = O.get("/visitor/kingdee/
       _: 1
       /* STABLE */
     }, 8, ["spinning"])), [
-      [I, !h.value]
+      [I, !m.value]
     ]);
   }
 });