diff --git a/components.d.ts b/components.d.ts index 7f65064e..8ef991b5 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,8 +20,10 @@ declare module 'vue' { Close: typeof import('./src/components/icon/Close.vue')['default'] CommonWordList: typeof import('./src/components/list/CommonWordList.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'] DictModal: typeof import('./src/components/Modal/DictModal.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'] @@ -71,7 +73,6 @@ declare module 'vue' { 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'] - WordList2: typeof import('./src/components/list/WordList2.vue')['default'] WordListModal: typeof import('./src/components/Modal/WordListModal.vue')['default'] } export interface ComponentCustomProperties { diff --git a/src/App.vue b/src/App.vue index a2a0150a..0a32c900 100644 --- a/src/App.vue +++ b/src/App.vue @@ -53,7 +53,7 @@ onMounted(() => { init() }) -useStartKeyboardEventListener() +// useStartKeyboardEventListener() diff --git a/src/assets/img/flags/leetcode.png b/src/assets/img/flags/leetcode.png new file mode 100644 index 00000000..60985225 Binary files /dev/null and b/src/assets/img/flags/leetcode.png differ diff --git a/src/assets/img/flags/my.png b/src/assets/img/flags/my.png new file mode 100644 index 00000000..0da9f1d3 Binary files /dev/null and b/src/assets/img/flags/my.png differ diff --git a/src/components/Modal/DictModal.vue b/src/components/Modal/DictModal.vue index 8ff51f1d..1419f6a1 100644 --- a/src/components/Modal/DictModal.vue +++ b/src/components/Modal/DictModal.vue @@ -18,6 +18,8 @@ import {isArticle} from "@/hooks/article.ts"; import {useRuntimeStore} from "@/stores/runtime.ts"; import {useSettingStore} from "@/stores/setting.ts"; import {emitter, EventKey} from "@/utils/eventBus.ts"; +import Slide from "@/components/Slide.vue"; +import DictList from "@/components/list/DictList.vue"; const baseStore = useBaseStore() const settingStore = useSettingStore() @@ -104,9 +106,19 @@ const groupByTranslateLanguage = $computed(() => { if (currentLanguage === 'article') { let articleList = dictionaryResources.filter(v => v.type === 'article') data = groupBy(articleList, 'translateLanguage') + } else if (currentLanguage === 'my') { + data = { + common: [ + baseStore.collect, + baseStore.simple, + baseStore.wrong + ].concat(baseStore.myDicts.filter(v => [DictType.customWord, DictType.customArticle].includes(v.type))) + .concat([{name: '',} as any]) + } } else { data = groupBy(groupByLanguage[currentLanguage], 'translateLanguage') } + console.log('groupByTranslateLanguage', data) translateLanguageList = Object.keys(data) currentTranslateLanguage = translateLanguageList[0] return data @@ -120,7 +132,7 @@ const groupedByCategoryAndTag = $computed(() => { for (const [key, value] of Object.entries(groupByCategory)) { data.push([key, groupByDictTags(value)]) } - // console.log('data', data) + console.log('groupedByCategoryAndTag', data) return data }) @@ -158,30 +170,32 @@ function changeSort(v) { @@ -359,20 +373,15 @@ $radius: 16rem; $time: 0.3s; $header-height: 60rem; -.slide { +#DictDialog { + position: fixed; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + background: var(--color-second-bg); + z-index: 99999; width: 1000rem; height: 75vh; - - .slide-list { - width: 200%; - height: 100%; - display: flex; - transition: all .5s; - } - - .step1 { - transform: translate3d(-50%, 0, 0); - } } .dict-page { diff --git a/src/components/Modal/DictModal2.vue b/src/components/Modal/DictModal2.vue new file mode 100644 index 00000000..8ff51f1d --- /dev/null +++ b/src/components/Modal/DictModal2.vue @@ -0,0 +1,550 @@ + + + + + + diff --git a/src/components/list/DictItem.vue b/src/components/list/DictItem.vue new file mode 100644 index 00000000..221a6878 --- /dev/null +++ b/src/components/list/DictItem.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/src/components/list/DictList.vue b/src/components/list/DictList.vue index 9873a9b1..85f1015b 100644 --- a/src/components/list/DictList.vue +++ b/src/components/list/DictList.vue @@ -1,6 +1,7 @@