Skip to content

Commit 6c7383d

Browse files
committed
fix(font): 增加加载元素判断
1 parent 7aed103 commit 6c7383d

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

packages/core/plugin/FontPlugin.ts

+13-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @Author: 秦少卫
33
* @Date: 2024-04-21 23:51:01
44
* @LastEditors: 秦少卫
5-
* @LastEditTime: 2024-05-17 16:13:03
5+
* @LastEditTime: 2024-05-17 16:40:07
66
* @Description: 自定义字体
77
*/
88

@@ -67,9 +67,18 @@ class FontPlugin {
6767
}
6868

6969
downFontByJSON(str: string) {
70-
const fontFamilies: string[] = JSON.parse(str)
71-
.objects.filter((item: Font) => item.type.includes('text') && item.fontFamily !== 'arial')
72-
.map((item: Font) => item.fontFamily);
70+
const object = JSON.parse(str);
71+
let fontFamilies: string[] = [];
72+
const skipFonts = ['arial'];
73+
if (object.objects) {
74+
fontFamilies = JSON.parse(str)
75+
.objects.filter(
76+
(item: Font) => item.type.includes('text') && !skipFonts.includes(item.fontFamily)
77+
)
78+
.map((item: Font) => item.fontFamily);
79+
} else {
80+
fontFamilies = skipFonts.includes(object.fontFamily) ? [] : [object.fontFamily];
81+
}
7382

7483
const fontFamiliesAll = fontFamilies.map((fontName) => {
7584
const font = new FontFaceObserver(fontName);

0 commit comments

Comments
 (0)