From cb41ab4f8aa9b3407d62ca7bf3810d5c501a6b05 Mon Sep 17 00:00:00 2001
From: chuzhixin <1204505056@qq.com>
Date: Wed, 28 Oct 2020 09:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=85Update=20public=20layout=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                        | 9 ++++-----
 src/layout/vab-menu/components/MenuItem.vue | 2 +-
 src/layout/vab-menu/index.vue               | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index e0c2f5d..b303d4b 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -92,11 +92,10 @@
     },
     watch: {
       $route: {
-        handler({ fullPath, matched }) {
-          //暂未研究清楚此处，待改进
-          if (fullPath === '/index') fullPath = '/'
-          if (fullPath === '/test/test') fullPath = '/test'
-          this.selectedKeys = [fullPath]
+        handler({ path, matched }) {
+          matched[0].children.length > 1
+            ? (this.selectedKeys = [path])
+            : (this.selectedKeys = [matched[0].path])
           this.openKeys = [matched[0].path]
         },
         immediate: true,
diff --git a/src/layout/vab-menu/components/MenuItem.vue b/src/layout/vab-menu/components/MenuItem.vue
index 2f7e8e0..41936e4 100644
--- a/src/layout/vab-menu/components/MenuItem.vue
+++ b/src/layout/vab-menu/components/MenuItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-menu-item :key="routeChildren.fullPath" @click="handleLink">
+  <a-menu-item :key="routeChildren.path" @click="handleLink">
     <span class="anticon">
       <vab-icon :icon="routeChildren.meta.icon"></vab-icon>
     </span>
diff --git a/src/layout/vab-menu/index.vue b/src/layout/vab-menu/index.vue
index 5cc4c9b..9e52190 100644
--- a/src/layout/vab-menu/index.vue
+++ b/src/layout/vab-menu/index.vue
@@ -8,7 +8,7 @@
     <template v-if="item.children && item.children.length">
       <vab-menu
         v-for="route in item.children"
-        :key="route.fullPath"
+        :key="route.path"
         :item="route"
       ></vab-menu>
     </template>