diff --git a/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.eot b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.eot new file mode 100644 index 0000000000..82f27fd789 Binary files /dev/null and b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.eot differ diff --git a/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.otf b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.otf new file mode 100644 index 0000000000..541e3c108c Binary files /dev/null and b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.otf differ diff --git a/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.ttf b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.ttf new file mode 100644 index 0000000000..a6eaf3613e Binary files /dev/null and b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.ttf differ diff --git a/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.woff b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.woff new file mode 100644 index 0000000000..f576376544 Binary files /dev/null and b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.woff differ diff --git a/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.woff2 b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.woff2 new file mode 100644 index 0000000000..4b574fbd88 Binary files /dev/null and b/frontend/src/assets/font/AlibabaPuHuiTi-3-55-Regular.woff2 differ diff --git a/frontend/src/assets/style/global.less b/frontend/src/assets/style/global.less index 1220e6c00a..6ef10a5b2d 100644 --- a/frontend/src/assets/style/global.less +++ b/frontend/src/assets/style/global.less @@ -7,6 +7,15 @@ @tailwind base; @tailwind components; @tailwind utilities; + +@font-face { + font-family: AlibabaPuHuiTi; + src: url('../font/AlibabaPuHuiTi-3-55-Regular.woff') format('woff'), + url('../font/AlibabaPuHuiTi-3-55-Regular.ttf') format('truetype'), + url('../font/AlibabaPuHuiTi-3-55-Regular.eot') format('eot'), + url('../font/AlibabaPuHuiTi-3-55-Regular.otf') format('opentype'), + url('../font/AlibabaPuHuiTi-3-55-Regular.woff2') format('woff2'); +} * { @apply box-border; } @@ -15,6 +24,7 @@ body { @apply m-0 h-full w-full p-0; font-size: 14px; + font-family: 'PingFang SC', AlibabaPuHuiTi !important; color: var(--color-text-1); background-color: var(--color-bg-1); line-height: 22px; diff --git a/frontend/src/components/pure/ms-menu-panel/index.vue b/frontend/src/components/pure/ms-menu-panel/index.vue index 2381274287..9c9641f483 100644 --- a/frontend/src/components/pure/ms-menu-panel/index.vue +++ b/frontend/src/components/pure/ms-menu-panel/index.vue @@ -76,7 +76,7 @@ .menu-item { height: 38px; line-height: 38px; - font-family: 'PingFang SC'; + font-family: 'PingFang SC', AlibabaPuHuiTi; } } } diff --git a/frontend/src/components/pure/ms-minder-editor/script/protocol/png.ts b/frontend/src/components/pure/ms-minder-editor/script/protocol/png.ts index d7e51ab54c..10ba116adf 100644 --- a/frontend/src/components/pure/ms-minder-editor/script/protocol/png.ts +++ b/frontend/src/components/pure/ms-minder-editor/script/protocol/png.ts @@ -60,7 +60,7 @@ function getSVGInfo(minder: any) { $svg[index].setAttribute('width', renderBox.width + 1); $svg[index].setAttribute('height', renderBox.height + 1); - $svg[index].setAttribute('style', 'font-family: Arial, "Microsoft Yahei","Heiti SC";'); + $svg[index].setAttribute('style', 'font-family: "PingFang SC",AlibabaPuHuiTi;'); const div = document.createElement('div'); div.appendChild($svg[index]); diff --git a/frontend/src/components/pure/ms-minder-editor/script/protocol/svg.ts b/frontend/src/components/pure/ms-minder-editor/script/protocol/svg.ts index 82b668675f..ccebc3b06c 100644 --- a/frontend/src/components/pure/ms-minder-editor/script/protocol/svg.ts +++ b/frontend/src/components/pure/ms-minder-editor/script/protocol/svg.ts @@ -41,7 +41,7 @@ function exportSVG(minder: any) { $svg[index].setAttribute('height', height + padding * 2 || 0); $svg[index].setAttribute( 'style', - `font-family: Arial, "Microsoft Yahei", "Heiti SC"; background: ${minder.getStyle('background')}` + `font-family: 'PingFang SC',AlibabaPuHuiTi; background: ${minder.getStyle('background')}` ); $svg[index].setAttribute( diff --git a/frontend/src/components/pure/ms-minder-editor/style/editor.less b/frontend/src/components/pure/ms-minder-editor/style/editor.less index 05c6f02238..4affac5b0e 100644 --- a/frontend/src/components/pure/ms-minder-editor/style/editor.less +++ b/frontend/src/components/pure/ms-minder-editor/style/editor.less @@ -38,8 +38,7 @@ div.minder-editor-container { right: 0; bottom: 0; left: 0; - font-family: Arial, 'PingFang SC', 'Helvetica Neue', 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', - sans-serif; + font-family: 'PingFang SC', AlibabaPuHuiTi; } .minder-editor { @apply absolute bottom-0 left-0 right-0; diff --git a/frontend/src/views/project-management/projectAndPermission/index.vue b/frontend/src/views/project-management/projectAndPermission/index.vue index 79ff796b09..baf227f70e 100644 --- a/frontend/src/views/project-management/projectAndPermission/index.vue +++ b/frontend/src/views/project-management/projectAndPermission/index.vue @@ -134,7 +134,7 @@ .menu-item { height: 38px; line-height: 38px; - font-family: 'PingFang SC'; + font-family: 'PingFang SC', AlibabaPuHuiTi; } } }