lw-cdp-ui 1.2.65 → 1.3.1

package/dist/components/lwLayout/index.vue

@@ -352,7 +352,7 @@ export default {
     }
   },
   beforeCreate() {
-    // 挂载菜单订阅
+    // 挂载自定义菜单订阅
     this.$bus.$on('setMenu', (menu) => {
       this.changeMenu = true
       this.menu = this.filterUrl(menu)
@@ -370,8 +370,10 @@ export default {
     this.onLayoutResize();
     window.addEventListener('resize', this.onLayoutResize);
     this.getUserInfo();
-    var menu = this.$router.sc_getMenu();
-    this.menu = this.filterUrl(menu);
+    if (!this.changeMenu) {
+      var menu = this.$router.sc_getMenu();
+      this.menu = this.filterUrl(menu);
+    }
     this.showThis()
     this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE")
   },
@@ -409,11 +411,11 @@ export default {
       let userAuthInfo = {
         ...user.userAuthInfo,
         combined: user.combined,
+        loginPage: user.loginPage,
         menuContent: user.menuContent,
       }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
       this.$tool.data.set('userAuthInfo', userAuthInfo)
-      this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
       this.$store.state.user = userAuthInfo
     },
 

package/dist/components/lwLogin/index.vue

@@ -299,6 +299,7 @@ export default {
     this.$store.commit("clearViewTags");
     this.$store.commit("clearKeepLive");
     this.$store.commit("clearIframeList")
+    this.$tool.data.remove("MENU_LIST")
   },
   methods: {
     // 加密
@@ -357,12 +358,12 @@ export default {
       let userAuthInfo = {
         ...user.userAuthInfo,
         combined: user.combined,
+        loginPage: user.loginPage,
         menuContent: user.menuContent,
       }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
       this.$tool.data.set('userAuthInfo', userAuthInfo)
       // 用与应用菜单显示
-      this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
       this.$store.state.user = userAuthInfo
 
 

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

@@ -3077,9 +3077,11 @@ const D8 = /* @__PURE__ */ ue(V8, [["render", R8], ["__scopeId", "data-v-91dc7bb
     this.$store.state.global.menuIsCollapse = !!n;
   },
   async created() {
-    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");
+    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");
   },
   watch: {
     async $route() {
@@ -3106,9 +3108,10 @@ 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;
+      this.$tool.data.set("tenantId", n.userAuthInfo.tenantId), this.$tool.data.set("userAuthInfo", r), this.$store.state.user = r;
     },
     openSetting() {
       this.settingDialog = !0;
@@ -5298,7 +5301,7 @@ const I6 = /* @__PURE__ */ a5(_6), k6 = "data:image/svg+xml,%3c?xml%20version='1
     };
   },
   created: function() {
-    this.$store.commit("clearViewTags"), this.$store.commit("clearKeepLive"), this.$store.commit("clearIframeList");
+    this.$store.commit("clearViewTags"), this.$store.commit("clearKeepLive"), this.$store.commit("clearIframeList"), this.$tool.data.remove("MENU_LIST");
   },
   methods: {
     // 加密
@@ -5334,9 +5337,10 @@ 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) {
+      if (this.$tool.data.set("tenantId", l.userAuthInfo.tenantId), this.$tool.data.set("userAuthInfo", u), 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) {
         let d = await this.$api.auth.initialized();
         this.$tool.data.set("zoneInitialized", d), d ? this.$router.push(this.$config.DASHBOARD_URL) : this.$router.push(this.$config.INIT_URL);
       } else
@@ -5634,7 +5638,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-22546a3b"]]), j6 = { class: "svg-icon" }, G6 = ["xlink:href"], z6 = {
   __name: "index",
   props: {
     name: {