From 7d23c5ff0d8d936f1fc03d5d1bbe537f409381f4 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 15 Nov 2023 11:57:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=87=E6=A0=87=E5=8D=A1/=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=8D=A1=E5=AD=97=E4=BD=93=E5=9C=A8=20mac=20=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/views/chart/components/normal/LabelNormal.vue | 3 +++
 .../src/views/chart/components/normal/LabelNormalText.vue      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/core/frontend/src/views/chart/components/normal/LabelNormal.vue b/core/frontend/src/views/chart/components/normal/LabelNormal.vue
index 12c163b56f..2b26bad78b 100644
--- a/core/frontend/src/views/chart/components/normal/LabelNormal.vue
+++ b/core/frontend/src/views/chart/components/normal/LabelNormal.vue
@@ -187,6 +187,7 @@ export default {
 
           this.label_class.fontSize = customAttr.size.dimensionFontSize + 'px'
           this.label_class.fontFamily = customAttr.size.dimensionFontFamily ? customAttr.size.dimensionFontFamily : DEFAULT_SIZE.dimensionFontFamily
+          this.label_class.fontFamily = CHART_CONT_FAMILY_MAP[this.label_class.fontFamily]
           this.label_class.fontWeight = customAttr.size.dimensionFontIsBolder ? 'bold' : 'normal'
           this.label_class.fontStyle = customAttr.size.dimensionFontIsItalic ? 'italic' : 'normal'
           this.label_class.letterSpacing = (customAttr.size.dimensionLetterSpace ? customAttr.size.dimensionLetterSpace : DEFAULT_SIZE.dimensionLetterSpace) + 'px'
@@ -194,6 +195,7 @@ export default {
 
           this.label_content_class.fontSize = customAttr.size.quotaFontSize + 'px'
           this.label_content_class.fontFamily = customAttr.size.quotaFontFamily ? customAttr.size.quotaFontFamily : DEFAULT_SIZE.quotaFontFamily
+          this.label_content_class.fontFamily = CHART_CONT_FAMILY_MAP[this.label_content_class.fontFamily]
           this.label_content_class.fontWeight = customAttr.size.quotaFontIsBolder ? 'bold' : 'normal'
           this.label_content_class.fontStyle = customAttr.size.quotaFontIsItalic ? 'italic' : 'normal'
           this.label_content_class.letterSpacing = (customAttr.size.quotaLetterSpace ? customAttr.size.quotaLetterSpace : DEFAULT_SIZE.quotaLetterSpace) + 'px'
@@ -205,6 +207,7 @@ export default {
           if (this.suffix) {
             this.label_suffix_class.fontSize = (customAttr.size.quotaSuffixFontSize ?? DEFAULT_SIZE.quotaSuffixFontSize) + 'px'
             this.label_suffix_class.fontFamily = customAttr.size.quotaSuffixFontFamily ? customAttr.size.quotaSuffixFontFamily : DEFAULT_SIZE.quotaSuffixFontFamily
+            this.label_suffix_class.fontFamily = CHART_CONT_FAMILY_MAP[this.label_suffix_class.fontFamily]
             this.label_suffix_class.fontWeight = customAttr.size.quotaSuffixFontIsBolder ? 'bold' : 'normal'
             this.label_suffix_class.fontStyle = customAttr.size.quotaSuffixFontIsItalic ? 'italic' : 'normal'
             this.label_suffix_class.letterSpacing = (customAttr.size.quotaSuffixLetterSpace ? customAttr.size.quotaSuffixLetterSpace : DEFAULT_SIZE.quotaSuffixLetterSpace) + 'px'
diff --git a/core/frontend/src/views/chart/components/normal/LabelNormalText.vue b/core/frontend/src/views/chart/components/normal/LabelNormalText.vue
index 21064e0580..ded7de5146 100644
--- a/core/frontend/src/views/chart/components/normal/LabelNormalText.vue
+++ b/core/frontend/src/views/chart/components/normal/LabelNormalText.vue
@@ -204,6 +204,7 @@ export default {
 
           this.label_class.fontSize = customAttr.size.dimensionFontSize + 'px'
           this.label_class.fontFamily = customAttr.size.dimensionFontFamily ? customAttr.size.dimensionFontFamily : DEFAULT_SIZE.dimensionFontFamily
+          this.label_class.fontFamily = CHART_CONT_FAMILY_MAP[this.label_class.fontFamily]
           this.label_class.fontWeight = customAttr.size.dimensionFontIsBolder ? 'bold' : 'normal'
           this.label_class.fontStyle = customAttr.size.dimensionFontIsItalic ? 'italic' : 'normal'
           this.label_class.letterSpacing = (customAttr.size.dimensionLetterSpace ? customAttr.size.dimensionLetterSpace : DEFAULT_SIZE.dimensionLetterSpace) + 'px'
@@ -211,6 +212,7 @@ export default {
 
           this.label_content_class.fontSize = customAttr.size.quotaFontSize + 'px'
           this.label_content_class.fontFamily = customAttr.size.quotaFontFamily ? customAttr.size.quotaFontFamily : DEFAULT_SIZE.quotaFontFamily
+          this.label_content_class.fontFamily = CHART_CONT_FAMILY_MAP[this.label_content_class.fontFamily]
           this.label_content_class.fontWeight = customAttr.size.quotaFontIsBolder ? 'bold' : 'normal'
           this.label_content_class.fontStyle = customAttr.size.quotaFontIsItalic ? 'italic' : 'normal'
           this.label_content_class.letterSpacing = (customAttr.size.quotaLetterSpace ? customAttr.size.quotaLetterSpace : DEFAULT_SIZE.quotaLetterSpace) + 'px'