From 545f8da3cb5395ad9a94345a2b764df8f5128602 Mon Sep 17 00:00:00 2001 From: "xiaoqi.cxq" Date: Fri, 7 Oct 2022 15:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=96=E8=BE=91=E5=8C=BA?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=BB=E9=A2=98/=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E5=8C=BA=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CodeEditor.vue | 5 +- src/components/EditorInPageButtons.vue | 20 +++- src/components/SideBar.vue | 4 + src/components/common/DropdownMenu.vue | 3 + src/components/menus/EditThemeMenu.vue | 116 +++++++++++++++++++++ src/components/menus/MainMenu.vue | 5 + src/store/theme.js | 36 +++++-- static/themes/edit-theme-espresso_libre.js | 72 +++++++++++++ static/themes/edit-theme-lavender.js | 72 +++++++++++++ static/themes/edit-theme-solarflare.js | 72 +++++++++++++ 10 files changed, 394 insertions(+), 11 deletions(-) create mode 100644 src/components/menus/EditThemeMenu.vue create mode 100644 static/themes/edit-theme-espresso_libre.js create mode 100644 static/themes/edit-theme-lavender.js create mode 100644 static/themes/edit-theme-solarflare.js diff --git a/src/components/CodeEditor.vue b/src/components/CodeEditor.vue index ab36ad5d..145e4777 100644 --- a/src/components/CodeEditor.vue +++ b/src/components/CodeEditor.vue @@ -7,11 +7,12 @@ import Prism from 'prismjs'; import cledit from '../services/editor/cledit'; export default { - props: ['value', 'lang', 'disabled'], + props: ['value', 'lang', 'disabled', 'scrollClass'], mounted() { const preElt = this.$el; let scrollElt = preElt; - while (scrollElt && !scrollElt.classList.contains('modal')) { + const scrollCls = this.scrollClass || 'modal'; + while (scrollElt && !scrollElt.classList.contains(scrollCls)) { scrollElt = scrollElt.parentNode; } if (scrollElt) { diff --git a/src/components/EditorInPageButtons.vue b/src/components/EditorInPageButtons.vue index 9b959acc..a14b1674 100644 --- a/src/components/EditorInPageButtons.vue +++ b/src/components/EditorInPageButtons.vue @@ -63,6 +63,15 @@ export default { }, { name: '日光白', value: 'solarized_light', + }, { + name: '咖啡黑', + value: 'espresso_libre', + }, { + name: '薰衣草黑', + value: 'lavender', + }, { + name: '耀斑黑', + value: 'solarflare', }, { name: 'Clouds白', value: 'clouds', @@ -72,11 +81,15 @@ export default { }, { name: 'GitHub白', value: 'github', + }, { + name: '自定义', + value: 'custom', }], }), computed: { ...mapGetters('theme', [ 'currEditTheme', + 'customEditThemeStyle', ]), selectedTheme() { return { @@ -103,7 +116,12 @@ export default { }); }, async changeTheme(item) { - store.dispatch('theme/setEditTheme', item.value); + await store.dispatch('theme/setEditTheme', item.value); + // 如果自定义主题没内容 则弹出编辑区域 + if (item.value === 'custom' && !this.customEditThemeStyle) { + this.toggleSideBar(true); + store.dispatch('data/setSideBarPanel', 'editTheme'); + } }, showHelp() { this.toggleSideBar(true); diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue index 873b9b3b..4c391629 100644 --- a/src/components/SideBar.vue +++ b/src/components/SideBar.vue @@ -23,6 +23,7 @@ +