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

package/{index-3qGmnX0K.js → index-BHwu43MC.js}

@@ -14006,7 +14006,8 @@ const kO = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xml
   FA(
     () => t.currentRoute.value,
     async (c) => {
-      if (!(c.path === a && Fr(c.query, d))) {
+      const x = c.query.loginType || "";
+      if (!localStorage.getItem("loginType") && x && localStorage.setItem("loginType", x), !(c.path === a && Fr(c.query, d))) {
         if (a = H3(c.path), d = H3(c.query), d && d.source && localStorage.setItem("thirdLogouSource", d.source), await v(), q9.innerSet) {
           q9.innerSet = !1;
           return;
@@ -14044,10 +14045,10 @@ const kO = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xml
       logout_token: ee(),
       // 写用户访问日志逻辑配合
       logout: "true"
-    };
-    e.ssoLocale && (c.locale = "locale");
-    const x = Object.keys(c).map((s) => `${s}=${c[s]}`).join("&"), i = `${e.baseURL}${a.logout}?${x}`;
-    window.__isAutoCloseApp = !1, t() ? P(i) : location.replace(i), sessionStorage.clear(), localStorage.removeItem("idelTime"), d0();
+    }, x = localStorage.getItem("loginType");
+    x && (c.loginType = x), e.ssoLocale && (c.locale = "locale");
+    const i = Object.keys(c).map((q) => `${q}=${c[q]}`).join("&"), s = `${e.baseURL}${a.logout}?${i}`;
+    window.__isAutoCloseApp = !1, t() ? P(s) : location.replace(s), localStorage.removeItem("idelTime"), localStorage.removeItem("loginType"), sessionStorage.clear(), d0();
   }, { entryApp: z } = He(), b = async () => {
     const a = "personCenter", c = (GA().appcategorys || []).map((O) => O.apps).flat(), { originalMenus: x = [] } = await Rt(a), s = Rf(x).filter((O) => O.isMenu && O.routeUrl).find((O) => O.routeUrl === "/userInfo");
     if (s != null && s.disable || s != null && s.expired) {
@@ -18005,11 +18006,11 @@ g("@das-fed/web");
 const XN = [
   {
     path: xf,
-    component: () => import("./index-Cg1zDISe.js")
+    component: () => import("./index-DM_ZUV__.js")
   },
   {
     path: td,
-    component: () => import("./index-VFHeVlbQ.js")
+    component: () => import("./index-ppX3stfH.js")
   }
 ], IZ = {
   routes: XN,

package/{packages/main-app-framework/index-9Btqmzxh.js → index-DM_ZUV__.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-BHwu43MC.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-VFHeVlbQ.js → index-ppX3stfH.js}

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

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-BHwu43MC.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-dev.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-dev.1",
+    "@das-fed/utils": "7.0.7-dev.1",
+    "@das-fed/web": "7.0.7-dev.1",
+    "@das-fed/web-components": "7.0.7-dev.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-dev.1",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

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