From 7e340296d7641908d5bd486e0bcdd27b1b193b01 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Fri, 28 Feb 2025 19:30:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=80=E5=80=BC=E5=8F=8A=E6=A0=87=E7=AD=BE=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=BD=B4=E5=80=BC=E7=9A=84=E6=9C=80=E5=A4=A7=E6=9C=80?=
 =?UTF-8?q?=E5=B0=8F=E5=80=BC=E8=BF=9B=E8=A1=8C=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=BD=B4=E5=80=BC=E4=B8=AD=E6=9C=890?=
 =?UTF-8?q?=E5=80=BC=E6=97=B6=EF=BC=8C=E6=9C=80=E5=80=BC=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/js/extremumUitl.ts           | 6 ++++--
 .../src/views/chart/components/js/panel/charts/bar/bar.ts   | 5 ++++-
 .../chart/components/js/panel/charts/bar/horizontal-bar.ts  | 5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/extremumUitl.ts b/core/core-frontend/src/views/chart/components/js/extremumUitl.ts
index 6117111a2a..a9d4ab59b1 100644
--- a/core/core-frontend/src/views/chart/components/js/extremumUitl.ts
+++ b/core/core-frontend/src/views/chart/components/js/extremumUitl.ts
@@ -139,8 +139,8 @@ function removeDivsWithPrefix(parentDivId, prefix) {
 
 export const extremumEvt = (newChart, chart, _options, container) => {
   chart.container = container
+  clearExtremum(chart)
   if (!supportExtremumChartType(chart)) {
-    clearExtremum(chart)
     return
   }
   const { label: labelAttr } = parseJson(chart.customAttr)
@@ -151,7 +151,9 @@ export const extremumEvt = (newChart, chart, _options, container) => {
         i.forEach(item => {
           delete item._origin.EXTREME
         })
-        const { minItem, maxItem } = findMinMax(i.filter(item => item._origin.value))
+        const { minItem, maxItem } = findMinMax(
+          i.filter(item => item?._origin?.value !== null && item?._origin?.value !== undefined)
+        )
         if (!minItem || !maxItem) {
           return
         }
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 d9d091f4d2..b4050c177a 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
@@ -227,7 +227,10 @@ export class Bar extends G2PlotChartView<ColumnOptions, Column> {
           tickCount: axisValue.splitCount
         }
       }
-      return { ...tmpOptions, ...axis }
+      // 根据axis的最小值，过滤options中的data数据，过滤掉小于最小值的数据
+      const { data } = options
+      const newData = data.filter(item => item.value > axisValue.min)
+      return { ...tmpOptions, data: newData, ...axis }
     }
     return tmpOptions
   }
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 841729cb17..87ec4f0a06 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
@@ -135,7 +135,10 @@ export class HorizontalBar extends G2PlotChartView<BarOptions, Bar> {
           tickCount: axisValue.splitCount
         }
       }
-      return { ...tmpOptions, ...axis }
+      // 根据axis的最小值，过滤options中的data数据，过滤掉小于最小值的数据
+      const { data } = options
+      const newData = data.filter(item => item.value > axisValue.min)
+      return { ...tmpOptions, data: newData, ...axis }
     }
     return tmpOptions
   }