From 5fe23d3f694f67d832b3b7dc5323719701647e83 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 11 Mar 2025 17:29:00 +0900
Subject: [PATCH] Update RouterView.vue

---
 .../src/components/global/RouterView.vue      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue
index c2718b2f00..0c21289a5c 100644
--- a/packages/frontend/src/components/global/RouterView.vue
+++ b/packages/frontend/src/components/global/RouterView.vue
@@ -4,13 +4,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<Suspense :timeout="0">
-	<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)"/>
+<KeepAlive
+	:max="prefer.s.numberOfPageCache"
+	:exclude="pageCacheController"
+>
+	<Suspense :timeout="0">
+		<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)"/>
 
-	<template #fallback>
-		<MkLoading/>
-	</template>
-</Suspense>
+		<template #fallback>
+			<MkLoading/>
+		</template>
+	</Suspense>
+</KeepAlive>
 </template>
 
 <script lang="ts" setup>
@@ -74,8 +79,8 @@ async function onChange({ resolved, key: newKey }) {
 			key.value = newKey + JSON.stringify(Object.fromEntries(current.props));
 
 			nextTick(async () => {
-				res();
-				//setTimeout(res, 1000);
+				//res();
+				setTimeout(res, 100);
 
 				// ページ遷移完了後に再びキャッシュを有効化
 				if (clearCacheRequested.value) {