diff --git a/components.d.ts b/components.d.ts index aa9c2333..1099c57f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,7 +8,8 @@ export {} declare module 'vue' { export interface GlobalComponents { Add: typeof import('./src/components/Toolbar/Add.vue')['default'] - ArticleList: typeof import('./src/components/Article/ArticleList.vue')['default'] + ArticleList2: typeof import('./src/components/list/ArticleList2.vue')['default'] + ArticleListFQ: typeof import('./src/components/article/ArticleList-FQ.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'] @@ -17,12 +18,10 @@ declare module 'vue' { Close: typeof import('./src/components/icon/Close.vue')['default'] CommonWordList: typeof import('./src/components/list/CommonWordList.vue')['default'] Dialog: typeof import('./src/components/dialog/Dialog.vue')['default'] - DictDialog: typeof import('./src/components/Modal/DictDialog/index.vue')['default'] DictDiglog: typeof import('./src/components/dialog/DictDiglog.vue')['default'] DictGroup: typeof import('./src/components/Toolbar/DictGroup.vue')['default'] DictItem: typeof import('./src/components/list/DictItem.vue')['default'] DictList: typeof import('./src/components/list/DictList.vue')['default'] - DictModal2: typeof import('./src/components/Modal/DictModal2.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'] @@ -49,31 +48,26 @@ declare module 'vue' { List: typeof import('./src/components/list/List.vue')['default'] ListItem: typeof import('./src/components/list/ListItem.vue')['default'] MiniDialog: typeof import('./src/components/dialog/MiniDialog.vue')['default'] - MiniModal: typeof import('./src/components/Modal/MiniModal.vue')['default'] - Modal: typeof import('./src/components/dialog/Modal.vue')['default'] Options: typeof import('./src/components/Practice/Options.vue')['default'] Panel: typeof import('./src/components/Practice/Panel.vue')['default'] PopConfirm: typeof import('./src/components/PopConfirm.vue')['default'] - Practice: typeof import('./src/components/Practice/Practice.vue')['default'] - PracticeArticle: typeof import('./src/components/Practice/PracticeArticle/PracticeArticle.vue')['default'] - PracticeWord: typeof import('./src/components/Practice/PracticeWord/PracticeWord.vue')['default'] + Practice: typeof import('./src/components/Practice/index.vue')['default'] + PracticeArticle: typeof import('./src/components/Practice/practice-article/index.vue')['default'] + PracticeWord: typeof import('./src/components/Practice/practice-word/index.vue')['default'] RepeatSetting: typeof import('./src/components/Toolbar/RepeatSetting.vue')['default'] Ring: typeof import('./src/components/Ring.vue')['default'] SettingDialog: typeof import('./src/components/dialog/SettingDialog.vue')['default'] - SettingModal: typeof import('./src/components/dialog/SettingModal.vue')['default'] Slide: typeof import('./src/components/Slide.vue')['default'] Statistics: typeof import('./src/components/Practice/Statistics.vue')['default'] - Toolbar: typeof import('./src/components/Toolbar/Toolbar.vue')['default'] + Toolbar: typeof import('./src/components/toolbar/index.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'] + Typing: typeof import('./src/components/Practice/practice-word/Typing.vue')['default'] + TypingArticle: typeof import('./src/components/Practice/practice-article/TypingArticle.vue')['default'] + TypingWord: typeof import('./src/components/Practice/practice-word/TypingWord.vue')['default'] VirtualWordList: typeof import('./src/components/list/VirtualWordList.vue')['default'] VolumeIcon: typeof import('./src/components/icon/VolumeIcon.vue')['default'] VolumeSetting: typeof import('./src/components/Toolbar/VolumeSetting.vue')['default'] - WordItem: typeof import('./src/components/list/WordItem.vue')['default'] - WordList: typeof import('./src/components/list/WordList.vue')['default'] WordListDialog: typeof import('./src/components/dialog/WordListDialog.vue')['default'] } export interface ComponentCustomProperties { diff --git a/src/App.vue b/src/App.vue index c3636898..6517b875 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,7 @@ import {onMounted, watch} from "vue"; import {BaseState, useBaseStore} from "@/stores/base.ts"; import {DictType, SaveConfig, SaveDict} from "@/types.ts" -import Practice from "@/components/Practice/Practice.vue" +import Practice from "@/components/Practice/index.vue" import {useRuntimeStore} from "@/stores/runtime.ts"; import {useSettingStore} from "@/stores/setting.ts"; import {cloneDeep} from "lodash-es"; diff --git a/src/components/EditAbleText.vue b/src/components/EditAbleText.vue index 0951fed9..72f74436 100644 --- a/src/components/EditAbleText.vue +++ b/src/components/EditAbleText.vue @@ -73,7 +73,7 @@ function toggle() { } .text { - color: black; + color: var(--color-font-1); min-height: 18rem; } \ No newline at end of file diff --git a/src/components/Practice/Footer.vue b/src/components/Practice/Footer.vue index 964bc27b..c26b42e6 100644 --- a/src/components/Practice/Footer.vue +++ b/src/components/Practice/Footer.vue @@ -134,8 +134,6 @@ onUnmounted(() => { box-sizing: border-box; position: absolute; bottom: 0; - - } :deep(.el-progress-bar__inner) { diff --git a/src/components/Practice/Panel.vue b/src/components/Practice/Panel.vue index e05efb9c..4b120dce 100644 --- a/src/components/Practice/Panel.vue +++ b/src/components/Practice/Panel.vue @@ -1,6 +1,5 @@ diff --git a/src/components/Practice/Practice.vue b/src/components/Practice/index.vue similarity index 96% rename from src/components/Practice/Practice.vue rename to src/components/Practice/index.vue index b5f11043..7af1d5a5 100644 --- a/src/components/Practice/Practice.vue +++ b/src/components/Practice/index.vue @@ -1,6 +1,6 @@