n20-common-lib 2.6.53 → 2.6.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.53",
+  "version": "2.6.54",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -124,4 +124,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/components/Layout/indexN.vue

@@ -169,6 +169,7 @@ export default {
   },
   beforeDestroy() {
     removeListener(this.$refs['content-wrap'], this.contentChange)
+
     this.setTabList()
 
     window.removeEventListener('message', this.setMainTab)
@@ -207,7 +208,8 @@ export default {
             m.route = base + m.route.replace(/\/$/, '')
             m.route || (m.route = '/')
             m.uuid = m.route
-
+            // 新增一个字段用于接收初始化的url携带参数的处理之后的url
+            m.originPath = getBeforeQuestionMark(m.route)
             menuList.push(m)
           }
         })
@@ -226,6 +228,7 @@ export default {
       this.menusC = menus
       this.menuList = menuList
     },
+
     getTabList() {
       let tabList = JSON.parse(window.sessionStorage.getItem('tab-list')) || []
       this.tabList = tabList
@@ -274,7 +277,6 @@ export default {
     },
     tabClick(tab) {
       this.activeNav = tab.uuid
-
       this.routerPush({
         path: tab.route,
         query: tab.query
@@ -473,8 +475,18 @@ export default {
   }
 }
 
+// 处理携带参数的url，只取参数之前的路径
+function getBeforeQuestionMark(url) {
+  const questionMarkIndex = url.indexOf('?')
+  if (questionMarkIndex !== -1) {
+    return url.slice(0, questionMarkIndex)
+  }
+  return url
+}
+
 function getShowUuid(uuid, list) {
-  let menu = list.find((m) => m.uuid === uuid)
+  // 拿uuid去菜单中找对应的uuid或者originPath,originPath主要用与匹配初始化的菜单上携带参数的问题
+  let menu = list.find((m) => m.uuid === uuid || m.originPath === uuid)
   if (menu) {
     return menu.hide ? menu.pid : menu.uuid
   }