From 3f75a2af9477948491d4e50a60b645c6eb6d5464 Mon Sep 17 00:00:00 2001 From: pipipi-pikachu Date: Mon, 8 Feb 2021 12:38:11 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AD=97=E4=BD=93=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/configs/font.ts | 80 +++++++++---------- src/store/mutations.ts | 2 +- .../ElementStylePanel/TextStylePanel.vue | 8 +- src/views/Editor/Toolbar/SlideStylePanel.vue | 8 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/configs/font.ts b/src/configs/font.ts index b57be519..3ce8ee6b 100644 --- a/src/configs/font.ts +++ b/src/configs/font.ts @@ -1,45 +1,45 @@ export const SYS_FONTS = [ - { zh: '微软雅黑', en: 'Microsoft Yahei' }, - { zh: '宋体', en: 'SimSun' }, - { zh: '黑体', en: 'SimHei' }, - { zh: '楷体', en: 'KaiTi' }, - { zh: '新宋体', en: 'NSimSun' }, - { zh: '仿宋', en: 'FangSong' }, - { zh: '苹方', en: 'PingFang SC' }, - { zh: '华文黑体', en: 'STHeiti' }, - { zh: '华文楷体', en: 'STKaiti' }, - { zh: '华文宋体', en: 'STSong' }, - { zh: '华文仿宋', en: 'STFangSong' }, - { zh: '华文中宋', en: 'STZhongSong' }, - { zh: '华文琥珀', en: 'STHupo' }, - { zh: '华文新魏', en: 'STXinwei' }, - { zh: '华文隶书', en: 'STLiti' }, - { zh: '华文行楷', en: 'STXingkai' }, - { zh: '冬青黑体简', en: 'Hiragino Sans GB' }, - { zh: '兰亭黑-简', en: 'Lantinghei SC' }, - { zh: '偏偏体-简', en: 'Hanzipen SC' }, - { zh: '手札体-简', en: 'Hannotate SC' }, - { zh: '宋体-简', en: 'Songti SC' }, - { zh: '娃娃体-简', en: 'Wawati SC' }, - { zh: '行楷-简', en: 'Xingkai SC' }, - { zh: '圆体-简', en: 'Yuanti SC' }, - { zh: '华文细黑', en: 'STXihei' }, - { zh: '幼圆', en: 'YouYuan' }, - { zh: '隶书', en: 'LiSu' }, - { zh: 'Arial', en: 'Arial' }, + { label: 'Arial', value: 'Arial' }, + { label: '微软雅黑', value: 'Microsoft Yahei' }, + { label: '宋体', value: 'SimSun' }, + { label: '黑体', value: 'SimHei' }, + { label: '楷体', value: 'KaiTi' }, + { label: '新宋体', value: 'NSimSun' }, + { label: '仿宋', value: 'FangSong' }, + { label: '苹方', value: 'PingFang SC' }, + { label: '华文黑体', value: 'STHeiti' }, + { label: '华文楷体', value: 'STKaiti' }, + { label: '华文宋体', value: 'STSong' }, + { label: '华文仿宋', value: 'STFangSong' }, + { label: '华文中宋', value: 'STZhongSong' }, + { label: '华文琥珀', value: 'STHupo' }, + { label: '华文新魏', value: 'STXinwei' }, + { label: '华文隶书', value: 'STLiti' }, + { label: '华文行楷', value: 'STXingkai' }, + { label: '冬青黑体', value: 'Hiragino Sans GB' }, + { label: '兰亭黑', value: 'Lantinghei SC' }, + { label: '偏偏体', value: 'Hanzipen SC' }, + { label: '手札体', value: 'Hannotate SC' }, + { label: '宋体', value: 'Songti SC' }, + { label: '娃娃体', value: 'Wawati SC' }, + { label: '行楷', value: 'Xingkai SC' }, + { label: '圆体', value: 'Yuanti SC' }, + { label: '华文细黑', value: 'STXihei' }, + { label: '幼圆', value: 'YouYuan' }, + { label: '隶书', value: 'LiSu' }, ] export const WEB_FONTS = [ - { name: '仓耳小丸子' }, - { name: '优设标题黑' }, - { name: '峰广明锐体' }, - { name: '摄图摩登小方体' }, - { name: '站酷快乐体' }, - { name: '站酷酷黑体' }, - { name: '素材集市康康体' }, - { name: '联盟起艺卢帅正锐黑体' }, - { name: '谦度手写楷体' }, - { name: '途牛类圆体' }, - { name: '锐字真言体' }, - { name: '问藏书房' }, + { label: '仓耳小丸子', value: '仓耳小丸子' }, + { label: '优设标题黑', value: '优设标题黑' }, + { label: '峰广明锐体', value: '峰广明锐体' }, + { label: '摄图摩登小方体', value: '摄图摩登小方体' }, + { label: '站酷快乐体', value: '站酷快乐体' }, + { label: '站酷酷黑体', value: '站酷酷黑体' }, + { label: '素材集市康康体', value: '素材集市康康体' }, + { label: '联盟起艺卢帅正锐黑体', value: '联盟起艺卢帅正锐黑体' }, + { label: '谦度手写楷体', value: '谦度手写楷体' }, + { label: '途牛类圆体', value: '途牛类圆体' }, + { label: '锐字真言体', value: '锐字真言体' }, + { label: '问藏书房', value: '问藏书房' }, ] \ No newline at end of file diff --git a/src/store/mutations.ts b/src/store/mutations.ts index 100bb166..96376fb3 100644 --- a/src/store/mutations.ts +++ b/src/store/mutations.ts @@ -61,7 +61,7 @@ export const mutations: MutationTree = { }, [MutationTypes.SET_AVAILABLE_FONTS](state) { - state.availableFonts = SYS_FONTS.filter(font => isSupportFontFamily(font.en)) + state.availableFonts = SYS_FONTS.filter(font => isSupportFontFamily(font.value)) }, [MutationTypes.SET_TOOLBAR_STATE](state, type) { diff --git a/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue index cc3d9df3..ae9042e5 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue @@ -20,13 +20,13 @@ > - - {{font.zh}} + + {{font.label}} - - {{font.name}} + + {{font.label}} diff --git a/src/views/Editor/Toolbar/SlideStylePanel.vue b/src/views/Editor/Toolbar/SlideStylePanel.vue index d5c86fba..0f0c73c1 100644 --- a/src/views/Editor/Toolbar/SlideStylePanel.vue +++ b/src/views/Editor/Toolbar/SlideStylePanel.vue @@ -107,13 +107,13 @@ @change="value => updateTheme({ fontName: value })" > - - {{font.zh}} + + {{font.label}} - - {{font.name}} + + {{font.label}}