fix(font): 增加加载元素判断

nihaojob · May 17, 2024 · 6c7383d · 6c7383d
1 parent 7aed103
commit 6c7383d
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/packages/core/plugin/FontPlugin.ts b/packages/core/plugin/FontPlugin.ts
@@ -2,7 +2,7 @@
  * @Author: 秦少卫
  * @Date: 2024-04-21 23:51:01
  * @LastEditors: 秦少卫
- * @LastEditTime: 2024-05-17 16:13:03
+ * @LastEditTime: 2024-05-17 16:40:07
  * @Description: 自定义字体
  */
 
@@ -67,9 +67,18 @@ class FontPlugin {
   }
 
   downFontByJSON(str: string) {
-    const fontFamilies: string[] = JSON.parse(str)
-      .objects.filter((item: Font) => item.type.includes('text') && item.fontFamily !== 'arial')
-      .map((item: Font) => item.fontFamily);
+    const object = JSON.parse(str);
+    let fontFamilies: string[] = [];
+    const skipFonts = ['arial'];
+    if (object.objects) {
+      fontFamilies = JSON.parse(str)
+        .objects.filter(
+          (item: Font) => item.type.includes('text') && !skipFonts.includes(item.fontFamily)
+        )
+        .map((item: Font) => item.fontFamily);
+    } else {
+      fontFamilies = skipFonts.includes(object.fontFamily) ? [] : [object.fontFamily];
+    }
 
     const fontFamiliesAll = fontFamilies.map((fontName) => {
       const font = new FontFaceObserver(fontName);