From 47bc29adb79d6c1c6b65ecd8038aaac2e09a32ae Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Wed, 13 Aug 2025 02:07:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A7=BB=E5=8A=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pc/Setting.vue                                   | 6 +++---
 src/pages/pc/article/ArticleHomePage.vue                   | 4 ++--
 src/pages/pc/article/BatchEditArticlePage.vue              | 2 +-
 src/pages/pc/article/StudyArticle.vue                      | 2 +-
 src/pages/pc/article/components/EditArticle.vue            | 4 ++--
 src/pages/pc/article/components/EditBook.vue               | 4 ++--
 src/pages/pc/article/components/QuestionForm.vue           | 2 +-
 src/pages/pc/article/components/TypingArticle.vue          | 2 +-
 src/pages/pc/components/BaseTable.vue                      | 4 ++--
 src/pages/pc/components/Book.vue                           | 2 +-
 src/pages/pc/components/{ => base}/Pagination.vue          | 0
 src/pages/pc/components/{ => base}/Progress.vue            | 0
 src/pages/pc/components/{ => base}/Switch.vue              | 0
 src/pages/pc/components/{Select => base/select}/Option.vue | 0
 src/pages/pc/components/{Select => base/select}/Select.vue | 2 +-
 src/pages/pc/components/{Select => base/select}/index.ts   | 0
 src/pages/pc/components/{Toast => base/toast}/Toast.ts     | 4 ++--
 src/pages/pc/components/{Toast => base/toast}/Toast.vue    | 0
 src/pages/pc/components/{Toast => base/toast}/type.ts      | 0
 src/pages/pc/word/DictDetail.vue                           | 2 +-
 src/pages/pc/word/StudyWord.vue                            | 2 +-
 src/pages/pc/word/WordHomePage.vue                         | 4 ++--
 src/pages/pc/word/components/Footer.vue                    | 2 +-
 src/utils/index.ts                                         | 2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)
 rename src/pages/pc/components/{ => base}/Pagination.vue (100%)
 rename src/pages/pc/components/{ => base}/Progress.vue (100%)
 rename src/pages/pc/components/{ => base}/Switch.vue (100%)
 rename src/pages/pc/components/{Select => base/select}/Option.vue (100%)
 rename src/pages/pc/components/{Select => base/select}/Select.vue (98%)
 rename src/pages/pc/components/{Select => base/select}/index.ts (100%)
 rename src/pages/pc/components/{Toast => base/toast}/Toast.ts (96%)
 rename src/pages/pc/components/{Toast => base/toast}/Toast.vue (100%)
 rename src/pages/pc/components/{Toast => base/toast}/type.ts (100%)

