Fix KeepAlive

dlut-word-learner · Nov 14, 2023 · 01ce42b · 01ce42b
1 parent 19a324f
commit 01ce42b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -81,9 +81,7 @@
       <router-view v-slot="{ Component }">
         <transition name="globalAnimation" appear mode="out-in">
           <keep-alive
-            :include="['QwertyMode', 'Learn', 'Review']"
-            :exclude="excludeCache"
-          >
+            :include="includeCache">
             <component :is="Component" :key="$route.name" />
           </keep-alive>
         </transition>
@@ -99,7 +97,7 @@ import { useI18n } from "vue-i18n";
 import { useLoginStore } from "./store/loginStore";
 import { useOptionsStore } from "./store/optionsStore";
 import { Task, useTaskStore } from "./store/taskStore";
-import { excludeCache } from "./components/Dicts/common";
+import { includeCache } from "./components/Dicts/common";
 import router from "./router";
 
 const { t } = useI18n();

diff --git a/src/components/Dicts/Dicts.vue b/src/components/Dicts/Dicts.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script setup lang="ts">
-import { DictVo, excludeCache, Lang, sortWithIntersection } from "./common";
+import { DictVo, includeCache, Lang, sortWithIntersection } from "./common";
 import { Ref, ref, onMounted, computed } from "vue";
 import { i18n } from "../../main";
 import { useI18n } from "vue-i18n";
@@ -149,7 +149,7 @@ function startNewTask(dict: DictVo, task: Task): void {
     router.push("Login");
     return;
   }
-  excludeCache.value = Task[taskStore.type];
+  includeCache.value = Task[taskStore.type];
   const wordsPerRound = ref(0);
 
   switch (task) {

diff --git a/src/components/Dicts/common.ts b/src/components/Dicts/common.ts
@@ -35,7 +35,7 @@ export enum Rating {
   Easy,
 }
 
-export const excludeCache = ref("");
+export const includeCache = ref("");
 
 export function sortWithIntersection(
   a: DictVo[],

diff --git a/src/components/Learn.vue b/src/components/Learn.vue
@@ -108,7 +108,7 @@ import { computed, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { onKeyStroke } from "@vueuse/core";
 import { isKatakana, toKana, toRomaji, toHiragana, toKatakana } from "wanakana";
-import { Lang, WordVo, excludeCache } from "./Dicts/common";
+import { Lang, WordVo, includeCache } from "./Dicts/common";
 import { getWordMain } from "./WordCard";
 import { Task, useTaskStore } from "../store/taskStore";
 import { correctSound, wrongSound, typingSound } from "./SoundEffects";
@@ -196,7 +196,7 @@ const currWordSound = computed(() => {
 });
 
 const initData = async () => {
-  excludeCache.value = "";
+  includeCache.value = Task[Task.Learn];
 
   await axios
     .get(`/api/dicts/${props.dictId}/learn`, {
@@ -329,6 +329,7 @@ function inputDone(isCorrect: boolean): void {
 }
 
 function goBack(): void {
+  includeCache.value = "";
   taskStore.type = Task.None;
   router.push("/dicts");
 }

diff --git a/src/components/QwertyMode.vue b/src/components/QwertyMode.vue
@@ -114,7 +114,7 @@ import { useOptionsStore } from "../store/optionsStore";
 import { Task, useTaskStore } from "../store/taskStore";
 import { useI18n } from "vue-i18n";
 import { isKatakana, toHiragana, toKatakana } from "wanakana";
-import { Lang, WordVo, excludeCache } from "./Dicts/common";
+import { Lang, WordVo, includeCache } from "./Dicts/common";
 import { correctSound, wrongSound, typingSound } from "./SoundEffects";
 import { getWordMain } from "./WordCard";
 import { throwError } from "./Error";
@@ -176,7 +176,7 @@ const currWordSound = computed(() => {
 });
 
 const initData = async () => {
-  excludeCache.value = "";
+  includeCache.value = Task[Task.QwertyMode];
 
   await axios
     .get(`/api/dicts/${props.dictId}/learn`, {
@@ -292,7 +292,7 @@ function finish(): void {
 }
 
 function goBack(): void {
-  excludeCache.value = Task[taskStore.type];
+  includeCache.value = "";
   taskStore.type = Task.None;
   router.push("/dicts");
 }

diff --git a/src/components/Review.vue b/src/components/Review.vue
@@ -91,7 +91,7 @@
 
 <script setup lang="ts">
 import { Task, useTaskStore } from "../store/taskStore";
-import { Lang, Rating, WordToReviewVo, excludeCache } from "./Dicts/common";
+import { Lang, Rating, WordToReviewVo, includeCache } from "./Dicts/common";
 import { computed, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { onKeyStroke } from "@vueuse/core";
@@ -187,7 +187,7 @@ const currWordSound = computed(() => {
 });
 
 const initData = async () => {
-  excludeCache.value = "";
+  includeCache.value = Task[Task.Review];
 
   await axios
     .get(`/api/dicts/${props.dictId}/review`, {
@@ -311,6 +311,7 @@ function inputDone(isCorrect: boolean): void {
 }
 
 function goBack(): void {
+  includeCache.value = "";
   taskStore.type = Task.None;
   router.push("/dicts");
 }