From 02d7f8891b3c2e362dfd887842d9701b63d33e73 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Fri, 27 Sep 2024 18:40:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87=E6=98=BE=E7=A4=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=80=E5=80=BC=E7=9A=84=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/extremumUitl.ts | 26 ++++++++++++++++---
 1 file changed, 22 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 0ab380e354..047bb6746a 100644
--- a/core/core-frontend/src/views/chart/components/js/extremumUitl.ts
+++ b/core/core-frontend/src/views/chart/components/js/extremumUitl.ts
@@ -106,6 +106,14 @@ const noChildrenFieldChart = chart => {
   return ['area', 'bar'].includes(chart.type)
 }
 
+/**
+ * 支持最值图表的折线图，面积图，柱状图，分组柱状图
+ * @param chart
+ */
+const supportExtremumChartType = chart => {
+  return ['line', 'area', 'bar', 'bar-group'].includes(chart.type)
+}
+
 const chartContainerId = chart => {
   return chart.container + '_'
 }
@@ -131,6 +139,10 @@ function removeDivsWithPrefix(parentDivId, prefix) {
 
 export const extremumEvt = (newChart, chart, _options, container) => {
   chart.container = container
+  if (!supportExtremumChartType(chart)) {
+    clearExtremum(chart)
+    return
+  }
   const { label: labelAttr } = parseJson(chart.customAttr)
   const { yAxis } = parseJson(chart)
   newChart.once('beforerender', ev => {
@@ -145,8 +157,12 @@ export const extremumEvt = (newChart, chart, _options, container) => {
         }
         let showExtremum = false
         if (noChildrenFieldChart(chart) || yAxis.length > 1) {
-          const seriesLabelFormatter = labelAttr.seriesLabelFormatter.find(
-            d => d.name === minItem._origin.category || d.name === maxItem._origin.category
+          const seriesLabelFormatter = labelAttr.seriesLabelFormatter.find(d =>
+            d.chartShowName
+              ? d.chartShowName
+              : d.name === minItem._origin.category || d.chartShowName
+              ? d.chartShowName
+              : d.name === maxItem._origin.category
           )
           showExtremum = seriesLabelFormatter?.showExtremum
         } else {
@@ -248,8 +264,10 @@ export const createExtremumPoint = (chart, ev) => {
       let attr
       let showExtremum = false
       if (noChildrenFieldChart(chart) || yAxis.length > 1) {
-        const seriesLabelFormatter = labelAttr.seriesLabelFormatter.find(
-          d => d.name === pointObj._origin.category
+        const seriesLabelFormatter = labelAttr.seriesLabelFormatter.find(d =>
+          d.chartShowName
+            ? d.chartShowName === pointObj._origin.category
+            : d.name === pointObj._origin.category
         )
         showExtremum = seriesLabelFormatter?.showExtremum
         attr = seriesLabelFormatter