diff --git a/components.d.ts b/components.d.ts
index 3bc87cbd..e605a338 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -8,11 +8,12 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
Add: typeof import('./src/components/toolbar/Add.vue')['default']
- ArticleList4: typeof import('./src/components/list2/ArticleList4.vue')['default']
+ ArticleList: typeof import('./src/components/list/ArticleList.vue')['default']
+ ArticleList4: typeof import('./src/components/list/ArticleList4.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']
- BaseList: typeof import('./src/components/list2/BaseList.vue')['default']
+ BaseList: typeof import('./src/components/list/BaseList.vue')['default']
ChapterName: typeof import('./src/components/toolbar/ChapterName.vue')['default']
Close: typeof import('./src/components/icon/Close.vue')['default']
Dialog: typeof import('./src/components/dialog/Dialog.vue')['default']
@@ -58,7 +59,7 @@ declare module 'vue' {
TranslateSetting: typeof import('./src/components/toolbar/TranslateSetting.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/list2/WordList.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/assets/css/style.scss b/src/assets/css/style.scss
index 1cb0fe50..3072a074 100644
--- a/src/assets/css/style.scss
+++ b/src/assets/css/style.scss
@@ -298,7 +298,7 @@ footer {
margin-bottom: 15rem;
}
-.common-list {
+.common-list1 {
display: flex;
flex-direction: column;
width: 100%;
diff --git a/src/components/dialog/DictDiglog.vue b/src/components/dialog/DictDiglog.vue
index 2d18c168..e0ef43e0 100644
--- a/src/components/dialog/DictDiglog.vue
+++ b/src/components/dialog/DictDiglog.vue
@@ -21,8 +21,8 @@ import EditBatchArticleModal from "@/components/article/EditBatchArticleModal.vu
import {nanoid} from "nanoid";
import DictListPanel from "@/components/DictListPanel.vue";
import {useRouter} from "vue-router";
-import ArticleList4 from "@/components/list2/ArticleList4.vue";
-import BaseList from "@/components/list2/BaseList.vue";
+import ArticleList from "@/components/list/ArticleList.vue";
+import BaseList from "@/components/list/BaseList.vue";
const store = useBaseStore()
const settingStore = useSettingStore()
@@ -335,7 +335,7 @@ function showWordListModal(val: { item: Word, index: number }) {
/>
-
-
+
diff --git a/src/components/dialog/WordListDialog.vue b/src/components/dialog/WordListDialog.vue
index 4797901e..814071f3 100644
--- a/src/components/dialog/WordListDialog.vue
+++ b/src/components/dialog/WordListDialog.vue
@@ -5,7 +5,7 @@ import {$ref} from "vue/macros";
import {onMounted, onUnmounted, watch} from "vue";
import {emitter, EventKey} from "@/utils/eventBus.ts";
import {useRuntimeStore} from "@/stores/runtime.ts";
-import WordList from "@/components/list2/WordList.vue";
+import WordList from "@/components/list/WordList.vue";
let show = $ref(false)
let loading = $ref(false)
diff --git a/src/components/list2/ArticleList4.vue b/src/components/list/ArticleList.vue
similarity index 97%
rename from src/components/list2/ArticleList4.vue
rename to src/components/list/ArticleList.vue
index 9029659e..d463ebef 100644
--- a/src/components/list2/ArticleList4.vue
+++ b/src/components/list/ArticleList.vue
@@ -3,7 +3,7 @@
import Input from "@/components/Input.vue";
import {$computed, $ref} from "vue/macros";
import {Article} from "@/types.ts";
-import BaseList from "@/components/list2/BaseList.vue";
+import BaseList from "@/components/list/BaseList.vue";
const props = withDefaults(defineProps<{
list: Article[],
diff --git a/src/components/list2/BaseList.vue b/src/components/list/BaseList.vue
similarity index 67%
rename from src/components/list2/BaseList.vue
rename to src/components/list/BaseList.vue
index af4d2f4e..a21a12f8 100644
--- a/src/components/list2/BaseList.vue
+++ b/src/components/list/BaseList.vue
@@ -1,6 +1,6 @@