From d0db747cae647a5d7f8c2f3e801bef7d6838e1eb Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Sat, 28 Dec 2024 11:13:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=83=AD=E5=8A=9B=E5=9B=BE=E5=A4=9A=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8E=92=E5=BA=8F=E5=AF=BC=E8=87=B4=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charts/impl/table/TableHeatmapHandler.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java index 53bdbf42b0..4ca16e7b01 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java @@ -14,7 +14,6 @@ import io.dataease.extensions.view.dto.*; import io.dataease.extensions.view.util.ChartDataUtil; import io.dataease.extensions.view.util.FieldUtil; import lombok.Getter; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -33,8 +32,10 @@ public class TableHeatmapHandler extends DefaultChartHandler { var result = super.formatAxis(view); var xAxis = new ArrayList(view.getXAxis()); xAxis.addAll(view.getXAxisExt()); - xAxis.addAll(view.getExtColor()); + var yAxis = new ArrayList(view.getYAxis()); + yAxis.addAll(view.getExtColor()); result.getAxisMap().put(ChartAxis.xAxis, xAxis); + result.getAxisMap().put(ChartAxis.yAxis, yAxis); return result; } @@ -57,17 +58,9 @@ public class TableHeatmapHandler extends DefaultChartHandler { datasourceRequest.setDsList(dsMap); var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis); var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis); - var extColorAxis = view.getExtColor(); - List yFields = new ArrayList<>(); - if(!extColorAxis.isEmpty() && extColorAxis.getFirst().getId()==-1){ - yFields.addAll(chartViewManege.transFieldDTO(Collections.singletonList(chartViewManege.createCountField(view.getTableId())))); - yAxis.addAll(yFields); - xAxis = xAxis.stream().filter(i-> !StringUtils.equalsIgnoreCase(i.getDataeaseName(),yAxis.get(0).getDataeaseName())).toList(); - } var allFields = (List) filterResult.getContext().get("allFields"); Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage); Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage); - yAxis.clear(); String querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view); querySql = provider.rebuildSQL(querySql, sqlMeta, crossDs, dsMap); datasourceRequest.setQuery(querySql);