diff --git a/components.d.ts b/components.d.ts index c6b2e978..b09ee4c3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,20 +9,26 @@ declare module 'vue' { export interface GlobalComponents { Add: typeof import('./src/components/Toolbar/Add.vue')['default'] AddDict: typeof import('./src/components/Add/AddDict.vue')['default'] + AddWord: typeof import('./src/components/Modal/AddWord.vue')['default'] + AddWordDialog: typeof import('./src/components/Modal/AddWordDialog.vue')['default'] + AddWordModal: typeof import('./src/components/Modal/AddWordModal.vue')['default'] ArticleList: typeof import('./src/components/Article/ArticleList.vue')['default'] Backgorund: typeof import('./src/components/Backgorund.vue')['default'] BaseButton: typeof import('./src/components/BaseButton.vue')['default'] BaseIcon: typeof import('./src/components/BaseIcon.vue')['default'] ChapterDetail: typeof import('./src/components/ChapterDetail.vue')['default'] ChapterList: typeof import('./src/components/ChapterList.vue')['default'] - Close: typeof import('./src/components/Close.vue')['default'] + Close: typeof import('./src/components/icon/Close.vue')['default'] DictGroup: typeof import('./src/components/Toolbar/DictGroup.vue')['default'] DictList: typeof import('./src/components/DictList.vue')['default'] - DictModal: typeof import('./src/components/Toolbar/DictModal.vue')['default'] + DictModal: typeof import('./src/components/Modal/DictModal.vue')['default'] EditAbleText: typeof import('./src/components/EditAbleText.vue')['default'] EditArticle: typeof import('./src/components/Article/EditArticle.vue')['default'] EditBatchArticleModal: typeof import('./src/components/Article/EditBatchArticleModal.vue')['default'] EditSingleArticleModal: typeof import('./src/components/Article/EditSingleArticleModal.vue')['default'] + ElButton: typeof import('element-plus/es')['ElButton'] + ElForm: typeof import('element-plus/es')['ElForm'] + ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElOption: typeof import('element-plus/es')['ElOption'] @@ -41,7 +47,7 @@ declare module 'vue' { Input: typeof import('./src/components/Input.vue')['default'] List: typeof import('./src/components/List.vue')['default'] ListItem: typeof import('./src/components/ListItem.vue')['default'] - MiniModal: typeof import('./src/components/MiniModal.vue')['default'] + MiniModal: typeof import('./src/components/Modal/MiniModal.vue')['default'] Modal: typeof import('./src/components/Modal/Modal.vue')['default'] Options: typeof import('./src/components/Practice/Options.vue')['default'] Panel: typeof import('./src/components/Practice/Panel.vue')['default'] @@ -51,15 +57,17 @@ declare module 'vue' { PracticeWord: typeof import('./src/components/Practice/PracticeWord/PracticeWord.vue')['default'] RepeatSetting: typeof import('./src/components/Toolbar/RepeatSetting.vue')['default'] Ring: typeof import('./src/components/Ring.vue')['default'] - SettingModal: typeof import('./src/components/Toolbar/SettingModal.vue')['default'] + SettingModal: typeof import('./src/components/Modal/SettingModal.vue')['default'] + Slide: typeof import('./src/components/Slide.vue')['default'] Statistics: typeof import('./src/components/Practice/Statistics.vue')['default'] + Swiper: typeof import('./src/components/Swiper.vue')['default'] Toolbar: typeof import('./src/components/Toolbar/Toolbar.vue')['default'] Tooltip: typeof import('./src/components/Tooltip.vue')['default'] TranslateSetting: typeof import('./src/components/Toolbar/TranslateSetting.vue')['default'] Typing: typeof import('./src/components/Practice/PracticeWord/Typing.vue')['default'] TypingArticle: typeof import('./src/components/Practice/PracticeArticle/TypingArticle.vue')['default'] TypingWord: typeof import('./src/components/Practice/PracticeWord/TypingWord.vue')['default'] - VolumeIcon: typeof import('./src/components/VolumeIcon.vue')['default'] + VolumeIcon: typeof import('./src/components/icon/VolumeIcon.vue')['default'] VolumeSetting: typeof import('./src/components/Toolbar/VolumeSetting.vue')['default'] WordList: typeof import('./src/components/WordList.vue')['default'] WordListModal: typeof import('./src/components/WordListModal.vue')['default'] diff --git a/src/App.vue b/src/App.vue index 9cc999cb..86bf4aae 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,7 +38,7 @@ watch(store.wrong.originWords, (n) => { store.wrong.chapterWords = [store.wrong.words] }) -useStartKeyboardEventListener() +// useStartKeyboardEventListener() onMounted(() => { console.time() diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index 248a8a71..f7166b4e 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -39,12 +39,12 @@ html.dark { --color-background: transparent; --color-main-bg: rgba(14, 18, 23, 1); //--color-main-bg: rgba(30,31,34, 1); - --color-second-bg: rgb(43,45,48); - --color-second-bg: rgb(30,31,34); + --color-second-bg: rgb(43, 45, 48); + --color-second-bg: rgb(30, 31, 34); - --color-item-bg: rgb(43,45,48); - --color-item-hover: rgb(67,69,74); - --color-item-active: rgb(84,84,84); + --color-item-bg: rgb(43, 45, 48); + --color-item-hover: rgb(67, 69, 74); + --color-item-active: rgb(84, 84, 84); --color-item-border: rgb(41, 41, 41); --color-header-bg: rgb(51, 51, 51); @@ -56,9 +56,9 @@ html.dark { --color-gray: #bebebe; - --color-scrollbar: rgb(59, 87, 138); - --color-scrollbar: rgb(77,78,81); - --color-scrollbar: rgb(92,93,94); + --color-scrollbar: rgb(59, 87, 138); + --color-scrollbar: rgb(77, 78, 81); + --color-scrollbar: rgb(92, 93, 94); } $anim-time: 0.3s; @@ -155,7 +155,7 @@ footer { gap: 10rem; } -.justify-content-between { +.space-between { justify-content: space-between; } @@ -172,7 +172,7 @@ footer { padding-bottom: $space; box-sizing: border-box; - header { + .list-header { min-height: 50rem; padding: 10rem $space; box-sizing: border-box; diff --git a/src/components/Add/AddDict.vue b/src/components/Add/AddDict.vue index 4cad28dc..8474b893 100644 --- a/src/components/Add/AddDict.vue +++ b/src/components/Add/AddDict.vue @@ -1,21 +1,29 @@ \ No newline at end of file diff --git a/src/components/Input.vue b/src/components/Input.vue index e9eb6df0..03943324 100644 --- a/src/components/Input.vue +++ b/src/components/Input.vue @@ -1,7 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/components/Toolbar/DictModal.vue b/src/components/Modal/DictModal.vue similarity index 100% rename from src/components/Toolbar/DictModal.vue rename to src/components/Modal/DictModal.vue diff --git a/src/components/MiniModal.vue b/src/components/Modal/MiniModal.vue similarity index 100% rename from src/components/MiniModal.vue rename to src/components/Modal/MiniModal.vue diff --git a/src/components/Toolbar/SettingModal.vue b/src/components/Modal/SettingModal.vue similarity index 100% rename from src/components/Toolbar/SettingModal.vue rename to src/components/Modal/SettingModal.vue diff --git a/src/components/Practice/Panel.vue b/src/components/Practice/Panel.vue index 6afdfb44..57497f3f 100644 --- a/src/components/Practice/Panel.vue +++ b/src/components/Practice/Panel.vue @@ -8,7 +8,7 @@ import {Dict, DictType} from "@/types.ts" import PopConfirm from "@/components/PopConfirm.vue" import BaseButton from "@/components/BaseButton.vue"; import {useSettingStore} from "@/stores/setting.ts"; -import Close from "@/components/Close.vue"; +import Close from "@/components/icon/Close.vue"; import Empty from "@/components/Empty.vue"; import ArticleList from "@/components/Article/ArticleList.vue"; import {useWordOptions} from "@/hooks/dict.ts"; @@ -65,21 +65,23 @@ const {
-
+
单词 文章 -
+ + + + + +
{{ store.collect.words.length }}个单词
-
{{ store.collect.articles.length }}篇文章
- - - - - +
+ {{ store.collect.articles.length }}篇文章 +
-
+
diff --git a/src/components/Practice/PracticeArticle/TypingArticle.vue b/src/components/Practice/PracticeArticle/TypingArticle.vue index 48a4eaec..f0d85d07 100644 --- a/src/components/Practice/PracticeArticle/TypingArticle.vue +++ b/src/components/Practice/PracticeArticle/TypingArticle.vue @@ -141,8 +141,6 @@ function onTyping(e: KeyboardEvent) { emit('nextWord', currentWord) - - if (!currentSentence.words[wordIndex]) { wordIndex = 0 sentenceIndex++ diff --git a/src/components/Practice/PracticeWord/Typing.vue b/src/components/Practice/PracticeWord/Typing.vue index 53d4cc0f..1624ebd5 100644 --- a/src/components/Practice/PracticeWord/Typing.vue +++ b/src/components/Practice/PracticeWord/Typing.vue @@ -1,14 +1,15 @@ @@ -260,7 +260,7 @@ onUnmounted(() => { diff --git a/src/components/Toolbar/RepeatSetting.vue b/src/components/Toolbar/RepeatSetting.vue index fef2f427..36990d4d 100644 --- a/src/components/Toolbar/RepeatSetting.vue +++ b/src/components/Toolbar/RepeatSetting.vue @@ -1,6 +1,6 @@ diff --git a/src/components/WordListModal.vue b/src/components/WordListModal.vue index c1bff085..7eb48fe6 100644 --- a/src/components/WordListModal.vue +++ b/src/components/WordListModal.vue @@ -1,6 +1,6 @@