diff --git a/public/styles/css/editor.css b/public/styles/css/editor.css index 400cff8..c94fa0b 100644 --- a/public/styles/css/editor.css +++ b/public/styles/css/editor.css @@ -1,18 +1,10 @@ @font-face { - font-family: SFProDisplay; - src: url('./styles/font/SF-Pro-Display-Regular.otf'); + font-family: Harmony; + src: url('./styles/font/HarmonyOS_SansSC_Light.ttf'); } @font-face { - font-family: ProximaNova; - src: url('./styles/font/ProximaNova-Regular.otf'); -} -@font-face { - font-family: PingFang; - src: url('./styles/font/PingFang-Regular.otf'); -} -@font-face { - font-family: PingFang SC; - src: url('./styles/font/PingFang-Regular.otf'); + font-family: siyuan; + src: url('./styles/font/SourceHanSansCN-VF-2.otf'); } .mce-content-body:not([dir='rtl']) blockquote { padding: 8px 15px; @@ -48,7 +40,6 @@ .tiny-wrap .block p { margin: 0 0 10px; font-size: 19px; - font-family: SFProDisplay; font-weight: 400; color: #101010; line-height: 32px; @@ -56,14 +47,12 @@ } .tiny-wrap .en-block p, .tiny-wrap .en-block .img-des { - font-family: ProximaNova; letter-spacing: -0.0135em; line-height: 1.5em; } .tiny-wrap .block .tiny-title { margin: 10px 0; font-size: 24px; - font-family: SFProDisplay; font-weight: 500; color: #101010; line-height: 32px; @@ -106,7 +95,6 @@ } .tiny-wrap .people h6 { font-size: 24px; - font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #333333; } diff --git a/public/styles/font/HarmonyOS_SansSC_Light.ttf b/public/styles/font/HarmonyOS_SansSC_Light.ttf new file mode 100644 index 0000000..cc54275 Binary files /dev/null and b/public/styles/font/HarmonyOS_SansSC_Light.ttf differ diff --git a/public/styles/font/SourceHanSansCN-VF-2.otf b/public/styles/font/SourceHanSansCN-VF-2.otf new file mode 100644 index 0000000..4bf10f4 Binary files /dev/null and b/public/styles/font/SourceHanSansCN-VF-2.otf differ diff --git a/src/components/editor.js b/src/components/editor.js index 19e06d7..3c157ca 100644 --- a/src/components/editor.js +++ b/src/components/editor.js @@ -185,7 +185,7 @@ export default { ], // content_style: Style, fontsize_formats: '12px 14px 16px 18px 19px 22px 24px 36px 48px 56px 72px', - font_formats: '苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif', + font_formats: '鸿蒙=Harmony;思源=siyuan;宋体=simsun,serif;微软雅黑=Microsoft YaHei,Helvetica Neue,仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif', link_list: [ { title: '预置链接1', value: 'http://www.tinymce.com' }, { title: '预置链接2', value: 'http://tinymce.ax-z.cn' } @@ -387,7 +387,7 @@ export default { editor.on('init', function (ed) { // 设置默认字体(新增才需要设置) if (editor.iframeElement.contentWindow.document.body.innerText === '\n') { - ed.target.editorCommands.execCommand("fontName", false, "Microsoft Yahei") + ed.target.editorCommands.execCommand("fontName", false, "Harmony") ed.target.editorCommands.execCommand("fontSize", false, "19px") ed.target.editorCommands.execCommand("lineHeight", false, "1.5") } diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index cf344ad..3f09dd2 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -41,7 +41,7 @@ export default { }, mounted () { this.getInfo() - this.getColumnInfo() + this.columnId && this.getColumnInfo() }, methods: { // 获取详情 diff --git a/src/pages/article/add/editor.js b/src/pages/article/add/editor.js index 00c1ded..bac6416 100644 --- a/src/pages/article/add/editor.js +++ b/src/pages/article/add/editor.js @@ -188,7 +188,7 @@ export default { ], // content_style: Style, fontsize_formats: '12px 14px 16px 19px 24px 36px 48px 56px 72px', - font_formats: '苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif', + font_formats: '鸿蒙=Harmony;思源=siyuan;宋体=simsun,serif;微软雅黑=Microsoft YaHei,Helvetica Neue,仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif', link_list: [ { title: '预置链接1', value: 'http://www.tinymce.com' }, { title: '预置链接2', value: 'http://tinymce.ax-z.cn' } @@ -485,7 +485,7 @@ export default { editor.on('init', function (ed) { // 设置默认字体(新增才需要设置) if (editor.iframeElement.contentWindow.document.body.innerText === '\n') { - ed.target.editorCommands.execCommand("fontName", false, "Microsoft Yahei") + ed.target.editorCommands.execCommand("fontName", false, "Harmony") ed.target.editorCommands.execCommand("fontSize", false, "19px") ed.target.editorCommands.execCommand("lineHeight", false, "1") } diff --git a/src/pages/footer/index.vue b/src/pages/footer/index.vue index 8138298..2f49e11 100644 --- a/src/pages/footer/index.vue +++ b/src/pages/footer/index.vue @@ -264,7 +264,6 @@ export default { } ]) this.originForm = _.cloneDeep(this.form) - console.log(111, Modules.footer, this.modules) this.getData() this.getColumn() }, diff --git a/src/styles/common.scss b/src/styles/common.scss index 1a89e16..1519c70 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -1,32 +1,12 @@ @import "./default/index.scss"; @font-face { - font-family: PingFang; - src: url('font/PingFang-Regular.otf'); + font-family: Harmony; + src: url('font/HarmonyOS_SansSC_Light.ttf'); } @font-face { - font-family: PingFangSC-Medium; - src: url('font/PingFangSC-Medium.otf'); -} -@font-face { - font-family: PingFangSC-Semibold; - src: url('font/PingFangTC-Semibold.ttf'); -} -@font-face { - font-family: SFProDisplay-Bold; - src: url('font/SF-Pro-Display-Bold.otf'); -} -@font-face { - font-family: SFProDisplay; - src: url('font/SF-Pro-Display-Regular.otf'); -} -@font-face { - font-family: toppan; - src: url('font/toppan.otf'); -} -@font-face { - font-family: ProximaNova; - src: url('font/ProximaNova-Regular.otf'); + font-family: siyuan; + src: url('font/SourceHanSansCN-VF-2.otf'); } [v-cloak] { display: none; @@ -208,7 +188,6 @@ .cell { font-size: 12px; color: #333; - font-family: PingFangSC-Regular, PingFang SC; } } th { @@ -218,7 +197,6 @@ color: #323232; font-size: 12px; font-weight: 500; - font-family: PingFangSC-Medium, PingFang SC; } } } diff --git a/src/styles/font/HarmonyOS_SansSC_Light.ttf b/src/styles/font/HarmonyOS_SansSC_Light.ttf new file mode 100644 index 0000000..cc54275 Binary files /dev/null and b/src/styles/font/HarmonyOS_SansSC_Light.ttf differ diff --git a/src/styles/font/PingFang-Regular.otf b/src/styles/font/PingFang-Regular.otf deleted file mode 100644 index 11032b6..0000000 Binary files a/src/styles/font/PingFang-Regular.otf and /dev/null differ diff --git a/src/styles/font/PingFangSC-Medium.otf b/src/styles/font/PingFangSC-Medium.otf deleted file mode 100644 index f40327f..0000000 Binary files a/src/styles/font/PingFangSC-Medium.otf and /dev/null differ diff --git a/src/styles/font/PingFangTC-Semibold.ttf b/src/styles/font/PingFangTC-Semibold.ttf deleted file mode 100644 index bd5012c..0000000 Binary files a/src/styles/font/PingFangTC-Semibold.ttf and /dev/null differ diff --git a/src/styles/font/ProximaNova-Regular.otf b/src/styles/font/ProximaNova-Regular.otf deleted file mode 100644 index 27c8d8f..0000000 Binary files a/src/styles/font/ProximaNova-Regular.otf and /dev/null differ diff --git a/src/styles/font/SF-Pro-Display-Bold.otf b/src/styles/font/SF-Pro-Display-Bold.otf deleted file mode 100644 index 025b25c..0000000 Binary files a/src/styles/font/SF-Pro-Display-Bold.otf and /dev/null differ diff --git a/src/styles/font/SourceHanSansCN-VF-2.otf b/src/styles/font/SourceHanSansCN-VF-2.otf new file mode 100644 index 0000000..4bf10f4 Binary files /dev/null and b/src/styles/font/SourceHanSansCN-VF-2.otf differ diff --git a/src/styles/layout/index.scss b/src/styles/layout/index.scss index 551bc53..7ef8f80 100644 --- a/src/styles/layout/index.scss +++ b/src/styles/layout/index.scss @@ -11,7 +11,7 @@ body, body { min-width: 1280px; - font-family: PingFang, PingFang SC, "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; + font-family: Harmony, STHeiTi, sans-serif; font-size: 14px; background: #F0F2F5; } \ No newline at end of file diff --git a/src/styles/lib/_style.scss b/src/styles/lib/_style.scss index 4b81d96..6423966 100644 --- a/src/styles/lib/_style.scss +++ b/src/styles/lib/_style.scss @@ -1,3 +1,3 @@ html { - font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; + font-family: Harmony, STHeiTi, sans-serif; }