wip: test

Author: zyronon

apps/nuxt/app/components/FsrsRecordsTable.client.vue

@@ -49,6 +49,9 @@ function getStateName(state: number | undefined): string {
   }
   return stateMap[state ?? -1] ?? '未知'
 }
+function getScheduledDays(state: number | undefined): string {
+  return state === 0 ? '立刻' : state + '天后'
+}
 </script>
 
 <template>
@@ -72,28 +75,32 @@ function getStateName(state: number | undefined): string {
     >
       <vxe-column type="seq" width="60" title="序号" fixed="left" />
       <vxe-column field="word" title="单词" min-width="120" fixed="left" sortable />
-      <vxe-column field="last_review" title="最近复习日期" min-width="160" sortable>
+      <vxe-column field="last_review" title="最近复习时间" min-width="160" sortable>
         <template #default="{ row }">
           {{ formatDate(row.last_review as string | Date | null | undefined) }}
         </template>
       </vxe-column>
-      <vxe-column field="due" title="下次复习日期" min-width="160" sortable>
+      <vxe-column field="due" title="下次复习时间" min-width="160" sortable>
         <template #default="{ row }">
           {{ formatDate(row.due as string | Date | null | undefined) }}
         </template>
       </vxe-column>
+      <vxe-column field="scheduled_days" title="复习间隔" min-width="90" sortable>
+        <template #default="{ row }">
+          {{ getScheduledDays(row.scheduled_days) }}
+        </template>
+      </vxe-column>
       <vxe-column field="state" title="状态" min-width="100" sortable>
         <template #default="{ row }">
           {{ getStateName(row.state) }}
         </template>
       </vxe-column>
-      <vxe-column field="stability" title="记忆稳定性" min-width="100" sortable />
-      <vxe-column field="difficulty" title="难度" min-width="80" sortable />
-      <!--      <vxe-column field="elapsed_days" title="经过天数" min-width="90" sortable/>-->
-      <vxe-column field="scheduled_days" title="计划间隔" min-width="90" sortable />
-      <!--      <vxe-column field="learning_steps" title="学习步骤" min-width="90" />-->
       <vxe-column field="reps" title="复习次数" min-width="90" sortable />
       <vxe-column field="lapses" title="遗忘次数" min-width="90" sortable />
+      <!--            <vxe-column field="elapsed_days" title="经过天数" min-width="90" sortable/>-->
+      <!--            <vxe-column field="learning_steps" title="学习步骤" min-width="90" />-->
+      <vxe-column field="stability" title="记忆稳定性" min-width="100" sortable />
+      <vxe-column field="difficulty" title="难度" min-width="80" sortable />
     </vxe-table>
   </div>
 </template>

apps/nuxt/app/components/practice-words-v2/PracticeOnboardingHostV2.vue

@@ -95,5 +95,5 @@ watchOnce(
 <template>
   <ConflictNotice v-if="showConflictNotice" />
   <CollectNotice v-model="showCollectNotice" />
-  <ConflictNotice2 v-if="showConflictNotice2" v-model="showConflictNotice2" />
+  <ConflictNotice2 v-model="showConflictNotice2" />
 </template>

apps/nuxt/app/components/practice-words-v2/TypeWordV2.vue

@@ -24,7 +24,7 @@ import { useInjectedDisplayPolicy } from '~/composables/practice-words/usePracti
 import { emitter, EventKey } from '@typewords/core/utils/eventBus.ts'
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import WordLookupPopover from '@typewords/core/components/word/WordLookupPopover.vue'
-import { BaseButton, BaseIcon, Textarea, ToastComponent, Tooltip, VolumeIcon } from '@typewords/base'
+import { BaseButton, BaseIcon, Textarea, Toast, ToastComponent, Tooltip, VolumeIcon } from '@typewords/base'
 import { useI18n } from 'vue-i18n'
 import { useWordOptions } from '@typewords/core/hooks/dict.ts'
 import { openWordCollectPicker } from '@typewords/core/hooks/useWordCollectPicker.ts'
@@ -233,19 +233,30 @@ const isWordTestVal = computed(() => {
   return props.practiceType === WordPracticeType.Identify && settingStore.identifyMethod === IdentifyMethod.WordTest
 })
 
+let showNotice = false
+
 function onIdentifyKnow() {
   if (isWordTestVal.value) {
     // WordTest 选对
     typingCoreRef?.setWordTestResult?.(true, props.word.word)
     playCorrect()
     emit('know')
+
+    if (!showNotice) {
+      Toast.info($t('press_space_continue'), { duration: 5000 })
+      showNotice = true
+    }
     return
   }
   // SelfAssessment "认识"
   if (!showWordResult) {
     showWordResult = true
     typingCoreRef?.revealWord?.(props.word.word)
     emit('know')
+    if (!showNotice) {
+      Toast.info($t('know_word_tip'), { duration: 5000 })
+      showNotice = true
+    }
   }
 }
 
@@ -256,6 +267,11 @@ function onIdentifyWrong() {
     playBeep()
     emit('wrong')
     playWord(WordPlayTrigger.Typo)
+
+    if (!showNotice) {
+      Toast.info($t('press_space_continue'), { duration: 5000 })
+      showNotice = true
+    }
     return
   }
   // 其他情况透传
@@ -283,7 +299,7 @@ const notice = $computed(() => {
       : props.practiceType === WordPracticeType.Listen
         ? '输入完成后按空格键切换下一个'
         : showWordResult
-          ? typingCoreRef?.right
+          ? typingCoreRef?.isWordRight()
             ? '按空格键切换下一个'
             : $t('press_delete_reinput')
           : '按空格键完成输入'

apps/nuxt/app/components/practice-words-v2/WordIdentifyPanelV2.vue

@@ -131,7 +131,7 @@ defineExpose({
 
 <template>
   <template v-if="isSelfAssessment && !showWordResult">
-    <div class="mt-4 flex gap-2">
+    <div class="mt-4 mb-2 flex gap-2">
       <BaseButton
         :keyboard="`${$t('shortcut')}(${settingStore.shortcutKeyMap[ShortcutKey.KnowWord]})`"
         size="large"

apps/nuxt/app/components/practice-words-v2/WordTypingCoreV2.vue

@@ -30,6 +30,7 @@ import Space from '@typewords/core/components/article/Space.vue'
 import { _nextTick, last, normalizeWord } from '@typewords/core/utils'
 import { useOnKeyboardEventListener } from '@typewords/core/hooks/event.ts'
 import { WordPlayTrigger } from '@typewords/core/composables/useWordPracticeAudio.ts'
+import { Toast } from '@typewords/base'
 
 interface IProps {
   word: Word
@@ -200,6 +201,7 @@ function del() {
 const isSpace = (e: KeyboardEvent) => e.code === 'Space'
 
 async function onTyping(e: KeyboardEvent) {
+  // console.log('onTyping',e)
   if (e.code === 'Backspace') return del()
   // if (waitClear) return
 
@@ -227,7 +229,7 @@ async function onTyping(e: KeyboardEvent) {
           // 错误时，提示用户按删除键，仅默写需要提示
           pressNumber++
           if (pressNumber >= 3) {
-            // Toast handled in parent shell
+            Toast.info($t('press_delete_reinput'), { duration: 2000 })
             pressNumber = 0
           }
         }
@@ -237,6 +239,7 @@ async function onTyping(e: KeyboardEvent) {
       if (isWordRight) {
         pressNumber++
         if (pressNumber >= 3) {
+          Toast.info($t('press_space_continue'), { duration: 2000 })
           pressNumber = 0
         }
       } else {
@@ -474,21 +477,22 @@ function revealWord(wordStr: string) {
   inputLock = true
   input = wordStr
   emitShowWordResult(true)
+  playCorrect()
 }
 
 /** WordTest 选择后设置结果 */
 function setWordTestResult(isCorrect: boolean, wordStr: string) {
   if (isCorrect) {
     input = wordStr
-    // correct sound handled by parent
+    playCorrect()
   } else {
     wrong = wordStr
-    // beep handled by parent
+    playBeep()
   }
 }
 
 defineExpose({
-  right: isWordRight,
+  isWordRight: () => isWordRight,
   revealWord,
   setWordTestResult,
 })

apps/nuxt/app/composables/practice-words/usePracticeWordNavigator.ts

@@ -30,6 +30,7 @@ import type {
   PracticeWordsSource,
   PracticeWrongWordClearAction,
 } from './practice-flow-types.ts'
+import { Toast } from '@typewords/base'
 
 export type NavigatorDeps = {
   getPracticeData: () => PracticeDataV2
@@ -282,6 +283,7 @@ export function createPracticeWordNavigator(deps: NavigatorDeps) {
   function runWrongWordRetry(action: PracticeWrongWordClearAction) {
     const data = deps.getPracticeData()
     // 实际 practiceType 由 resolvePhaseByCtxCursor 从 action.templateId 派生，无需在此设置
+    Toast.info('还有错词，继续巩固一下吧')
     console.log(`[Nav] 还有错词，进入错词清空（templateId=${action.templateId}）`)
     data.words = shuffle(cloneDeep(data.wrongWords))
     data.index = 0
@@ -451,7 +453,10 @@ export function createPracticeWordNavigator(deps: NavigatorDeps) {
         : undefined
       if (loopSubStep?.clearWrongOnSuccess && data.wrongTimes === 0) {
         const rIndex = data.wrongWords.findIndex(v => v.word.toLowerCase() === temp)
-        if (rIndex >= 0) data.wrongWords.splice(rIndex, 1)
+        if (rIndex >= 0) {
+          Toast.success(temp+' 已自动从错词列表移除！原因：跟写时错误，但拼写时正确')
+          data.wrongWords.splice(rIndex, 1)
+        }
       }
 
       data.wrongTimesMap[temp] = preTimes + data.wrongTimes

packages/core/src/components/dialog/ConflictNotice2.vue

@@ -9,7 +9,7 @@ const Dialog = defineAsyncComponent(() => import('@typewords/base/Dialog'))
 let settingStore = useSettingStore()
 const model = defineModel()
 
-useDisableEventListener(() => model)
+useDisableEventListener(model)
 </script>
 
 <template>