Merge branch 'master' into dev

src/pages/article/components/TypingArticle.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted, watch } from "vue"
-import { Article, ArticleWord, PracticeArticleWordType, Sentence, Word } from "@/types/types.ts";
+import {Article, ArticleWord, PracticeArticleWordType, Sentence, ShortcutKey, Word} from "@/types/types.ts";
 import { useBaseStore } from "@/stores/base.ts";
 import { useSettingStore } from "@/stores/setting.ts";
 import { usePlayBeep, usePlayCorrect, usePlayKeyboardAudio } from "@/hooks/sound.ts";
-import { emitter, EventKey } from "@/utils/eventBus.ts";
+import {emitter, EventKey, useEvents} from "@/utils/eventBus.ts";
 import { _dateFormat, _nextTick, msToHourMinute, msToMinute, total } from "@/utils";
 import '@imengyu/vue3-context-menu/lib/vue3-context-menu.css'
 import ContextMenu from '@imengyu/vue3-context-menu'
@@ -522,6 +522,11 @@ onUnmounted(() => {
   emitter.off(EventKey.onTyping, onTyping)
 })
 
+useEvents([
+  [ShortcutKey.KnowWord, onTyping],
+  [ShortcutKey.UnknownWord, onTyping],
+])
+
 defineExpose({showSentence, play, del, hideSentence, nextSentence, init})
 
 function isCurrent(i: number, j: number, w: number) {

src/pages/word/PracticeWords.vue

@@ -555,7 +555,7 @@ useEvents([
               <div class="word">{{ prevWord.word }}</div>
             </Tooltip>
           </div>
-          <div class="center gap-2 cursor-pointer float-right "
+          <div class="center gap-2 cursor-pointer float-right mr-3"
                @click="next(false)"
                v-if="nextWord">
             <Tooltip

src/pages/word/components/TypeWord.vue

@@ -220,9 +220,10 @@ async function onTyping(e: KeyboardEvent) {
       wrong = letter
       playBeep()
       volumeIconRef?.play()
-      await sleep(500)
-      if (settingStore.inputWrongClear) input = ''
-      wrong = ''
+      setTimeout(()=>{
+        if (settingStore.inputWrongClear) input = ''
+        wrong = ''
+      },500)
     }
     // 更新当前单词信息
     updateCurrentWordInfo();