自由练习
diff --git a/src/pages/word/components/Footer.vue b/src/pages/word/components/Footer.vue
index 48479272..f959ee57 100644
--- a/src/pages/word/components/Footer.vue
+++ b/src/pages/word/components/Footer.vue
@@ -2,7 +2,7 @@
import { inject, Ref } from 'vue'
import { usePracticeStore } from '@/stores/practice.ts'
import { useSettingStore } from '@/stores/setting.ts'
-import { PracticeData, ShortcutKey } from '@/types/types.ts'
+import { PracticeData, ShortcutKey, WordPracticeStage } from '@/types/types.ts'
import BaseIcon from '@/components/BaseIcon.vue'
import Tooltip from '@/components/base/Tooltip.vue'
import Progress from '@/components/base/Progress.vue'
@@ -35,43 +35,52 @@ function format(val: number, suffix: string = '', check: number = -1) {
const status = $computed(() => {
if (isTypingWrongWord.value) return '复习错词'
- return getStepStr(statStore.step)
+ return getStageStr(statStore.stage)
})
-function getStepStr(step: number) {
+function getStageStr(stage: WordPracticeStage) {
let str = ''
- switch (step) {
- case 0:
- str += `学习新词`
+ switch (stage) {
+ case WordPracticeStage.FollowWriteNewWord:
+ str += `跟写新词`
break
- case 1:
+ case WordPracticeStage.IdentifyNewWord:
+ str += `自测新词`
+ break
+ case WordPracticeStage.ListenNewWord:
str += `听写新词`
break
- case 2:
+ case WordPracticeStage.DictationNewWord:
str += `默写新词`
break
- case 3:
+ case WordPracticeStage.FollowWriteReview:
+ str += `跟写上次学习`
+ break
+ case WordPracticeStage.IdentifyReview:
str += `自测上次学习`
break
- case 4:
- str += '听写上次学习'
+ case WordPracticeStage.ListenReview:
+ str += `听写上次学习`
break
- case 5:
- str += '默写上次学习'
+ case WordPracticeStage.DictationReview:
+ str += `默写上次学习`
break
- case 6:
+ case WordPracticeStage.FollowWriteReviewAll:
+ str += '跟写之前学习'
+ break
+ case WordPracticeStage.IdentifyReviewAll:
str += '自测之前学习'
break
- case 7:
+ case WordPracticeStage.ListenReviewAll:
str += '听写之前学习'
break
- case 8:
+ case WordPracticeStage.DictationReviewAll:
str += '默写之前学习'
break
- case 9:
+ case WordPracticeStage.Complete:
str += '学习完成'
break
- case 10:
+ case WordPracticeStage.Shuffle:
str += '随机复习'
break
}
@@ -128,31 +137,31 @@ const progress = $computed(() => {
diff --git a/src/stores/practice.ts b/src/stores/practice.ts
index a3bac276..c19d2037 100644
--- a/src/stores/practice.ts
+++ b/src/stores/practice.ts
@@ -1,21 +1,24 @@
-import {defineStore} from "pinia"
+import { defineStore } from 'pinia'
+import { WordPracticeStage } from '@/types/types.ts'
export interface PracticeState {
- step: number,
- startDate: number,
- spend: number,
- total: number,
- newWordNumber: number,
- reviewWordNumber: number,
- writeWordNumber: number,
- inputWordNumber: number,//当前总输入了多少个单词（不包含跳过）
- wrong: number,
+ step: number
+ stage: WordPracticeStage
+ startDate: number
+ spend: number
+ total: number
+ newWordNumber: number
+ reviewWordNumber: number
+ writeWordNumber: number
+ inputWordNumber: number //当前总输入了多少个单词（不包含跳过）
+ wrong: number
}
export const usePracticeStore = defineStore('practice', {
state: (): PracticeState => {
return {
step: 0,
+ stage: WordPracticeStage.FollowWriteNewWord,
spend: 0,
startDate: Date.now(),
total: 0,
diff --git a/src/types/types.ts b/src/types/types.ts
index 1af5fd77..0a096d26 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -1,40 +1,40 @@
export type Word = {
- id?: string,
- custom?: boolean,
- word: string,
- phonetic0: string,
- phonetic1: string,
- trans: {
- pos: string,
- cn: string,
- }[],
- sentences: {
- c: string,//content
- cn: string,
- }[],
- phrases: {
- c: string,
- cn: string,
- }[],
- synos: {
- pos: string,
- cn: string,
- ws: string[]
- }[],
- relWords: {
- root: string,
- rels: {
- pos: string,
- words: {
- c: string,
- cn: string,
- }[],
- }[]
- },
- etymology: {
- t: string,//title
- d: string,//desc
- }[],
+ id?: string
+ custom?: boolean
+ word: string
+ phonetic0: string
+ phonetic1: string
+ trans: {
+ pos: string
+ cn: string
+ }[]
+ sentences: {
+ c: string //content
+ cn: string
+ }[]
+ phrases: {
+ c: string
+ cn: string
+ }[]
+ synos: {
+ pos: string
+ cn: string
+ ws: string[]
+ }[]
+ relWords: {
+ root: string
+ rels: {
+ pos: string
+ words: {
+ c: string
+ cn: string
+ }[]
+ }[]
+ }
+ etymology: {
+ t: string //title
+ d: string //desc
+ }[]
}
export const PronunciationApi = 'https://dict.youdao.com/dictvoice?audio='
@@ -43,216 +43,237 @@ export type TranslateLanguageType = 'en' | 'zh-CN' | 'ja' | 'de' | 'common' | ''
export type LanguageType = 'en' | 'ja' | 'de' | 'code'
export enum DictType {
- collect = 'collect',
- simple = 'simple',
- wrong = 'wrong',
- known = 'known',
- word = 'word',
- article = 'article',
+ collect = 'collect',
+ simple = 'simple',
+ wrong = 'wrong',
+ known = 'known',
+ word = 'word',
+ article = 'article',
}
export interface ArticleWord extends Word {
- nextSpace: boolean,
- symbolPosition: 'start' | 'end' | '',
- input: string
- type: PracticeArticleWordType
+ nextSpace: boolean
+ symbolPosition: 'start' | 'end' | ''
+ input: string
+ type: PracticeArticleWordType
}
export interface Sentence {
- text: string,
- translate: string,
- words: ArticleWord[],
- audioPosition: number[]
+ text: string
+ translate: string
+ words: ArticleWord[]
+ audioPosition: number[]
}
export interface Article {
- id?: number,
- title: string,
- titleTranslate: string,
- text: string,
- textTranslate: string,
- newWords: Word[],
- sections: Sentence[][],
- audioSrc: string,
- audioFileId: string,
- lrcPosition: number[][],
- nameList: string[],
- questions: {
- stem: string,
- options: string[],
- correctAnswer: string[],
- explanation: string
- }[]
+ id?: number
+ title: string
+ titleTranslate: string
+ text: string
+ textTranslate: string
+ newWords: Word[]
+ sections: Sentence[][]
+ audioSrc: string
+ audioFileId: string
+ lrcPosition: number[][]
+ nameList: string[]
+ questions: {
+ stem: string
+ options: string[]
+ correctAnswer: string[]
+ explanation: string
+ }[]
}
export interface Statistics {
- startDate: number,//开始日期
- spend: number,//花费时间
- total: number//单词数量
- new: number//新学单词数量
- review: number//复习单词数量
- wrong: number//错误数
+ startDate: number //开始日期
+ spend: number //花费时间
+ total: number //单词数量
+ new: number //新学单词数量
+ review: number //复习单词数量
+ wrong: number //错误数
}
export enum Sort {
- normal = 0,
- random = 1,
- reverse = 2,
- reverseAll = 3,
- randomAll = 4,
+ normal = 0,
+ random = 1,
+ reverse = 2,
+ reverseAll = 3,
+ randomAll = 4,
}
export enum ShortcutKey {
- ShowWord = 'ShowWord',
- EditArticle = 'EditArticle',
- Next = 'Next',
- Previous = 'Previous',
- ToggleSimple = 'ToggleSimple',
- ToggleCollect = 'ToggleCollect',
- NextChapter = 'NextChapter',
- PreviousChapter = 'PreviousChapter',
- RepeatChapter = 'RepeatChapter',
- DictationChapter = 'DictationChapter',
- PlayWordPronunciation = 'PlayWordPronunciation',
- ToggleShowTranslate = 'ToggleShowTranslate',
- ToggleDictation = 'ToggleDictation',
- ToggleTheme = 'ToggleTheme',
- ToggleConciseMode = 'ToggleConciseMode',
- TogglePanel = 'TogglePanel',
- RandomWrite = 'RandomWrite',
- NextRandomWrite = 'NextRandomWrite',
- KnowWord = 'KnowWord',
- UnknownWord = 'UnknownWord',
+ ShowWord = 'ShowWord',
+ EditArticle = 'EditArticle',
+ Next = 'Next',
+ Previous = 'Previous',
+ ToggleSimple = 'ToggleSimple',
+ ToggleCollect = 'ToggleCollect',
+ NextChapter = 'NextChapter',
+ PreviousChapter = 'PreviousChapter',
+ RepeatChapter = 'RepeatChapter',
+ DictationChapter = 'DictationChapter',
+ PlayWordPronunciation = 'PlayWordPronunciation',
+ ToggleShowTranslate = 'ToggleShowTranslate',
+ ToggleDictation = 'ToggleDictation',
+ ToggleTheme = 'ToggleTheme',
+ ToggleConciseMode = 'ToggleConciseMode',
+ TogglePanel = 'TogglePanel',
+ RandomWrite = 'RandomWrite',
+ NextRandomWrite = 'NextRandomWrite',
+ KnowWord = 'KnowWord',
+ UnknownWord = 'UnknownWord',
}
export const DefaultShortcutKeyMap = {
- [ShortcutKey.EditArticle]: 'Ctrl+E',
- [ShortcutKey.ShowWord]: 'Escape',
- [ShortcutKey.Previous]: 'Alt+⬅',
- [ShortcutKey.Next]: 'Tab',
- [ShortcutKey.ToggleSimple]: '`',
- [ShortcutKey.ToggleCollect]: 'Enter',
- [ShortcutKey.PreviousChapter]: 'Ctrl+⬅',
- [ShortcutKey.NextChapter]: 'Ctrl+➡',
- [ShortcutKey.RepeatChapter]: 'Ctrl+Enter',
- [ShortcutKey.DictationChapter]: 'Alt+Enter',
- [ShortcutKey.PlayWordPronunciation]: 'Ctrl+P',
- [ShortcutKey.ToggleShowTranslate]: 'Ctrl+Z',
- [ShortcutKey.ToggleDictation]: 'Ctrl+I',
- [ShortcutKey.ToggleTheme]: 'Ctrl+Q',
- [ShortcutKey.ToggleConciseMode]: 'Ctrl+M',
- [ShortcutKey.TogglePanel]: 'Ctrl+L',
- [ShortcutKey.RandomWrite]: 'Ctrl+R',
- [ShortcutKey.NextRandomWrite]: 'Ctrl+Shift+R',
- [ShortcutKey.KnowWord]: '1',
- [ShortcutKey.UnknownWord]: '2',
+ [ShortcutKey.EditArticle]: 'Ctrl+E',
+ [ShortcutKey.ShowWord]: 'Escape',
+ [ShortcutKey.Previous]: 'Alt+⬅',
+ [ShortcutKey.Next]: 'Tab',
+ [ShortcutKey.ToggleSimple]: '`',
+ [ShortcutKey.ToggleCollect]: 'Enter',
+ [ShortcutKey.PreviousChapter]: 'Ctrl+⬅',
+ [ShortcutKey.NextChapter]: 'Ctrl+➡',
+ [ShortcutKey.RepeatChapter]: 'Ctrl+Enter',
+ [ShortcutKey.DictationChapter]: 'Alt+Enter',
+ [ShortcutKey.PlayWordPronunciation]: 'Ctrl+P',
+ [ShortcutKey.ToggleShowTranslate]: 'Ctrl+Z',
+ [ShortcutKey.ToggleDictation]: 'Ctrl+I',
+ [ShortcutKey.ToggleTheme]: 'Ctrl+Q',
+ [ShortcutKey.ToggleConciseMode]: 'Ctrl+M',
+ [ShortcutKey.TogglePanel]: 'Ctrl+L',
+ [ShortcutKey.RandomWrite]: 'Ctrl+R',
+ [ShortcutKey.NextRandomWrite]: 'Ctrl+Shift+R',
+ [ShortcutKey.KnowWord]: '1',
+ [ShortcutKey.UnknownWord]: '2',
}
export enum TranslateEngine {
- Baidu = 0,
+ Baidu = 0,
}
export type DictResource = {
- id: string
- name: string
- description: string
- url: string
- length: number
- category: string
- tags: string[]
- translateLanguage: TranslateLanguageType
- //todo 可以考虑删除了
- type?: DictType
- version?: number
- language: LanguageType
+ id: string
+ name: string
+ description: string
+ url: string
+ length: number
+ category: string
+ tags: string[]
+ translateLanguage: TranslateLanguageType
+ //todo 可以考虑删除了
+ type?: DictType
+ version?: number
+ language: LanguageType
}
export interface Dict extends DictResource {
- lastLearnIndex: number,
- perDayStudyNumber: number,
- words: Word[],
- articles: Article[],
- statistics: Statistics[],
- custom: boolean,//是否是自定义词典
- complete: boolean,//是否学习完成，学完了设为true，然后lastLearnIndex重置
- //后端字段
- en_name?: string
- createdBy?: string
- category_id?: number
- is_default?: boolean
- update?: boolean
- cover?: string
- sync?: boolean
- userDictId?: number
+ lastLearnIndex: number
+ perDayStudyNumber: number
+ words: Word[]
+ articles: Article[]
+ statistics: Statistics[]
+ custom: boolean //是否是自定义词典
+ complete: boolean //是否学习完成，学完了设为true，然后lastLearnIndex重置
+ //后端字段
+ en_name?: string
+ createdBy?: string
+ category_id?: number
+ is_default?: boolean
+ update?: boolean
+ cover?: string
+ sync?: boolean
+ userDictId?: number
}
export interface ArticleItem {
- item: Article,
- index: number
+ item: Article
+ index: number
}
export const SlideType = {
- HORIZONTAL: 0,
- VERTICAL: 1,
+ HORIZONTAL: 0,
+ VERTICAL: 1,
}
export interface PracticeData {
- index: number,
- words: Word[],
- wrongWords: Word[],
- excludeWords: string[],
+ index: number
+ words: Word[]
+ wrongWords: Word[]
+ excludeWords: string[]
}
export interface TaskWords {
- new: Word[],
- review: Word[],
- write: Word[],
- shuffle: Word[],
+ new: Word[]
+ review: Word[]
+ write: Word[]
+ shuffle: Word[]
}
export class DictId {
- static wordCollect = 'wordCollect'
- static wordWrong = 'wordWrong'
- static wordKnown = 'wordKnown'
- static articleCollect = 'articleCollect'
+ static wordCollect = 'wordCollect'
+ static wordWrong = 'wordWrong'
+ static wordKnown = 'wordKnown'
+ static articleCollect = 'articleCollect'
}
export enum PracticeArticleWordType {
- Symbol,
- Number,
- Word
+ Symbol,
+ Number,
+ Word,
}
//练习模式
export enum WordPracticeMode {
- System = 0,
- Free = 1,
- DictationOnly = 2, // 独立默写模式
- ListenOnly = 3, // 独立听写模式
- IdentifyOnly = 4, // 独立自测模式
- FollowWriteOnly = 5 // 独立跟写模式（内部会自动切换到 Spell）
+ System = 0,
+ Free = 1,
+ IdentifyOnly = 2, // 独立自测模式
+ DictationOnly = 3, // 独立默写模式
+ ListenOnly = 4, // 独立听写模式
+ FollowWriteOnly = 5, // 独立跟写模式（内部会自动切换到 Spell）
}
//练习类型
export enum WordPracticeType {
- FollowWrite,//跟写
- Spell,
- Identify,
- Listen,
- Dictation
+ FollowWrite, //跟写
+ Spell,
+ Identify,
+ Listen,
+ Dictation,
}
export enum CodeType {
- Login = 0,
- Register = 1,
- ResetPwd = 2,
- ChangeEmail = 3,
- ChangePhoneNew = 4,
- ChangePhoneOld = 5
+ Login = 0,
+ Register = 1,
+ ResetPwd = 2,
+ ChangeEmail = 3,
+ ChangePhoneNew = 4,
+ ChangePhoneOld = 5,
}
export enum ImportStatus {
- Idle = 0,
- Success = 1,
- Fail = 2
-}
\ No newline at end of file
+ Idle = 0,
+ Success = 1,
+ Fail = 2,
+}
+
+//练习阶段
+export enum WordPracticeStage {
+ FollowWriteNewWord = 0,
+ IdentifyNewWord = 1,
+ ListenNewWord = 2,
+ DictationNewWord = 3,
+
+ FollowWriteReview = 4,
+ IdentifyReview = 5,
+ ListenReview = 6,
+ DictationReview = 7,
+
+ FollowWriteReviewAll = 8,
+ IdentifyReviewAll = 9,
+ ListenReviewAll = 10,
+ DictationReviewAll = 11,
+
+ Shuffle = 12,
+ Complete = 13,
+}