From d7d8c3782cc756459e4496df5542cec39ffb2eda Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Sat, 2 Dec 2023 22:00:19 +0800
Subject: [PATCH] Fixed a bug where the toggle dictionary could not load words

---
 src/components/list/BaseList.vue              |  2 +-
 src/pages/practice/index.vue                  |  1 -
 src/pages/practice/practice-article/index.vue |  9 ++++-----
 src/pages/practice/practice-word/index.vue    | 18 ++++++++++--------
 src/stores/base.ts                            |  2 ++
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/list/BaseList.vue b/src/components/list/BaseList.vue
index 875c8829..16fae05d 100644
--- a/src/components/list/BaseList.vue
+++ b/src/components/list/BaseList.vue
@@ -27,7 +27,7 @@ const emit = defineEmits<{
 }>()
 
 //虚拟列表长度限制
-const limit = 99
+const limit = 101
 const settingStore = useSettingStore()
 const listRef: any = $ref()
 
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index 15c84769..ccaa60ad 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -133,7 +133,6 @@ onMounted(() => {
   emitter.on(ShortcutKey.ToggleTheme, toggleTheme)
   emitter.on(ShortcutKey.ToggleConciseMode, toggleConciseMode)
   emitter.on(ShortcutKey.TogglePanel, togglePanel)
-  practiceRef.getCurrentPractice()
 })
 
 onUnmounted(() => {
diff --git a/src/pages/practice/practice-article/index.vue b/src/pages/practice/practice-article/index.vue
index 54696659..50f08c9c 100644
--- a/src/pages/practice/practice-article/index.vue
+++ b/src/pages/practice/practice-article/index.vue
@@ -44,13 +44,10 @@ watch([
   // () => store.load,
   () => store.currentDict.articles,
 ], n => {
-  console.log('n', n)
   getCurrentPractice()
 })
 
-onMounted(() => {
-  getCurrentPractice()
-})
+onMounted(getCurrentPractice)
 
 function setArticle(val: Article) {
   store.currentDict.articles[store.currentDict.chapterIndex] = cloneDeep(val)
@@ -218,13 +215,15 @@ function changePracticeArticle(val: {
   }
 }
 
-defineExpose({getCurrentPractice})
 const settingStore = useSettingStore()
 
 const {
   isArticleCollect,
   toggleArticleCollect
 } = useArticleOptions()
+
+defineExpose({getCurrentPractice})
+
 </script>
 
 <template>
diff --git a/src/pages/practice/practice-word/index.vue b/src/pages/practice/practice-word/index.vue
index d7e37ce6..793c320c 100644
--- a/src/pages/practice/practice-word/index.vue
+++ b/src/pages/practice/practice-word/index.vue
@@ -20,25 +20,27 @@ let wordData = $ref({
 })
 
 watch([
-  () => store.load,
   () => store.currentDict.words,
 ], n => {
   getCurrentPractice()
 })
 
 function getCurrentPractice() {
-  // console.log('store.currentDict',store.currentDict)
-  if (store.currentDict.translateLanguage === 'common') {
+  if (store.chapter.length) {
+    wordData.words = store.chapter
+    wordData.index = 0
+
     store.chapter.map((w: Word) => {
-      let res = runtimeStore.translateWordList.find(a => a.name === w.name)
-      if (res) w = Object.assign(w, res)
+      if (!w.trans.length){
+        let res = runtimeStore.translateWordList.find(a => a.name === w.name)
+        if (res) w = Object.assign(w, res)
+      }
     })
   }
-  wordData.words = cloneDeep(store.chapter)
-  wordData.index = 0
-  // console.log('wordData', wordData)
 }
 
+onMounted(getCurrentPractice)
+
 defineExpose({getCurrentPractice})
 
 </script>
diff --git a/src/stores/base.ts b/src/stores/base.ts
index 4b194d37..ee1ae1e1 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -5,6 +5,7 @@ import {emitter, EventKey} from "@/utils/eventBus.ts"
 import {useRuntimeStore} from "@/stores/runtime.ts";
 import * as localforage from "localforage";
 import {nanoid} from "nanoid";
+import {state} from "vue-tsc/out/shared";
 
 export interface BaseState {
   myDictList: Dict[],
@@ -290,6 +291,7 @@ export const useBaseStore = defineStore('base', {
         this.myDictList.push(cloneDeep(dict))
         this.current.index = this.myDictList.length - 1
       }
+
       emitter.emit(EventKey.resetWord)
       emitter.emit(EventKey.changeDict)
     }