From d94cf1912a142c4e481f4027525db844002729c4 Mon Sep 17 00:00:00 2001 From: pipipi-pikachu <1171051090@qq.com> Date: Wed, 27 Jan 2021 22:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/antd.scss | 1 - src/assets/styles/prosemirror.scss | 1 - src/views/Editor/Canvas/EditableElement.vue | 7 ++++--- src/views/Screen/ScreenElement.vue | 7 ++++--- src/views/components/ThumbnailSlide/ThumbnailElement.vue | 7 ++++--- .../components/element/ChartElement/BaseChartElement.vue | 1 - .../components/element/TextElement/BaseTextElement.vue | 1 - src/views/components/element/TextElement/index.vue | 1 - 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/assets/styles/antd.scss b/src/assets/styles/antd.scss index 13fd225f..df9448d4 100644 --- a/src/assets/styles/antd.scss +++ b/src/assets/styles/antd.scss @@ -16,7 +16,6 @@ // dropdown .ant-dropdown { min-width: 120px; - animation: none !important; } .ant-dropdown-menu { box-shadow: $boxShadow; diff --git a/src/assets/styles/prosemirror.scss b/src/assets/styles/prosemirror.scss index 6d42ff46..e27ab2b9 100644 --- a/src/assets/styles/prosemirror.scss +++ b/src/assets/styles/prosemirror.scss @@ -3,7 +3,6 @@ border: 0; font-size: 20px; word-break: break-word; - font-family: '微软雅黑'; ::selection { background-color: rgba(#d14424, 0.3); diff --git a/src/views/Editor/Canvas/EditableElement.vue b/src/views/Editor/Canvas/EditableElement.vue index c2c2dcff..7e7e8816 100644 --- a/src/views/Editor/Canvas/EditableElement.vue +++ b/src/views/Editor/Canvas/EditableElement.vue @@ -5,7 +5,8 @@ :id="'editable-element-' + elementInfo.id" :style="{ zIndex: elementIndex, - color: themeFontColor, + color: theme.fontColor, + fontFamily: theme.fontName, }" > () - const themeFontColor = computed(() => store.state.theme.fontColor) + const theme = computed(() => store.state.theme) const currentElementComponent = computed(() => { const elementTypeMap = { @@ -153,7 +154,7 @@ export default defineComponent({ return { currentElementComponent, contextmenus, - themeFontColor, + theme, } }, }) diff --git a/src/views/Screen/ScreenElement.vue b/src/views/Screen/ScreenElement.vue index 71969387..e2340197 100644 --- a/src/views/Screen/ScreenElement.vue +++ b/src/views/Screen/ScreenElement.vue @@ -3,7 +3,8 @@ class="screen-element" :style="{ zIndex: elementIndex, - color: themeFontColor, + color: theme.fontColor, + fontFamily: theme.fontName, visibility: needWaitAnimation ? 'hidden' : 'visible', }" > @@ -57,7 +58,7 @@ export default defineComponent({ }) const store = useStore() - const themeFontColor = computed(() => store.state.theme.fontColor) + const theme = computed(() => store.state.theme) const currentSlide = computed(() => store.getters.currentSlide) const needWaitAnimation = computed(() => { @@ -70,7 +71,7 @@ export default defineComponent({ return { currentElementComponent, needWaitAnimation, - themeFontColor, + theme, } }, }) diff --git a/src/views/components/ThumbnailSlide/ThumbnailElement.vue b/src/views/components/ThumbnailSlide/ThumbnailElement.vue index aea53761..760e611a 100644 --- a/src/views/components/ThumbnailSlide/ThumbnailElement.vue +++ b/src/views/components/ThumbnailSlide/ThumbnailElement.vue @@ -3,7 +3,8 @@ class="base-element" :style="{ zIndex: elementIndex, - color: themeFontColor, + color: theme.fontColor, + fontFamily: theme.fontName, }" > () - const themeFontColor = computed(() => store.state.theme.fontColor) + const theme = computed(() => store.state.theme) const currentElementComponent = computed(() => { const elementTypeMap = { @@ -57,7 +58,7 @@ export default defineComponent({ return { currentElementComponent, - themeFontColor, + theme, } }, }) diff --git a/src/views/components/element/ChartElement/BaseChartElement.vue b/src/views/components/element/ChartElement/BaseChartElement.vue index c4473fee..c4de9ed6 100644 --- a/src/views/components/element/ChartElement/BaseChartElement.vue +++ b/src/views/components/element/ChartElement/BaseChartElement.vue @@ -61,7 +61,6 @@ export default defineComponent({ width: 100%; height: 100%; opacity: .5; - background-color: rgba($color: #000, $alpha: .05); display: flex; justify-content: center; align-items: center; diff --git a/src/views/components/element/TextElement/BaseTextElement.vue b/src/views/components/element/TextElement/BaseTextElement.vue index aa12cf16..bdb4876c 100644 --- a/src/views/components/element/TextElement/BaseTextElement.vue +++ b/src/views/components/element/TextElement/BaseTextElement.vue @@ -67,7 +67,6 @@ export default defineComponent({ padding: 10px; line-height: 1.5; word-break: break-word; - font-family: '微软雅黑'; .text { position: relative; diff --git a/src/views/components/element/TextElement/index.vue b/src/views/components/element/TextElement/index.vue index 0616b40c..4ed3895c 100644 --- a/src/views/components/element/TextElement/index.vue +++ b/src/views/components/element/TextElement/index.vue @@ -293,7 +293,6 @@ export default defineComponent({ padding: 10px; line-height: 1.5; word-break: break-word; - font-family: '微软雅黑'; .text { position: relative;