From 49ef25e3003745c30f646f7cd02d74a8c7517beb Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 2 Dec 2024 18:51:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=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 --- .../chart/components/js/panel/charts/bar/bidirectional-bar.ts | 3 ++- .../views/chart/components/js/panel/charts/others/sankey.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 cd0812d4f0..0ac6e1f10e 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 @@ -446,7 +446,8 @@ export class BidirectionalHorizontalBar extends G2PlotChartView< layout, style: { fill: l.color, - fontSize: l.fontSize + fontSize: l.fontSize, + fontFamily: chart.fontFamily }, formatter: param => { let yaxis = yAxis[0] diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts index 6605e4f04a..f751b9deb6 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts @@ -246,7 +246,8 @@ export class SankeyBar extends G2PlotChartView { style: { fill: labelAttr.color, fontSize: labelAttr.fontSize, - textAlign: isLast ? 'end' : 'start' + textAlign: isLast ? 'end' : 'start', + fontFamily: chart.fontFamily }, offsetX: isLast ? -8 : 8 } From 09cb365ca63f7d6a6db2f2954da2d00256e07543 Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 2 Dec 2024 19:03:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E7=BC=A9?= =?UTF-8?q?=E7=95=A5=E8=BD=B4=E6=94=AF=E6=8C=81=E6=9B=B4=E6=8D=A2=E5=AD=97?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #13408 --- .../chart/components/js/panel/charts/line/stock-line.ts | 5 ++++- .../views/chart/components/js/panel/common/common_antv.ts | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts index b3126aa381..eb141c0b76 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts @@ -337,7 +337,10 @@ export class StockLine extends G2PlotChartView { data, slider: { start: 0.5, - end: 1 + end: 1, + textStyle: { + fontFamily: chart.fontFamily + } }, plots: [ { diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts index dd4a1979cf..2bb73baa94 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts @@ -687,7 +687,8 @@ export function getSlider(chart: Chart) { } if (senior.functionCfg.sliderTextColor) { cfg.textStyle = { - fill: senior.functionCfg.sliderTextColor + fill: senior.functionCfg.sliderTextColor, + fontFamily: chart.fontFamily } cfg.handlerStyle = { fill: senior.functionCfg.sliderTextColor,