From 5922475b33b16db7b56cf0cf71f782ccbc0f1e9a Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Mon, 23 Oct 2023 00:34:16 +0800
Subject: [PATCH] update

---
 src/components/Practice/TypeWord.vue | 26 ++++++++----------
 src/stores/base.ts                   | 40 ++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/components/Practice/TypeWord.vue b/src/components/Practice/TypeWord.vue
index 4395db5a..43270402 100644
--- a/src/components/Practice/TypeWord.vue
+++ b/src/components/Practice/TypeWord.vue
@@ -79,15 +79,15 @@ let allList = $ref([])
 
 
 const word = $computed(() => {
-  let w = data.words[data.index]
-  let s = allList.find(s => s.name === w.name)
-  if (s) return s
-  else return w ?? {
-    trans: [],
-    name: '',
-    usphone: '',
-    ukphone: '',
-  }
+  // let w = data.words[data.index]
+  // let s = allList.find(s => s.name === w.name)
+  // if (s) return s
+  // else return w ?? {
+  //   trans: [],
+  //   name: '',
+  //   usphone: '',
+  //   ukphone: '',
+  // }
   return data.words[data.index] ?? {
     trans: [],
     name: '',
@@ -113,12 +113,7 @@ onMounted(() => {
   emitter.on(EventKey.resetWord, () => {
     wrong = input = ''
   })
-  fetch('./translate/en2zh_CN.json').then(r => {
-    r.json().then(v => {
-      console.log('v', v)
-      allList = v
-    })
-  })
+
 })
 
 function next(isTyping: boolean = true) {
@@ -445,6 +440,7 @@ useOnKeyboardEventListener(onKeyDown, onKeyUp)
   .phonetic, .translate {
     font-size: 20rem;
     margin-left: -30rem;
+    transition: all .3s;
   }
 
   .word-wrapper {
diff --git a/src/stores/base.ts b/src/stores/base.ts
index ea125336..291df9ec 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -23,7 +23,7 @@ export const useBaseStore = defineStore('base', {
   state: (): State => {
     return {
       newWordDict: {
-        id:'newWordDict',
+        id: 'newWordDict',
         name: '生词本',
         sort: Sort.normal,
         type: DictType.newWordDict,
@@ -38,7 +38,7 @@ export const useBaseStore = defineStore('base', {
         url: '',
       },
       skipWordDict: {
-        id:'skipWordDict',
+        id: 'skipWordDict',
         name: '简单词',
         sort: Sort.normal,
         type: DictType.skipWordDict,
@@ -53,7 +53,7 @@ export const useBaseStore = defineStore('base', {
         url: '',
       },
       wrongWordDict: {
-        id:'wrongWordDict',
+        id: 'wrongWordDict',
         name: '错词本',
         sort: Sort.normal,
         type: DictType.wrongWordDict,
@@ -69,7 +69,7 @@ export const useBaseStore = defineStore('base', {
       },
       myDicts: [
         {
-          id:'新概念英语2-课文',
+          id: '新概念英语2-课文',
           name: '新概念英语2-课文',
           sort: Sort.normal,
           type: DictType.publicArticle,
@@ -87,7 +87,7 @@ export const useBaseStore = defineStore('base', {
           resourceType: "article"
         },
         {
-          id:'新概念英语2',
+          id: '新概念英语2',
           name: '新概念英语2',
           sort: Sort.normal,
           type: DictType.publicDict,
@@ -198,13 +198,31 @@ export const useBaseStore = defineStore('base', {
           DictType.customDict,
         ].includes(this.current.dictType)) {
           if (!this.currentDict.originWords.length) {
-            let r = await fetch(`/dicts/${this.currentDict.language}/${this.currentDict.resourceType}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
+            let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.resourceType}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
             // let r = await fetch(`.${this.currentDict.url}`)
             r.json().then(v => {
-              this.currentDict.originWords = cloneDeep(v)
-              this.currentDict.words = cloneDeep(v)
-              this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
-              this.load = true
+              fetch('./translate/en2zh_CN.json').then(r => {
+                r.json().then((list: Word[]) => {
+                  console.log('list', list)
+                  console.time()
+
+                  v.map((w: Word) => {
+                    let res = list.find(a => a.name === w.name)
+                    if (res) {
+                      w = Object.assign(w, res)
+                    }
+                    return w
+                  })
+                  console.log('v', v)
+
+                  this.currentDict.originWords = cloneDeep(v)
+                  this.currentDict.words = cloneDeep(v)
+                  this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
+                  this.load = true
+
+                  console.timeEnd()
+                })
+              })
             })
           }
         }
@@ -214,7 +232,7 @@ export const useBaseStore = defineStore('base', {
           DictType.customArticle,
         ].includes(this.current.dictType)) {
           if (!this.currentDict.articles.length) {
-            let r = await fetch(`/dicts/${this.currentDict.language}/${this.currentDict.resourceType}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
+            let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.resourceType}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
             r.json().then((v: any[]) => {
               this.currentDict.articles = cloneDeep(v.map(v => {
                 v.id = uuidv4()