From 9b5c00751482adf82c1f713e78b756a685a306a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=B5=E8=B6=85?= <王念超@163.com> Date: Tue, 4 Jun 2024 19:01:14 +0800 Subject: [PATCH] bf --- components.d.ts | 1 - package.json | 3 ++- src/pages/mobile/practice/index-test.vue | 2 +- .../pc/components/{practice-word => }/Typing.vue | 0 .../components/{practice-word => }/TypingWord.vue | 6 +++--- src/pages/pc/practice/practice-article/index.vue | 2 +- src/pages/pc/word/EditWordDict.vue | 15 +++++---------- src/pages/pc/word/StudyWord.vue | 2 +- src/stores/base.ts | 10 ---------- 9 files changed, 13 insertions(+), 28 deletions(-) rename src/pages/pc/components/{practice-word => }/Typing.vue (100%) rename src/pages/pc/components/{practice-word => }/TypingWord.vue (98%) diff --git a/components.d.ts b/components.d.ts index 9f29831d..0db739a8 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,7 +13,6 @@ declare module 'vue' { Close: typeof import('./src/components/icon/Close.vue')['default'] DeleteIcon: typeof import('./src/components/icon/DeleteIcon.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElInput: typeof import('element-plus/es')['ElInput'] diff --git a/package.json b/package.json index 0302982d..399ad618 100644 --- a/package.json +++ b/package.json @@ -70,5 +70,6 @@ "commitizen": { "path": "./node_modules/cz-conventional-changelog" } - } + }, + "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0" } diff --git a/src/pages/mobile/practice/index-test.vue b/src/pages/mobile/practice/index-test.vue index 8bf912d1..a2c43a63 100644 --- a/src/pages/mobile/practice/index-test.vue +++ b/src/pages/mobile/practice/index-test.vue @@ -16,7 +16,7 @@ import WordList from "@/pages/pc/components/list/WordList.vue"; import Empty from "@/components/Empty.vue"; import {Icon} from "@iconify/vue"; import router from "@/router.ts"; -import Typing from "@/pages/pc/components/practice-word/Typing.vue"; +import Typing from "@/pages/pc/components/Typing.vue"; import {usePracticeStore} from "@/stores/practice.ts"; const store = useBaseStore() diff --git a/src/pages/pc/components/practice-word/Typing.vue b/src/pages/pc/components/Typing.vue similarity index 100% rename from src/pages/pc/components/practice-word/Typing.vue rename to src/pages/pc/components/Typing.vue diff --git a/src/pages/pc/components/practice-word/TypingWord.vue b/src/pages/pc/components/TypingWord.vue similarity index 98% rename from src/pages/pc/components/practice-word/TypingWord.vue rename to src/pages/pc/components/TypingWord.vue index 07297a02..d63d76d7 100644 --- a/src/pages/pc/components/practice-word/TypingWord.vue +++ b/src/pages/pc/components/TypingWord.vue @@ -10,7 +10,7 @@ import {useOnKeyboardEventListener, useWindowClick} from "@/hooks/event.ts"; import {Icon} from "@iconify/vue"; import Tooltip from "@/pages/pc/components/Tooltip.vue"; import Options from "@/pages/pc/word/Options.vue"; -import Typing from "@/pages/pc/components/practice-word/Typing.vue"; +import Typing from "@/pages/pc/components/Typing.vue"; import Panel from "@/pages/pc/components/Panel.vue"; import {useRuntimeStore} from "@/stores/runtime.ts"; import {useWordOptions} from "@/hooks/dict.ts"; @@ -134,8 +134,8 @@ function next(isTyping: boolean = true) { } function wordWrong() { - if (!store.wrong2.find((v: Word) => v.word.toLowerCase() === word.word.toLowerCase())) { - store.wrong2.push(word) + if (!store.wrong.words.find((v: Word) => v.word.toLowerCase() === word.word.toLowerCase())) { + store.wrong.words.push(word) } if (!current.wrongWords.find((v: Word) => v.word.toLowerCase() === word.word.toLowerCase())) { current.wrongWords.push(word) diff --git a/src/pages/pc/practice/practice-article/index.vue b/src/pages/pc/practice/practice-article/index.vue index 224e6ef8..481a5d48 100644 --- a/src/pages/pc/practice/practice-article/index.vue +++ b/src/pages/pc/practice/practice-article/index.vue @@ -11,7 +11,7 @@ import { Word } from "@/types.ts"; import {cloneDeep} from "lodash-es"; -import TypingWord from "@/pages/pc/components/practice-word/TypingWord.vue"; +import TypingWord from "@/pages/pc/components/TypingWord.vue"; import Panel from "../../components/Panel.vue"; import {onMounted, onUnmounted, watch} from "vue"; import {renewSectionTexts, renewSectionTranslates} from "@/hooks/translate.ts"; diff --git a/src/pages/pc/word/EditWordDict.vue b/src/pages/pc/word/EditWordDict.vue index 9b6e31da..af638ccd 100644 --- a/src/pages/pc/word/EditWordDict.vue +++ b/src/pages/pc/word/EditWordDict.vue @@ -39,18 +39,13 @@ onMounted(() => { runtimeStore.editDict = cloneDeep(store.collectWord) break case 1: - runtimeStore.editDict = cloneDeep({ - ...cloneDeep(DefaultDict), - id: nanoid(), - name: '错词本', words: store.wrong2 - }) + runtimeStore.editDict = cloneDeep(store.wrong) break case 2: - runtimeStore.editDict = cloneDeep({ - ...cloneDeep(DefaultDict), - id: nanoid(), - name: '简单词', words: store.simple2 - }) + runtimeStore.editDict = cloneDeep(store.simple) + break + case 3: + runtimeStore.editDict = cloneDeep(store.master) break default: break diff --git a/src/pages/pc/word/StudyWord.vue b/src/pages/pc/word/StudyWord.vue index cec0ec1c..2ec8f825 100644 --- a/src/pages/pc/word/StudyWord.vue +++ b/src/pages/pc/word/StudyWord.vue @@ -14,7 +14,7 @@ import {ShortcutKey, Word} from "@/types.ts"; import DictModal from "@/pages/pc/components/dialog/DictDiglog.vue"; import {useStartKeyboardEventListener} from "@/hooks/event.ts"; import useTheme from "@/hooks/theme.ts"; -import TypingWord from "@/pages/pc/components/practice-word/TypingWord.vue"; +import TypingWord from "@/pages/pc/components/TypingWord.vue"; import {getCurrentStudyWord, syncMyDictList} from "@/hooks/dict.ts"; import {cloneDeep, shuffle} from "lodash-es"; diff --git a/src/stores/base.ts b/src/stores/base.ts index 23e8e8dd..b1b28acb 100644 --- a/src/stores/base.ts +++ b/src/stores/base.ts @@ -18,11 +18,6 @@ export interface BaseState { simpleWords: string[], load: boolean - collectArticle?: Article[], - collectWord?: Word[], - simple2?: Word[], - wrong2?: Word[], - master?: Word[], articleDictList?: Dict[] commonDictList: any[], @@ -41,11 +36,6 @@ export interface BaseState { } export const DefaultBaseState = (): BaseState => ({ - collectWord: [], - collectArticle: [], - simple2: [], - wrong2: [], - master: [], commonDictList: [ { ...getDefaultDict(),