From c98e211a7b5cfae37bc8d28dc9780caa7be4dc0f Mon Sep 17 00:00:00 2001 From: zyronon Date: Mon, 20 Nov 2023 23:15:55 +0800 Subject: [PATCH] save --- components.d.ts | 2 + src/assets/css/style.scss | 1 + src/components/BaseButton.vue | 2 +- .../Practice/practice-article/index.vue | 8 +- .../Practice/practice-word/TypingWord.vue | 8 +- src/components/article/EditArticle.vue | 7 +- .../article/EditBatchArticleModal-FQ.vue | 365 ++++++++++++++++++ .../article/EditBatchArticleModal.vue | 3 +- src/components/list/ChapterList.vue | 9 +- src/components/list/List.vue | 7 +- 10 files changed, 387 insertions(+), 25 deletions(-) create mode 100644 src/components/article/EditBatchArticleModal-FQ.vue diff --git a/components.d.ts b/components.d.ts index 1c334fc8..98e0d2de 100644 --- a/components.d.ts +++ b/components.d.ts @@ -25,6 +25,8 @@ declare module 'vue' { 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'] + EditBatchArticleModal2: typeof import('./src/components/article/EditBatchArticleModal2.vue')['default'] + EditBatchArticleModalFQ: typeof import('./src/components/article/EditBatchArticleModal-FQ.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'] diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index 535cd48f..97a3097a 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -158,6 +158,7 @@ a { min-height: 20rem; width: 100%; box-sizing: border-box; + background: var(--color-item-bg); &:focus { border: 1px solid var(--color-main-active); diff --git a/src/components/BaseButton.vue b/src/components/BaseButton.vue index e08c9847..2c8d777b 100644 --- a/src/components/BaseButton.vue +++ b/src/components/BaseButton.vue @@ -112,7 +112,7 @@ defineEmits(['click']) border-bottom: 2px solid transparent; &:hover { - border-bottom: 2px solid black; + border-bottom: 2px solid var(--color-font-1); } } diff --git a/src/components/Practice/practice-article/index.vue b/src/components/Practice/practice-article/index.vue index ea7a5b3a..e2fd4751 100644 --- a/src/components/Practice/practice-article/index.vue +++ b/src/components/Practice/practice-article/index.vue @@ -266,11 +266,9 @@ const {
- - - - - +
{{ store.dictTitle }}
diff --git a/src/components/Practice/practice-word/TypingWord.vue b/src/components/Practice/practice-word/TypingWord.vue index f8f185bd..c7c9b341 100644 --- a/src/components/Practice/practice-word/TypingWord.vue +++ b/src/components/Practice/practice-word/TypingWord.vue @@ -268,11 +268,9 @@ onUnmounted(() => { >
- - - - - +
{{ store.dictTitle }}
diff --git a/src/components/article/EditArticle.vue b/src/components/article/EditArticle.vue index 7980b648..6bf1268f 100644 --- a/src/components/article/EditArticle.vue +++ b/src/components/article/EditArticle.vue @@ -383,7 +383,7 @@ defineExpose({save, getEditArticle: () => cloneDeep(editArticle)}) } .row { - flex: 1; + flex: 10; width: 33%; //height: 100%; display: flex; @@ -396,8 +396,8 @@ defineExpose({save, getEditArticle: () => cloneDeep(editArticle)}) flex-direction: column; } - &:nth-child(2) { - opacity: 1; + &:nth-child(1) { + flex: 7; } .title { @@ -436,7 +436,6 @@ defineExpose({save, getEditArticle: () => cloneDeep(editArticle)}) flex: 1; overflow: auto; border-radius: 8rem; - background: var(--color-main-bg); .section { background: var(--color-item-bg); diff --git a/src/components/article/EditBatchArticleModal-FQ.vue b/src/components/article/EditBatchArticleModal-FQ.vue new file mode 100644 index 00000000..15b71869 --- /dev/null +++ b/src/components/article/EditBatchArticleModal-FQ.vue @@ -0,0 +1,365 @@ + + + + + \ No newline at end of file diff --git a/src/components/article/EditBatchArticleModal.vue b/src/components/article/EditBatchArticleModal.vue index 15b71869..0fa99390 100644 --- a/src/components/article/EditBatchArticleModal.vue +++ b/src/components/article/EditBatchArticleModal.vue @@ -240,7 +240,6 @@ function saveAndNext(val: Article) {
{{ runtimeStore.editDict.name }}
-
diff --git a/src/components/list/List.vue b/src/components/list/List.vue index bdcd5b85..e2a2cff3 100644 --- a/src/components/list/List.vue +++ b/src/components/list/List.vue @@ -166,14 +166,13 @@ defineExpose({scrollBottom}) .search { margin: 10rem 0; - width: 260rem; } .list { .item { - width: 260rem; box-sizing: border-box; - background: #e1e1e1; + background: var(--color-item-bg); + color: var(--color-font-1); border-radius: 8rem; margin-bottom: 10rem; padding: 10rem; @@ -196,7 +195,7 @@ defineExpose({scrollBottom}) &.active { background: var(--color-item-active); - color: white; + color: var(--color-font-1); } &.draggable {