修复路由参数丢失的bug

piexlmax · piexlmax · commit 9fbefc94f35a · 2022-01-25T16:20:34.000+08:00
diff --git a/web/package.json b/web/package.json
@@ -14,7 +14,7 @@
         "axios": "^0.19.2",
         "core-js": "^3.6.5",
         "echarts": "4.9.0",
-        "element-plus": "1.2.0-beta.6",
+        "element-plus": "1.3.0-beta.8",
         "highlight.js": "^10.6.0",
         "marked": "^2.0.0",
         "mitt": "^3.0.0",
diff --git a/web/src/pinia/modules/router.js b/web/src/pinia/modules/router.js
@@ -7,14 +7,15 @@ import { ref } from 'vue'
 const routerListArr = []
 const keepAliveRoutersArr = []
 
-const formatRouter = (routes) => {
+const formatRouter = (routes, routeMap) => {
   routes && routes.forEach(item => {
     if ((!item.children || item.children.every(ch => ch.hidden)) && item.name !== '404' && !item.hidden) {
       routerListArr.push({ label: item.meta.title, value: item.name })
     }
     item.meta.hidden = item.hidden
+    routeMap[item.name] = item
     if (item.children && item.children.length > 0) {
-      formatRouter(item.children)
+      formatRouter(item.children, routeMap)
     }
   })
 }
@@ -35,6 +36,7 @@ export const useRouterStore = defineStore('router', () => {
   const asyncRouters = ref([])
   const routerList = ref(routerListArr)
   const keepAliveRouters = ref(keepAliveRoutersArr)
+  const routeMap = ({})
   // 从后台获取动态路由
   const SetAsyncRouter = async() => {
     const baseRouter = [{
@@ -57,7 +59,7 @@ export const useRouterStore = defineStore('router', () => {
       },
       component: 'view/error/index.vue'
     })
-    formatRouter(asyncRouter)
+    formatRouter(asyncRouter, routeMap)
     baseRouter[0].children = asyncRouter
     baseRouter.push({
       path: '/:catchAll(.*)',
@@ -76,7 +78,8 @@ export const useRouterStore = defineStore('router', () => {
     asyncRouters,
     routerList,
     keepAliveRouters,
-    SetAsyncRouter
+    SetAsyncRouter,
+    routeMap
   }
 })
 
diff --git a/web/src/view/layout/aside/asideComponent/menuItem.vue b/web/src/view/layout/aside/asideComponent/menuItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-menu-item :index="routerInfo.name" :route="{parameters:routerInfo.parameters}">
+  <el-menu-item :index="routerInfo.name">
     <el-icon>
       <component :is="routerInfo.meta.icon" />
     </el-icon>
diff --git a/web/src/view/layout/aside/index.vue b/web/src/view/layout/aside/index.vue
@@ -74,23 +74,23 @@ onUnmounted(() => {
   emitter.off('collapse')
 })
 
-const selectMenuItem = (index, _, ele) => {
+const selectMenuItem = (index, _, ele, aaa) => {
   const query = {}
   const params = {}
-  ele?.route?.parameters &&
-    ele.route.parameters.forEach((item) => {
+ routerStore.routeMap[index]?.parameters &&
+    routerStore.routeMap[index]?.parameters.forEach((item) => {
       if (item.type === 'query') {
         query[item.key] = item.value
       } else {
         params[item.key] = item.value
       }
     })
-  if (index === route.name) return
-  if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
-    window.open(index)
-  } else {
-    router.push({ name: index, query, params })
-  }
+ if (index === route.name) return
+ if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
+   window.open(index)
+ } else {
+   router.push({ name: index, query, params })
+ }
 }
 </script>
 
