From 8b60ff8b0efb6f5d2538654aaeb58f401e3155bd Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Thu, 18 Sep 2025 19:19:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=9C=AA=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E6=98=BE=E7=A4=BA=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E5=8D=B4=E6=98=BE=E7=A4=BA=E4=BA=86=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/chart/components/js/panel/charts/g2/bar/group-bar.ts | 2 +- .../chart/components/js/panel/charts/g2/bar/group-stack-bar.ts | 2 +- .../components/js/panel/charts/g2/bar/percentage-stack-bar.ts | 2 +- .../js/panel/charts/g2/bar/percentage-stack-horizontal-bar.ts | 2 +- .../views/chart/components/js/panel/charts/g2/bar/range-bar.ts | 2 +- .../views/chart/components/js/panel/charts/g2/bar/stack-bar.ts | 2 +- .../views/chart/components/js/panel/charts/g2/bar/waterfall.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-bar.ts index 1ce2654b60..6fba2d4fe9 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-bar.ts @@ -59,7 +59,7 @@ export class GroupBar extends StackBar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show || !labelAttr.childrenShow) return options const { children } = options if (labelAttr.showExtremum) { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-stack-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-stack-bar.ts index 46fd109ce1..22dab707c0 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-stack-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/group-stack-bar.ts @@ -29,7 +29,7 @@ export class GroupStackBar extends StackBar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show) return options const { children } = options const position = { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-bar.ts index 93f48cda33..83e8f4cae5 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-bar.ts @@ -25,7 +25,7 @@ export class PercentageStackBar extends GroupStackBar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show) return options const { children } = options const position = { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-horizontal-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-horizontal-bar.ts index 0b5b3c60ac..ec745742a5 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-horizontal-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/percentage-stack-horizontal-bar.ts @@ -25,7 +25,7 @@ export class PercentageStackBar extends HorizontalStackBar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show) return options const { children } = options const position = { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/range-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/range-bar.ts index b9e46cf453..df970902cb 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/range-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/range-bar.ts @@ -141,7 +141,7 @@ export class RangeBar extends HorizontalBar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show) return options const { children } = options const position = { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/stack-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/stack-bar.ts index 5c5c9076d5..892db4d0f0 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/stack-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/stack-bar.ts @@ -46,7 +46,7 @@ export class StackBar extends Bar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show) return options const { children } = options const position = { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/waterfall.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/waterfall.ts index a9f68ba030..4ae3bcaf41 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/waterfall.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/bar/waterfall.ts @@ -216,7 +216,7 @@ export class Waterfall extends Bar { protected configLabel(chart: Chart, options: ViewSpec): ViewSpec { const customAttr = parseJson(chart.customAttr) const { label: labelAttr } = customAttr - if (!labelAttr || !labelAttr.show) return options + if (!labelAttr.show) return options const { children } = options const position = {