From 1012c419acb839d000eb3812d2e9a1be87669497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Sat, 13 Aug 2022 15:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20keep-alive=20=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 magic-boot-ui/src/layout/layout.vue | 5 ++---
 magic-boot-ui/src/layout/none.vue   | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/magic-boot-ui/src/layout/layout.vue b/magic-boot-ui/src/layout/layout.vue
index 4c30eb2..02f3b80 100644
--- a/magic-boot-ui/src/layout/layout.vue
+++ b/magic-boot-ui/src/layout/layout.vue
@@ -44,10 +44,9 @@
         <div class="main-box">
           <el-main>
             <router-view v-slot="{ Component }">
-              <keep-alive>
-                <component v-if="$route.meta.keepAlive" :is="Component" :key="$route.path" />
+              <keep-alive :include="$global.visitedViews.filter(it => it.meta.keepAlive).map(it => it.path.substr(it.path.lastIndexOf('/') + 1))">
+                <component :is="Component" :key="$route.path" />
               </keep-alive>
-              <component v-if="!$route.meta.keepAlive" :is="Component" :key="$route.path" />
             </router-view>
           </el-main>
         </div>
diff --git a/magic-boot-ui/src/layout/none.vue b/magic-boot-ui/src/layout/none.vue
index 313a3cd..2a46bd3 100644
--- a/magic-boot-ui/src/layout/none.vue
+++ b/magic-boot-ui/src/layout/none.vue
@@ -1,8 +1,7 @@
 <template>
   <router-view v-slot="{ Component }">
-    <keep-alive>
-      <component v-if="$route.meta.keepAlive" :is="Component" :key="$route.path" />
+    <keep-alive :include="$global.visitedViews.filter(it => it.meta.keepAlive).map(it => it.path.substr(it.path.lastIndexOf('/') + 1))">
+      <component :is="Component" :key="$route.path" />
     </keep-alive>
-    <component v-if="!$route.meta.keepAlive" :is="Component" :key="$route.path" />
   </router-view>
-</template>
\ No newline at end of file
+</template>