lw-cdp-ui 1.2.66 → 1.3.2

package/dist/components/lwLayout/components/tags.vue

@@ -179,11 +179,14 @@ export default {
     closeSelectedTag(tag, autoPushLatestView = true) {
       let item = this.menu[0]
       if (item.children) {
-        item = item.children[0]
+        item =  item.children[0]
       }
-      if (this.tagList.length == 1 && item.path == this.$route.fullPath) {
-        return false
+
+      // 兼容合并菜单
+      if (item.meta?.code) {
+        item.path = `/i/${item.name}`
       }
+
       this.$store.commit("removeViewTags", tag)
       this.$store.commit("removeIframeList", tag)
       this.$store.commit("removeKeepLive", tag.name)
@@ -193,7 +196,7 @@ export default {
         if (latestView) {
           this.$router.push(latestView)
         } else {
-          this.$router.push('/')
+          this.$router.push({ path: item.path })
         }
       }
     },

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")
   },
@@ -414,7 +416,6 @@ export default {
       }
       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: {
     // 加密
@@ -363,7 +364,6 @@ export default {
       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

@@ -485,12 +485,11 @@ const uc = /* @__PURE__ */ ue(ac, [["render", sc], ["__scopeId", "data-v-c198cd7
     },
     //关闭tag
     closeSelectedTag(e, n = !0) {
+      var r;
       let t = this.menu[0];
-      if (t.children && (t = t.children[0]), this.tagList.length == 1 && t.path == this.$route.fullPath)
-        return !1;
-      if (this.$store.commit("removeViewTags", e), this.$store.commit("removeIframeList", e), this.$store.commit("removeKeepLive", e.name), this.$tool.data.set("RouteTags", this.$store.state.viewTags.viewTags), n && this.isActive(e)) {
-        const r = this.tagList.slice(-1)[0];
-        r ? this.$router.push(r) : this.$router.push("/");
+      if (t.children && (t = t.children[0]), (r = t.meta) != null && r.code && (t.path = `/i/${t.name}`), this.$store.commit("removeViewTags", e), this.$store.commit("removeIframeList", e), this.$store.commit("removeKeepLive", e.name), this.$tool.data.set("RouteTags", this.$store.state.viewTags.viewTags), n && this.isActive(e)) {
+        const a = this.tagList.slice(-1)[0];
+        a ? this.$router.push(a) : this.$router.push({ path: t.path });
       }
     },
     //tag右键
@@ -3077,9 +3076,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() {
@@ -3109,7 +3110,7 @@ const D8 = /* @__PURE__ */ ue(V8, [["render", R8], ["__scopeId", "data-v-91dc7bb
         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;
@@ -5299,7 +5300,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: {
     // 加密
@@ -5338,7 +5339,7 @@ const I6 = /* @__PURE__ */ a5(_6), k6 = "data:image/svg+xml,%3c?xml%20version='1
         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
@@ -5636,7 +5637,7 @@ function N6(e, n, t, r, a, o) {
     ])
   ]);
 }
-const U6 = /* @__PURE__ */ ue(L6, [["render", N6], ["__scopeId", "data-v-b5bb1e6c"]]), 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: {