diff --git a/src/pages/pc/Setting.vue b/src/pages/pc/Setting.vue
index f26a852b..6a80c407 100644
--- a/src/pages/pc/Setting.vue
+++ b/src/pages/pc/Setting.vue
@@ -15,9 +15,9 @@ import {GITHUB} from "@/config/ENV.ts";
 import dayjs from "dayjs";
 import BasePage from "@/pages/pc/components/BasePage.vue";
 import {ElInputNumber, ElRadio, ElRadioGroup, ElSlider} from 'element-plus'
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
-import {Option, Select} from "@/pages/pc/components/Select";
-import Switch from "@/pages/pc/components/Switch.vue";
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
+import {Option, Select} from "@/pages/pc/components/base/select";
+import Switch from "@/pages/pc/components/base/Switch.vue";
 
 const emit = defineEmits<{
   toggleDisabledDialogEscKey: [val: boolean]
diff --git a/src/pages/pc/article/ArticleHomePage.vue b/src/pages/pc/article/ArticleHomePage.vue
index 34ebef38..fa61f216 100644
--- a/src/pages/pc/article/ArticleHomePage.vue
+++ b/src/pages/pc/article/ArticleHomePage.vue
@@ -8,8 +8,8 @@ import {DictResource, DictType} from "@/types/types.ts";
 import {useRuntimeStore} from "@/stores/runtime.ts";
 import BaseIcon from "@/components/BaseIcon.vue";
 import Book from "@/pages/pc/components/Book.vue";
-import Progress from '@/pages/pc/components/Progress.vue';
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Progress from '@/pages/pc/components/base/Progress.vue';
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import BaseButton from "@/components/BaseButton.vue";
 import PopConfirm from "@/pages/pc/components/PopConfirm.vue";
 import {onMounted, watch} from "vue";
diff --git a/src/pages/pc/article/BatchEditArticlePage.vue b/src/pages/pc/article/BatchEditArticlePage.vue
index 4c82384c..d31dbe01 100644
--- a/src/pages/pc/article/BatchEditArticlePage.vue
+++ b/src/pages/pc/article/BatchEditArticlePage.vue
@@ -13,7 +13,7 @@ import {useRuntimeStore} from "@/stores/runtime.ts";
 import {nanoid} from "nanoid";
 import EditArticle from "@/pages/pc/article/components/EditArticle.vue";
 import BaseIcon from "@/components/BaseIcon.vue";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import {getDefaultArticle} from "@/types/func.ts";
 
 const emit = defineEmits<{
diff --git a/src/pages/pc/article/StudyArticle.vue b/src/pages/pc/article/StudyArticle.vue
index 0f29680d..89e09613 100644
--- a/src/pages/pc/article/StudyArticle.vue
+++ b/src/pages/pc/article/StudyArticle.vue
@@ -7,7 +7,7 @@ import {useSettingStore} from "@/stores/setting.ts";
 import {Article, ArticleItem, ArticleWord, ShortcutKey, Word} from "@/types/types.ts";
 import {useOnKeyboardEventListener, useStartKeyboardEventListener} from "@/hooks/event.ts";
 import useTheme from "@/hooks/theme.ts";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import {cloneDeep} from "@/utils";
 import {usePracticeStore} from "@/stores/practice.ts";
 import {useArticleOptions} from "@/hooks/dict.ts";
diff --git a/src/pages/pc/article/components/EditArticle.vue b/src/pages/pc/article/components/EditArticle.vue
index 56931d0d..a8c3e2bd 100644
--- a/src/pages/pc/article/components/EditArticle.vue
+++ b/src/pages/pc/article/components/EditArticle.vue
@@ -10,13 +10,13 @@ import {_nextTick, _parseLRC, cloneDeep, last} from "@/utils";
 import {watch} from "vue";
 import Empty from "@/components/Empty.vue";
 import {ElInputNumber, ElOption, ElPopover, ElSelect} from "element-plus";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import * as Comparison from "string-comparison"
 import BaseIcon from "@/components/BaseIcon.vue";
 import Dialog from "@/pages/pc/components/dialog/Dialog.vue";
 import {getDefaultArticle} from "@/types/func.ts";
 import copy from "copy-to-clipboard";
-import {Option, Select} from "@/pages/pc/components/Select";
+import {Option, Select} from "@/pages/pc/components/base/select";
 
 interface IProps {
   article?: Article,
diff --git a/src/pages/pc/article/components/EditBook.vue b/src/pages/pc/article/components/EditBook.vue
index 77ae0671..1db4b65d 100644
--- a/src/pages/pc/article/components/EditBook.vue
+++ b/src/pages/pc/article/components/EditBook.vue
@@ -4,13 +4,13 @@ import {Dict, DictId, DictType} from "@/types/types.ts";
 import {cloneDeep} from "@/utils";
 
 import {ElForm, ElFormItem, ElInput, FormInstance, FormRules} from "element-plus";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import {onMounted, reactive} from "vue";
 import {useRuntimeStore} from "@/stores/runtime.ts";
 import {useBaseStore} from "@/stores/base.ts";
 import BaseButton from "@/components/BaseButton.vue";
 import {getDefaultDict} from "@/types/func.ts";
-import {Option, Select} from "@/pages/pc/components/Select";
+import {Option, Select} from "@/pages/pc/components/base/select";
 
 const props = defineProps<{
   isAdd: boolean,
diff --git a/src/pages/pc/article/components/QuestionForm.vue b/src/pages/pc/article/components/QuestionForm.vue
index ccb962a5..e6a6fcae 100644
--- a/src/pages/pc/article/components/QuestionForm.vue
+++ b/src/pages/pc/article/components/QuestionForm.vue
@@ -45,7 +45,7 @@
 <script setup lang="ts">
 import {ref, useTemplateRef} from 'vue'
 import QuestionItem from './QuestionItem.vue'
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 
 interface IProps {
   questions: Array,
diff --git a/src/pages/pc/article/components/TypingArticle.vue b/src/pages/pc/article/components/TypingArticle.vue
index 54c2e906..96c3e964 100644
--- a/src/pages/pc/article/components/TypingArticle.vue
+++ b/src/pages/pc/article/components/TypingArticle.vue
@@ -13,7 +13,7 @@ import {getTranslateText} from "@/hooks/article.ts";
 import BaseButton from "@/components/BaseButton.vue";
 import QuestionForm from "@/pages/pc/article/components/QuestionForm.vue";
 import {getDefaultArticle} from "@/types/func.ts";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 
 interface IProps {
   article: Article,
diff --git a/src/pages/pc/components/BaseTable.vue b/src/pages/pc/components/BaseTable.vue
index ec8401cc..05014f7a 100644
--- a/src/pages/pc/components/BaseTable.vue
+++ b/src/pages/pc/components/BaseTable.vue
@@ -11,8 +11,8 @@ import PopConfirm from "@/pages/pc/components/PopConfirm.vue";
 import Empty from "@/components/Empty.vue";
 import {Icon} from "@iconify/vue";
 import {ElCheckbox} from 'element-plus'
-import Pagination from '@/pages/pc/components/Pagination.vue'
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Pagination from '@/pages/pc/components/base/Pagination.vue'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 
 let list = defineModel('list')
 
diff --git a/src/pages/pc/components/Book.vue b/src/pages/pc/components/Book.vue
index cff57a14..c37be1ae 100644
--- a/src/pages/pc/components/Book.vue
+++ b/src/pages/pc/components/Book.vue
@@ -2,7 +2,7 @@
 import {Dict} from "@/types/types.ts";
 import {Icon} from "@iconify/vue";
 import {ElCheckbox} from 'element-plus';
-import Progress from '@/pages/pc/components/Progress.vue'
+import Progress from '@/pages/pc/components/base/Progress.vue'
 
 const props = defineProps<{
   item?: Partial<Dict>;
diff --git a/src/pages/pc/components/Pagination.vue b/src/pages/pc/components/base/Pagination.vue
similarity index 100%
rename from src/pages/pc/components/Pagination.vue
rename to src/pages/pc/components/base/Pagination.vue
diff --git a/src/pages/pc/components/Progress.vue b/src/pages/pc/components/base/Progress.vue
similarity index 100%
rename from src/pages/pc/components/Progress.vue
rename to src/pages/pc/components/base/Progress.vue
diff --git a/src/pages/pc/components/Switch.vue b/src/pages/pc/components/base/Switch.vue
similarity index 100%
rename from src/pages/pc/components/Switch.vue
rename to src/pages/pc/components/base/Switch.vue
diff --git a/src/pages/pc/components/Select/Option.vue b/src/pages/pc/components/base/select/Option.vue
similarity index 100%
rename from src/pages/pc/components/Select/Option.vue
rename to src/pages/pc/components/base/select/Option.vue
diff --git a/src/pages/pc/components/Select/Select.vue b/src/pages/pc/components/base/select/Select.vue
similarity index 98%
rename from src/pages/pc/components/Select/Select.vue
rename to src/pages/pc/components/base/select/Select.vue
index 048fa247..620c7da5 100644
--- a/src/pages/pc/components/Select/Select.vue
+++ b/src/pages/pc/components/base/select/Select.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {ref, computed, watch, provide, useSlots, VNode, nextTick, useAttrs, onMounted, onBeforeUnmount} from 'vue';
+import {computed, nextTick, onBeforeUnmount, onMounted, provide, ref, useAttrs, useSlots, VNode, watch} from 'vue';
 import {Icon} from "@iconify/vue";
 import {useWindowClick} from "@/hooks/event.ts";
 
diff --git a/src/pages/pc/components/Select/index.ts b/src/pages/pc/components/base/select/index.ts
similarity index 100%
rename from src/pages/pc/components/Select/index.ts
rename to src/pages/pc/components/base/select/index.ts
diff --git a/src/pages/pc/components/Toast/Toast.ts b/src/pages/pc/components/base/toast/Toast.ts
similarity index 96%
rename from src/pages/pc/components/Toast/Toast.ts
rename to src/pages/pc/components/base/toast/Toast.ts
index 12db21b6..5852af0e 100644
--- a/src/pages/pc/components/Toast/Toast.ts
+++ b/src/pages/pc/components/base/toast/Toast.ts
@@ -1,6 +1,6 @@
 import {createVNode, render} from 'vue'
-import ToastComponent from '@/pages/pc/components/Toast/Toast.vue'
-import type {ToastOptions, ToastInstance, ToastService} from '@/pages/pc/components/Toast/type.ts'
+import ToastComponent from '@/pages/pc/components/base/toast/Toast.vue'
+import type {ToastOptions, ToastInstance, ToastService} from '@/pages/pc/components/base/toast/type.ts'
 
 interface ToastContainer {
   id: string
diff --git a/src/pages/pc/components/Toast/Toast.vue b/src/pages/pc/components/base/toast/Toast.vue
similarity index 100%
rename from src/pages/pc/components/Toast/Toast.vue
rename to src/pages/pc/components/base/toast/Toast.vue
diff --git a/src/pages/pc/components/Toast/type.ts b/src/pages/pc/components/base/toast/type.ts
similarity index 100%
rename from src/pages/pc/components/Toast/type.ts
rename to src/pages/pc/components/base/toast/type.ts
diff --git a/src/pages/pc/word/DictDetail.vue b/src/pages/pc/word/DictDetail.vue
index 496db6a0..42c2c151 100644
--- a/src/pages/pc/word/DictDetail.vue
+++ b/src/pages/pc/word/DictDetail.vue
@@ -11,7 +11,7 @@ import BaseTable from "@/pages/pc/components/BaseTable.vue";
 import WordItem from "@/pages/pc/components/WordItem.vue";
 import type {FormInstance, FormRules} from "element-plus";
 import {ElForm, ElFormItem, ElInput} from "element-plus";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import PopConfirm from "@/pages/pc/components/PopConfirm.vue";
 import BackIcon from "@/pages/pc/components/BackIcon.vue";
 import BaseButton from "@/components/BaseButton.vue";
diff --git a/src/pages/pc/word/StudyWord.vue b/src/pages/pc/word/StudyWord.vue
index 9698267e..b5afb5a8 100644
--- a/src/pages/pc/word/StudyWord.vue
+++ b/src/pages/pc/word/StudyWord.vue
@@ -23,7 +23,7 @@ import Empty from "@/components/Empty.vue";
 import {useBaseStore} from "@/stores/base.ts";
 import {usePracticeStore} from "@/stores/practice.ts";
 import {dictionaryResources} from "@/assets/dictionary.ts";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import {getDefaultWord} from "@/types/func.ts";
 import ConflictNotice from "@/pages/pc/components/ConflictNotice.vue";
 
diff --git a/src/pages/pc/word/WordHomePage.vue b/src/pages/pc/word/WordHomePage.vue
index c0dd4379..f20fa969 100644
--- a/src/pages/pc/word/WordHomePage.vue
+++ b/src/pages/pc/word/WordHomePage.vue
@@ -13,8 +13,8 @@ import {useRuntimeStore} from "@/stores/runtime.ts";
 import Book from "@/pages/pc/components/Book.vue";
 import PopConfirm from "@/pages/pc/components/PopConfirm.vue";
 import {ElSlider} from 'element-plus';
-import Progress from '@/pages/pc/components/Progress.vue';
-import Toast from '@/pages/pc/components/Toast/Toast.ts';
+import Progress from '@/pages/pc/components/base/Progress.vue';
+import Toast from '@/pages/pc/components/base/toast/Toast.ts';
 import BaseButton from "@/components/BaseButton.vue";
 import {getDefaultDict} from "@/types/func.ts";
 
diff --git a/src/pages/pc/word/components/Footer.vue b/src/pages/pc/word/components/Footer.vue
index f2a43be3..6c36579a 100644
--- a/src/pages/pc/word/components/Footer.vue
+++ b/src/pages/pc/word/components/Footer.vue
@@ -7,7 +7,7 @@ import {ShortcutKey, StudyData} from "@/types/types.ts";
 import BaseIcon from "@/components/BaseIcon.vue";
 import {Icon} from "@iconify/vue";
 import Tooltip from "@/pages/pc/components/Tooltip.vue";
-import Progress from '@/pages/pc/components/Progress.vue'
+import Progress from '@/pages/pc/components/base/Progress.vue'
 
 const statisticsStore = usePracticeStore()
 const settingStore = useSettingStore()
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 18128168..2331b773 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -9,7 +9,7 @@ import axios from "axios";
 import {env} from "@/config/ENV.ts";
 import {nextTick} from "vue";
 import {dictionaryResources, enArticle} from "@/assets/dictionary.ts";
-import Toast from '@/pages/pc/components/Toast/Toast.ts'
+import Toast from '@/pages/pc/components/base/toast/Toast.ts'
 import {getDefaultArticle, getDefaultDict, getDefaultWord} from "@/types/func.ts";
 
 export function no() {