From 006668ffa47282e4f5fc975d912880509850e9d1 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 1 Nov 2023 16:11:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20antv=E6=95=A3=E7=82=B9=E5=9B=BE=E6=A8=AA?=
 =?UTF-8?q?=E8=BD=B4=E4=B8=BA=E6=8C=87=E6=A0=87=E6=97=B6=EF=BC=8C=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E8=AE=A1=E7=AE=97=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/chart/ChartViewService.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 3c7fbf7061..8d5dd245c2 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -1250,8 +1250,15 @@ public class ChartViewService {
         // 同比/环比计算，通过对比类型和数据设置，计算出对应指标的结果，然后替换结果data数组中的对应元素
         // 如果因维度变化（如时间字段缺失，时间字段的展示格式变化）导致无法计算结果的，则结果data数组中的对应元素全置为null
         // 根据不同图表类型，获得需要替换的指标index array
-        for (int i = 0; i < yAxis.size(); i++) {
-            ChartViewFieldDTO chartViewFieldDTO = yAxis.get(i);
+        List<ChartViewFieldDTO> tempYAxis = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(xAxis) && StringUtils.equals(xAxis.get(0).getGroupType(), "q") && StringUtils.equalsIgnoreCase(view.getRender(), "antv")) {
+            //针对散点图scatter处理
+            tempYAxis.add(xAxis.get(0));
+        }
+        tempYAxis.addAll(yAxis);
+
+        for (int i = 0; i < tempYAxis.size(); i++) {
+            ChartViewFieldDTO chartViewFieldDTO = tempYAxis.get(i);
             ChartFieldCompareDTO compareCalc = chartViewFieldDTO.getCompareCalc();
             if (ObjectUtils.isEmpty(compareCalc)) {
                 continue;