From 17842a0e34e4fd10d84c534ef6199d8ada423fda Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Mon, 9 Nov 2020 18:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96reload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue          | 30 +++---------------------------
 src/layout/index.vue | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7b8ebe4f..a3efc321 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,23 +1,15 @@
 <template>
     <div id="app">
-        <RouterView v-if="isRouterAlive" />
+        <RouterView />
     </div>
 </template>
 
 <script>
 export default {
-    provide() {
-        return {
-            reload: this.reload
-        }
-    },
     data() {
-        return {
-            isRouterAlive: true
-        }
+        return {}
     },
     watch: {
-        $route: 'routeChange',
         '$store.state.keepAlive.list'(val) {
             process.env.NODE_ENV == 'development' && console.log(`[ keepAliveList ] ${val}`)
         },
@@ -46,23 +38,7 @@ export default {
         }
         window.onresize()
     },
-    methods: {
-        reload(type = 1) {
-            if (type == 1) {
-                this.isRouterAlive = false
-                this.$nextTick(() => (this.isRouterAlive = true))
-            } else {
-                this.$router.push({
-                    name: 'reload'
-                })
-            }
-        },
-        routeChange(newVal, oldVal) {
-            if (newVal.name == oldVal.name) {
-                this.reload()
-            }
-        }
-    },
+    methods: {},
     metaInfo() {
         return {
             title: this.$store.state.settings.enableDynamicTitle && this.$store.state.settings.title,
diff --git a/src/layout/index.vue b/src/layout/index.vue
index ae77aa81..33b4d1d3 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -76,7 +76,7 @@
                     <Breadcrumb :class="{'shadow': scrollTop}" />
                     <div class="main">
                         <transition name="main" mode="out-in">
-                            <keep-alive :include="$store.state.keepAlive.list">
+                            <keep-alive v-if="isRouterAlive" :include="$store.state.keepAlive.list">
                                 <RouterView :key="$route.path" />
                             </keep-alive>
                         </transition>
@@ -103,11 +103,21 @@ import ThemeSetting from './components/ThemeSetting'
 export default {
     name: 'Layout',
     components: {
-        Logo, Search, SidebarItem, Breadcrumb, ThemeSetting, UserMenu
+        Logo,
+        Search,
+        SidebarItem,
+        Breadcrumb,
+        ThemeSetting,
+        UserMenu
+    },
+    provide() {
+        return {
+            reload: this.reload
+        }
     },
-    inject: ['reload'],
     data() {
         return {
+            isRouterAlive: true,
             routePath: '',
             sidebarScrollTop: 0,
             scrollTop: 0
@@ -135,6 +145,7 @@ export default {
         }
     },
     watch: {
+        $route: 'routeChange',
         '$store.state.settings.sidebarCollapse'(val) {
             if (this.$store.state.settings.mode == 'mobile') {
                 if (!val) {
@@ -164,6 +175,21 @@ export default {
         window.removeEventListener('scroll', this.onScroll)
     },
     methods: {
+        reload(type = 1) {
+            if (type == 1) {
+                this.isRouterAlive = false
+                this.$nextTick(() => (this.isRouterAlive = true))
+            } else {
+                this.$router.push({
+                    name: 'reload'
+                })
+            }
+        },
+        routeChange(newVal, oldVal) {
+            if (newVal.name == oldVal.name) {
+                this.reload()
+            }
+        },
         onSidebarScroll(e) {
             this.sidebarScrollTop = e.target.scrollTop
         },