@das-fed/web 7.0.7-beta.1 → 7.0.7-hot.1

package/{packages/main-app-framework/index-9Btqmzxh.js → index-ZteIZHLW.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-BTkL8vcq.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-Dd5IG0LM.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-3qGmnX0K.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-Dd5IG0LM.js";
 export {
   e as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "7.0.7-beta.1",
+  "version": "7.0.7-hot.1",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "7.0.7-beta.1",
-    "@das-fed/utils": "7.0.7-beta.1",
-    "@das-fed/web": "7.0.7-beta.1",
-    "@das-fed/web-components": "7.0.7-beta.1",
+    "@das-fed/ui": "7.0.7-hot.1",
+    "@das-fed/utils": "7.0.7-hot.1",
+    "@das-fed/web": "7.0.7-hot.1",
+    "@das-fed/web-components": "7.0.7-hot.1",
     "@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.7-beta.1",
+    "@das-fed/cli": "7.0.7-hot.1",
     "@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,58 +1,62 @@
-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 = {
-  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 { ref as v, createApp as w } from "vue";
+import { initTheme as x } from "@das-fed/web/packages/theme/index";
+import { initI18n as j } from "@das-fed/web/packages/i18n/index";
+import { DasWebLayout as W } from "@das-fed/web/packages/layout/index";
+import { createPinia as $ } from "pinia";
+import O from "pinia-plugin-persistedstate";
+import { createRouter as P, createWebHistory as k } from "vue-router";
+import { getConfig as y } from "@das-fed/utils/config";
+const C = {
+  install: (e, t) => {
+    var u;
+    const c = (u = t == null ? void 0 : t.plugins) == null ? void 0 : u.glob;
+    c && Object.values(c).sort((a, l) => (a.index ?? 0) - (l.index ?? 0)).filter((a) => a ? !!(a.default && a.default.install || a.install) : !1).forEach((a) => {
+      a.default && a.default.install && e.use(a.default, t), a.install && e.use(a, t);
     });
   }
-}, 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));
-    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) => ({
+}, m = $();
+m.use(O);
+const D = (e) => {
+  var b, d, o, g, h;
+  const t = ((b = e == null ? void 0 : e.router) == null ? void 0 : b.routerBase) ?? "/", c = ((d = e == null ? void 0 : e.router) == null ? void 0 : d.options) || {};
+  let u = Object.assign(((o = e == null ? void 0 : e.router) == null ? void 0 : o.glob) || {});
+  const a = Object.values(u).filter((s) => !!s).flat().sort((s, n) => (s.index ?? 0) - (n.index ?? 0)), l = [];
+  (g = e == null ? void 0 : e.microApps) == null || g.map((s) => {
+    var A;
+    const n = Object.values(((A = s.router) == null ? void 0 : A.glob) || {}).filter((r) => !!r).flat().sort((r, R) => (r.index ?? 0) - (R.index ?? 0));
+    l.push(
+      ...n.map((r) => ({ ...r, path: `/${s.microAppName}${r.path}` }))
+    ), l.push(
+      ...n.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 = [
-    ...n(t, e),
-    ...n(s, e),
-    ...n(u, e)
+  const f = ((h = e == null ? void 0 : e.router) == null ? void 0 : h.routers) || [], p = [
+    ...i(a, e),
+    ...i(f, e),
+    ...i(l, 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) => {
+  return { router: P({ history: k(t), routes: p, ...c }) };
+}, i = (e, t) => e.map((c) => {
+  const u = c.meta || {};
+  return u.keepAlive = u.keepAlive ?? (t == null ? void 0 : t.keepAlive) ?? !0, { ...c, meta: u };
+}), N = async () => {
+  const { baseURL: e = "" } = y(), t = await fetch(`${e}/oss/resource/front-end/web/_config/config.json`), { disableSaveToken: c = !1 } = await t.json(), u = { disableSaveToken: c };
+  window.webConfig = u;
+}, _ = (e) => {
   e || (e = {});
-  const a = x(!0);
-  Promise.all([P(e), W(e)]).then(() => {
-    a.value = !1;
+  const t = v(!0);
+  Promise.all([N(), x(e), j(e)]).then(() => {
+    t.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: u, props: a } = (e == null ? void 0 : e.root) || {}, l = w(u || W, a);
+  l.use(C, e), l.use(m);
+  const { router: f } = D(e);
+  return l.use(f), l.mount(c || "#app"), { app: l, router: f, loading: t, store: m };
 };
 export {
-  w as createDasWebApp
+  _ as createDasWebApp
 };

package/{index-Cg1zDISe.js → packages/main-app-framework/index-7BoZiicm.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-3qGmnX0K.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-HimW4rhP.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/packages/main-app-framework/{index-DjY3P4GQ.js → index-BlDFy06J.js}

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

package/packages/main-app-framework/{index-BTkL8vcq.js → index-HimW4rhP.js}

@@ -12542,7 +12542,8 @@ const UH = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xml
   l9(
     () => P.currentRoute.value,
     async (b) => {
-      if (!(b.path === a && sr(b.query, t))) {
+      const R = b.query.loginType || "";
+      if (!localStorage.getItem("loginType") && R && localStorage.setItem("loginType", R), !(b.path === a && sr(b.query, t))) {
         if (a = v7(b.path), t = v7(b.query), t && t.source && localStorage.setItem("thirdLogouSource", t.source), await e(), z9.innerSet) {
           z9.innerSet = !1;
           return;
@@ -12580,10 +12581,10 @@ const UH = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xml
       logout_token: Uf(),
       // 写用户访问日志逻辑配合
       logout: "true"
-    };
-    v.ssoLocale && (b.locale = "locale");
-    const R = Object.keys(b).map((H) => `${H}=${b[H]}`).join("&"), q = `${v.baseURL}${a.logout}?${R}`;
-    window.__isAutoCloseApp = !1, P() ? u(q) : location.replace(q), sessionStorage.clear(), localStorage.removeItem("idelTime"), z0();
+    }, R = localStorage.getItem("loginType");
+    R && (b.loginType = R), v.ssoLocale && (b.locale = "locale");
+    const q = Object.keys(b).map((p) => `${p}=${b[p]}`).join("&"), H = `${v.baseURL}${a.logout}?${q}`;
+    window.__isAutoCloseApp = !1, P() ? u(H) : location.replace(H), localStorage.removeItem("idelTime"), localStorage.removeItem("loginType"), sessionStorage.clear(), z0();
   }, { entryApp: X } = d3(), c = async () => {
     const a = "personCenter", b = (gA().appcategorys || []).map((V) => V.apps).flat(), { originalMenus: R = [] } = await Ur(a), H = cf(R).filter((V) => V.isMenu && V.routeUrl).find((V) => V.routeUrl === "/userInfo");
     if (H != null && H.disable || H != null && H.expired) {
@@ -16541,11 +16542,11 @@ B("@das-fed/web");
 const ix = [
   {
     path: bf,
-    component: () => import("./index-9Btqmzxh.js")
+    component: () => import("./index-7BoZiicm.js")
   },
   {
     path: z6,
-    component: () => import("./index-DjY3P4GQ.js")
+    component: () => import("./index-BlDFy06J.js")
   }
 ], lR = {
   routes: ix,

package/packages/main-app-framework/index.js

@@ -1,6 +1,6 @@
 import '@das-fed/web/packages/main-app-framework/style.css';
 import "vue";
-import { m as a } from "./index-BTkL8vcq.js";
+import { m as a } from "./index-HimW4rhP.js";
 import "@das-fed/web/packages/i18n/index";
 export {
   a as mainAppFramework

package/types/create-das-web-app/get-web-config.d.ts

@@ -0,0 +1 @@
+export declare const getWebConfig: () => any;