This commit is contained in:
zyronon
2023-11-20 13:53:28 +08:00
parent 4e56d45ed7
commit e866f0e528
6 changed files with 27 additions and 19 deletions

20
components.d.ts vendored
View File

@@ -7,25 +7,25 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
Add: typeof import('./src/components/Toolbar/Add.vue')['default']
Add: typeof import('./src/components/toolbar/Add.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']
ChapterList: typeof import('./src/components/list/ChapterList.vue')['default']
ChapterName: typeof import('./src/components/Toolbar/ChapterName.vue')['default']
ChapterName: typeof import('./src/components/toolbar/ChapterName.vue')['default']
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']
DictDiglog: typeof import('./src/components/dialog/DictDiglog.vue')['default']
DictGroup: typeof import('./src/components/Toolbar/DictGroup.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']
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']
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']
@@ -40,7 +40,7 @@ declare module 'vue' {
ElSlider: typeof import('element-plus/es')['ElSlider']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
Empty: typeof import('./src/components/Empty.vue')['default']
FeedbackModal: typeof import('./src/components/Toolbar/FeedbackModal.vue')['default']
FeedbackModal: typeof import('./src/components/toolbar/FeedbackModal.vue')['default']
Fireworks: typeof import('./src/components/Fireworks.vue')['default']
Footer: typeof import('./src/components/Practice/Footer.vue')['default']
IconWrapper: typeof import('./src/components/IconWrapper.vue')['default']
@@ -54,20 +54,20 @@ declare module 'vue' {
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']
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']
Slide: typeof import('./src/components/Slide.vue')['default']
Statistics: typeof import('./src/components/Practice/Statistics.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']
TranslateSetting: typeof import('./src/components/toolbar/TranslateSetting.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']
VolumeSetting: typeof import('./src/components/toolbar/VolumeSetting.vue')['default']
WordListDialog: typeof import('./src/components/dialog/WordListDialog.vue')['default']
}
export interface ComponentCustomProperties {

View File

@@ -33,7 +33,6 @@ watch(settingStore.$state, (n) => {
//检测几个特定词典
watch(store.collect.originWords, (n) => {
console.log('watch(store.collect.originWords', n)
store.collect.words = cloneDeep(n)
store.collect.chapterWords = [store.collect.words]
})

View File

@@ -35,6 +35,9 @@
--space: 20rem;
--panel-margin-left: calc(50% - var(--practice-wrapper-padding-right) / 2 + var(--toolbar-width) / 2 + 24rem);
--anim-time: 0.5s;
--color-input-bg: white;
--color-input-icon: #d3d4d7;
}
html.dark {
@@ -63,6 +66,9 @@ html.dark {
--color-scrollbar: rgb(59, 87, 138);
--color-scrollbar: rgb(77, 78, 81);
--color-scrollbar: rgb(92, 93, 94);
--color-input-bg: rgba(14, 18, 23, 1);
--color-input-icon: #383737;
}
@media (max-width: 1680px) {

View File

@@ -13,7 +13,7 @@ let focus = $ref(false)
let inputEl = $ref<HTMLDivElement>()
useWindowClick((e: PointerEvent) => {
if (!e)return
if (!e) return
focus = inputEl.contains(e.target as any);
})
@@ -45,11 +45,11 @@ useWindowClick((e: PointerEvent) => {
display: flex;
align-items: center;
transition: all .3s;
background: white;
background: var(--color-input-bg);
:deep(svg) {
transition: all .3s;
color: var(--color-main-bg);
color: var(--color-input-icon);
}
&.focus {
@@ -69,6 +69,7 @@ useWindowClick((e: PointerEvent) => {
box-sizing: border-box;
outline: none;
border: none;
background: transparent;
&[readonly] {
cursor: not-allowed;

View File

@@ -288,8 +288,8 @@ function saveAndNext(val: Article) {
width: 100%;
height: 100%;
box-sizing: border-box;
color: black;
background: var(--color-main-bg);
color: var(--color-font-1);
background: var(--color-second-bg);
display: flex;
.close {

View File

@@ -41,9 +41,11 @@ function showWordListModal(index: number, item: Word[]) {
<div class="flex gap10">
<input type="radio" :checked="activeIndex === index">
<template v-if="isArticle">
<div class="title"
@click.stop="emitter.emit(EventKey.openArticleListModal,item)"
>{{ index + 1 }}.&nbsp;&nbsp;&nbsp;{{ item.title }}
<div
@click.stop="emitter.emit(EventKey.openArticleListModal,item)"
>
<div class="title">{{ index + 1 }}.&nbsp;&nbsp;&nbsp;{{ item.title }}</div>
<div class="item-sub-title" v-if="item.titleTranslate"> {{ item.titleTranslate }}</div>
</div>
</template>
<template v-else>