From 22088cd3d8ff963fb3b372d50a1961c93a3ca6b9 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 3 Dec 2024 15:25:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9B=B4=E6=8D=A2=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#13408
---
 .../src/views/chart/components/js/panel/charts/bar/bar.ts        | 1 +
 .../chart/components/js/panel/charts/bar/bidirectional-bar.ts    | 1 +
 .../views/chart/components/js/panel/charts/bar/horizontal-bar.ts | 1 +
 .../src/views/chart/components/js/panel/charts/line/area.ts      | 1 +
 .../src/views/chart/components/js/panel/charts/line/line.ts      | 1 +
 .../views/chart/components/js/panel/charts/others/chart-mix.ts   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
index f83807ca3d..9e77360870 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
@@ -132,6 +132,7 @@ export class Bar extends G2PlotChartView<ColumnOptions, Column> {
             textAlign: 'start',
             textBaseline: 'top',
             fontSize: labelCfg.fontSize,
+            fontFamily: chart.fontFamily,
             fill: labelCfg.color
           }
         })
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
index b45401a8b7..1890c1a2f8 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
@@ -492,6 +492,7 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
                   textAlign: label.position === 'middle' ? 'start' : textAlign,
                   textBaseline: 'top',
                   fontSize: labelCfg.fontSize,
+                  fontFamily: chart.fontFamily,
                   fill: labelCfg.color
                 }
               })
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts
index 6c165b5c2c..46e73ea48d 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts
@@ -224,6 +224,7 @@ export class HorizontalBar extends G2PlotChartView<BarOptions, Bar> {
             textAlign: 'start',
             textBaseline: 'top',
             fontSize: labelCfg.fontSize,
+            fontFamily: chart.fontFamily,
             fill: labelCfg.color
           }
         })
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts
index 20932bf19b..65c0d3b986 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts
@@ -179,6 +179,7 @@ export class Area extends G2PlotChartView<AreaOptions, G2Area> {
             textAlign: 'start',
             textBaseline: 'top',
             fontSize: labelCfg.fontSize,
+            fontFamily: chart.fontFamily,
             fill: color
           }
         })
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts
index 900948a88b..da92ea4004 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts
@@ -178,6 +178,7 @@ export class Line extends G2PlotChartView<LineOptions, G2Line> {
             textAlign: 'start',
             textBaseline: 'top',
             fontSize: labelCfg.fontSize,
+            fontFamily: chart.fontFamily,
             fill: color
           }
         })
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
index 4fb148a7e0..ba84f507bf 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
@@ -226,6 +226,7 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
               textAlign: 'start',
               textBaseline: 'top',
               fontSize: labelCfg.fontSize,
+              fontFamily: chart.fontFamily,
               fill: labelCfg.color
             }
           })