lw-cdp-ui 1.2.64 → 1.2.66

package/dist/components/lwLayout/index.vue

@@ -365,18 +365,13 @@ export default {
     }
     let isMenuIsCollapse = this.$tool.data.get("APP_menuIsCollapse")
     this.$store.state.global.menuIsCollapse = !!isMenuIsCollapse
-
-    // 标志当前应用
-    this.$tool.data.set("CURRENTNMAE", this.$config.APP_NAME);
   },
   async created() {
     this.onLayoutResize();
     window.addEventListener('resize', this.onLayoutResize);
     this.getUserInfo();
-    if (!this.changeMenu) {
-      var menu = this.$router.sc_getMenu();
-      this.menu = this.filterUrl(menu);
-    }
+    var menu = this.$router.sc_getMenu();
+    this.menu = this.filterUrl(menu);
     this.showThis()
     this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE")
   },
@@ -414,6 +409,7 @@ export default {
       let userAuthInfo = {
         ...user.userAuthInfo,
         combined: user.combined,
+        loginPage: user.loginPage,
         menuContent: user.menuContent,
       }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)

package/dist/components/lwLogin/index.vue

@@ -357,6 +357,7 @@ export default {
       let userAuthInfo = {
         ...user.userAuthInfo,
         combined: user.combined,
+        loginPage: user.loginPage,
         menuContent: user.menuContent,
       }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)

package/dist/lw-cdp-ui.esm.js

@@ -3074,14 +3074,12 @@ const D8 = /* @__PURE__ */ ue(V8, [["render", R8], ["__scopeId", "data-v-91dc7bb
       this.changeMenu = !0, this.menu = this.filterUrl(t);
     }), this.$tool.data.get("APP_LAYOUTTAGS") && (this.$store.state.global.layoutTags = !1);
     let n = this.$tool.data.get("APP_menuIsCollapse");
-    this.$store.state.global.menuIsCollapse = !!n, this.$tool.data.set("CURRENTNMAE", this.$config.APP_NAME);
+    this.$store.state.global.menuIsCollapse = !!n;
   },
   async created() {
-    if (this.onLayoutResize(), window.addEventListener("resize", this.onLayoutResize), this.getUserInfo(), !this.changeMenu) {
-      var e = this.$router.sc_getMenu();
-      this.menu = this.filterUrl(e);
-    }
-    this.showThis(), this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE");
+    this.onLayoutResize(), window.addEventListener("resize", this.onLayoutResize), this.getUserInfo();
+    var e = this.$router.sc_getMenu();
+    this.menu = this.filterUrl(e), this.showThis(), this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE");
   },
   watch: {
     async $route() {
@@ -3108,6 +3106,7 @@ const D8 = /* @__PURE__ */ ue(V8, [["render", R8], ["__scopeId", "data-v-91dc7bb
       let r = {
         ...n.userAuthInfo,
         combined: n.combined,
+        loginPage: n.loginPage,
         menuContent: n.menuContent
       };
       this.$tool.data.set("tenantId", n.userAuthInfo.tenantId), this.$tool.data.set("userAuthInfo", r), this.$tool.data.set("MenuPath", n.userAuthInfo.grantedApplications), this.$store.state.user = r;
@@ -5336,6 +5335,7 @@ const I6 = /* @__PURE__ */ a5(_6), k6 = "data:image/svg+xml,%3c?xml%20version='1
       let u = {
         ...l.userAuthInfo,
         combined: l.combined,
+        loginPage: l.loginPage,
         menuContent: l.menuContent
       };
       if (this.$tool.data.set("tenantId", l.userAuthInfo.tenantId), this.$tool.data.set("userAuthInfo", u), this.$tool.data.set("MenuPath", l.userAuthInfo.grantedApplications), this.$store.state.user = u, sessionStorage.setItem("easyweb_session_passport_current_user", JSON.stringify({ v: l })), sessionStorage.setItem("easyweb_session_passport_bu", JSON.stringify({ v: r[0] })), sessionStorage.setItem("easyweb_session_passport_bu_list", JSON.stringify({ v: r })), document.cookie = `Authorization=Bearer ${t}`, this.isInitialized) {
@@ -5636,7 +5636,7 @@ function N6(e, n, t, r, a, o) {
     ])
   ]);
 }
-const U6 = /* @__PURE__ */ ue(L6, [["render", N6], ["__scopeId", "data-v-f0aa3ad6"]]), j6 = { class: "svg-icon" }, G6 = ["xlink:href"], z6 = {
+const U6 = /* @__PURE__ */ ue(L6, [["render", N6], ["__scopeId", "data-v-b5bb1e6c"]]), j6 = { class: "svg-icon" }, G6 = ["xlink:href"], z6 = {
   __name: "index",
   props: {
     name: {