From 0d7999ccf14e4016c4ae9f6a3cb610ab541257b5 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Tue, 31 Oct 2023 11:53:01 +0800
Subject: [PATCH] debug

---
 src/assets/css/style.scss                      |  2 ++
 src/components/ListItem.vue                    |  4 ++--
 src/components/Practice/Options.vue            |  6 +++++-
 .../Practice/PracticeArticle/TypingArticle.vue |  1 +
 .../Practice/PracticeWord/PracticeWord.vue     | 11 ++++++++++-
 .../Practice/PracticeWord/Typing.vue           |  2 +-
 .../Practice/PracticeWord/TypingWord.vue       |  3 ++-
 src/components/VolumeIcon.vue                  |  6 +++++-
 src/components/WordList.vue                    |  1 +
 src/stores/base.ts                             | 18 +++++++++---------
 10 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss
index 57e43bd6..c9d40cf3 100644
--- a/src/assets/css/style.scss
+++ b/src/assets/css/style.scss
@@ -29,6 +29,8 @@ html[data-theme='dark'] {
   //--color-tooltip-bg: rgb(60, 63, 65);
   --color-tooltip-bg: #252525;
   --color-font-1: white;
+
+  --color-item-bg: gray;
 }
 
 $anim-time: 0.3s;
diff --git a/src/components/ListItem.vue b/src/components/ListItem.vue
index 5a3f3d58..85e35786 100644
--- a/src/components/ListItem.vue
+++ b/src/components/ListItem.vue
@@ -38,8 +38,8 @@ defineEmits<{
 .list-item {
   width: 100%;
   box-sizing: border-box;
-  background: white;
-  color: black;
+  background: var(--color-item-bg);
+  color: var(--color-font-1);
   font-size: 18rem;
   border-radius: 8rem;
   display: flex;
diff --git a/src/components/Practice/Options.vue b/src/components/Practice/Options.vue
index a65dc7cb..e79f9d27 100644
--- a/src/components/Practice/Options.vue
+++ b/src/components/Practice/Options.vue
@@ -4,6 +4,10 @@ import Tooltip from "@/components/Tooltip.vue";
 import IconWrapper from "@/components/IconWrapper.vue";
 import {Icon} from "@iconify/vue";
 
+defineProps<{
+  showEdit?: boolean
+}>()
+
 const emit = defineEmits<{
   remove: [],
   collect: [],
@@ -14,7 +18,7 @@ const emit = defineEmits<{
 
 <template>
   <div class="options">
-    <Tooltip title="编辑(快捷键：Ctrl + E)">
+    <Tooltip  v-if="showEdit" title="编辑(快捷键：Ctrl + E)">
       <IconWrapper>
         <Icon icon="tabler:edit" class="menu"
               @click="emit('edit')"/>
diff --git a/src/components/Practice/PracticeArticle/TypingArticle.vue b/src/components/Practice/PracticeArticle/TypingArticle.vue
index c4a427fb..ae7f8a54 100644
--- a/src/components/Practice/PracticeArticle/TypingArticle.vue
+++ b/src/components/Practice/PracticeArticle/TypingArticle.vue
@@ -378,6 +378,7 @@ function toggleCollect() {
       <div class="titleTranslate" v-if="settingStore.translate">{{ props.article.titleTranslate }}</div>
       <div class="options-wrapper">
         <Options
+            :show-edit="true"
             @edit="emit('edit',props.article)"
             @collect="toggleCollect"
             @skip="emit('next')"
diff --git a/src/components/Practice/PracticeWord/PracticeWord.vue b/src/components/Practice/PracticeWord/PracticeWord.vue
index 8311b680..fd5e8dc1 100644
--- a/src/components/Practice/PracticeWord/PracticeWord.vue
+++ b/src/components/Practice/PracticeWord/PracticeWord.vue
@@ -2,11 +2,14 @@
 
 import TypingWord from "@/components/Practice/PracticeWord/TypingWord.vue";
 import {$ref} from "vue/macros";
-import {cloneDeep} from "lodash-es";
+import {chunk, cloneDeep} from "lodash-es";
 import {useBaseStore} from "@/stores/base.ts";
 import {onMounted, watch} from "vue";
+import {useRuntimeStore} from "@/stores/runtime.ts";
+import {Word} from "@/types.ts";
 
 const store = useBaseStore()
+const runtimeStore = useRuntimeStore()
 
 let wordData = $ref({
   words: [],
@@ -25,6 +28,12 @@ watch([
 
 function getCurrentPractice() {
   // console.log('store.currentDict',store.currentDict)
+  if (store.currentDict.translateLanguage === 'common') {
+    store.chapter.map((w: Word) => {
+      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)
diff --git a/src/components/Practice/PracticeWord/Typing.vue b/src/components/Practice/PracticeWord/Typing.vue
index fd408869..65d4eb8c 100644
--- a/src/components/Practice/PracticeWord/Typing.vue
+++ b/src/components/Practice/PracticeWord/Typing.vue
@@ -46,7 +46,7 @@ watch(() => props.word, () => {
   wordRepeatCount = 0
   inputLock = false
   if (settingStore.wordSound) {
-    volumeIconRef?.play()
+    volumeIconRef?.play(400,true)
   }
 })
 
diff --git a/src/components/Practice/PracticeWord/TypingWord.vue b/src/components/Practice/PracticeWord/TypingWord.vue
index dd48dd06..e699ef6b 100644
--- a/src/components/Practice/PracticeWord/TypingWord.vue
+++ b/src/components/Practice/PracticeWord/TypingWord.vue
@@ -308,9 +308,10 @@ useOnKeyboardEventListener(onKeyDown, onKeyUp)
     }
   }
 
-  .options-wrapper{
+  .options-wrapper {
     position: absolute;
     //bottom: 0;
+    margin-left: -30rem;
     margin-top: 120rem;
   }
 }
diff --git a/src/components/VolumeIcon.vue b/src/components/VolumeIcon.vue
index 2f16778d..df6db949 100644
--- a/src/components/VolumeIcon.vue
+++ b/src/components/VolumeIcon.vue
@@ -15,7 +15,11 @@ let step = $ref(2)
 let count = $ref(0)
 const emit = defineEmits(['click'])
 
-function play(time = props.time) {
+function play(time = props.time, reset = false) {
+  if (reset) {
+    step = 2
+    count = 0
+  }
   if (count === 0) {
     props?.cb?.()
   }
diff --git a/src/components/WordList.vue b/src/components/WordList.vue
index fa16ccfe..868655f0 100644
--- a/src/components/WordList.vue
+++ b/src/components/WordList.vue
@@ -55,6 +55,7 @@ const playWordAudio = usePlayWordAudio()
   <div class="list" ref="listRef">
     <ListItem
         v-for="(word,i) in list" :key="i"
+        @click="emit('change',i)"
         :active="activeIndex === i"
         class="item"
         :class="{active:activeIndex === i}"
diff --git a/src/stores/base.ts b/src/stores/base.ts
index bbc4237d..8fe1bede 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -194,10 +194,10 @@ export const useBaseStore = defineStore('base', {
         }
       ],
       current: {
-        // dictType: DictType.word,
-        // index: 1,
-        dictType: DictType.article,
-        index: 0,
+        dictType: DictType.word,
+        index: 1,
+        // dictType: DictType.article,
+        // index: 0,
         practiceType: DictType.word,
       },
       simpleWords: [
@@ -301,7 +301,7 @@ export const useBaseStore = defineStore('base', {
         ].includes(this.current.dictType)) {
           if (!this.currentDict.originWords.length) {
             let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
-            // let r = await fetch(`.${this.currentDict.url}`)0
+            // let r = await fetch(`.${this.currentDict.url}`)
             r.json().then(v => {
               if (this.currentDict.translateLanguage === 'common') {
                 const runtimeStore = useRuntimeStore()
@@ -310,14 +310,14 @@ export const useBaseStore = defineStore('base', {
                     console.time()
                     runtimeStore.translateWordList = list
 
-                    v.map((w: Word) => {
+                    this.currentDict.originWords = cloneDeep(v)
+                    this.currentDict.words = cloneDeep(v)
+                    this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
+                    this.currentDict.chapterWords[this.currentDict.chapterIndex].map((w: Word) => {
                       let res = list.find(a => a.name === w.name)
                       if (res) w = Object.assign(w, res)
                     })
 
-                    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()