From b68912314dfb867cf21aafc83d09790fa45a7fee Mon Sep 17 00:00:00 2001 From: pipipi-pikachu <1171051090@qq.com> Date: Fri, 29 Jan 2021 10:51:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=85=A8=E5=B1=80=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E7=9A=84=E5=9C=A8=E7=BA=BF=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Editor/Toolbar/SlideStylePanel.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/views/Editor/Toolbar/SlideStylePanel.vue b/src/views/Editor/Toolbar/SlideStylePanel.vue index 90deb57f..ce199509 100644 --- a/src/views/Editor/Toolbar/SlideStylePanel.vue +++ b/src/views/Editor/Toolbar/SlideStylePanel.vue @@ -106,9 +106,16 @@ :value="theme.fontName" @change="value => updateTheme({ fontName: value })" > - - {{font.zh}} - + + + {{font.zh}} + + + + + {{font.name}} + +
@@ -177,12 +184,14 @@ import { computed, defineComponent } from 'vue' import { MutationTypes, useStore } from '@/store' import { Slide, SlideBackground, SlideTheme } from '@/types/slides' import { PRESET_THEMES } from '@/configs/theme' +import { WEB_FONTS } from '@/configs/font' import useHistorySnapshot from '@/hooks/useHistorySnapshot' import ColorButton from './common/ColorButton.vue' import { getImageDataURL } from '@/utils/image' const themes = PRESET_THEMES +const webFonts = WEB_FONTS export default defineComponent({ name: 'slide-style-panel', @@ -305,6 +314,7 @@ export default defineComponent({ applyBackgroundAllSlide, themes, theme, + webFonts, updateTheme, applyThemeAllSlide, }