From 76385f3c7eb2ecd5689ccf5d00f0670660b93a33 Mon Sep 17 00:00:00 2001
From: wisonic-s <51065359+wisonic-s@users.noreply.github.com>
Date: Fri, 30 May 2025 11:23:17 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=86=85=E5=AD=98=E5=8D=A0=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/charts/impl/table/TableInfoHandler.java     |  5 +++++
 .../chart/charts/impl/table/TableNormalHandler.java   | 10 ++++++----
 .../chart/charts/impl/table/TablePivotHandler.java    | 11 +++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java
index 36aee48689..7da483efc8 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java
@@ -66,6 +66,11 @@ public class TableInfoHandler extends DefaultChartHandler {
         return (T) new CustomFilterResult(filterList, formatResult.getContext());
     }
 
+    @Override
+    public Map<String, Object> buildResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, List<String[]> data) {
+        return new HashMap<>();
+    }
+
     @Override
     public <T extends ChartCalcDataResult> T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map<String, Object> sqlMap, SQLMeta sqlMeta, Provider provider) {
         var chartExtRequest = view.getChartExtRequest();
diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
index 88723e18b5..22bdc2fed3 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
@@ -23,10 +23,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author jianneng
@@ -77,6 +74,11 @@ public class TableNormalHandler extends DefaultChartHandler {
         return (T) new CustomFilterResult(filterList, formatResult.getContext());
     }
 
+    @Override
+    public Map<String, Object> buildResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, List<String[]> data) {
+        return new HashMap<>();
+    }
+
     @Override
     public <T extends ChartCalcDataResult> T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map<String, Object> sqlMap, SQLMeta sqlMeta, Provider provider) {
         var chartExtRequest = view.getChartExtRequest();
diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
index 11cf829f14..88b5e9cd9e 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
@@ -76,6 +76,17 @@ public class TablePivotHandler extends GroupChartHandler {
         return result;
     }
 
+    @Override
+    public Map<String, Object> buildResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, List<String[]> data) {
+        var result = new HashMap<String, Object>();
+        var yoyFiltered = filterResult.getContext().get("yoyFiltered") != null;
+        // 带过滤同环比直接返回原始数据,再由视图重新组装
+        if (yoyFiltered) {
+            result.put("data", data);
+        }
+        return result;
+    }
+
     private Map<String, Object> calcCustomExpr(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map<String, Object> sqlMap, SQLMeta sqlMeta, Provider provider) {
         Object totalStr = JsonUtil.toJSONString(view.getCustomAttr().get("tableTotal"));
         TableTotal tableTotal = JsonUtil.parseObject((String) totalStr, TableTotal.class);