From c9527c6aee3fa93dfd26cddca9ceac5fb1528744 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 30 Oct 2023 14:26:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20echarts=E5=9C=B0=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E5=8A=9F=E8=83=BD=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 61f575449c..fd3b3a82af 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 @@ -604,7 +604,7 @@ public class ChartViewService { List viewFields = gson.fromJson(view.getViewFields(), tokenType); final Map> extFieldsMap = new LinkedHashMap<>(); if (CollectionUtils.isNotEmpty(viewFields)) { - String[] busiFlagArray = new String[] {"daxis", "locationXaxis", "locationYaxis"}; + String[] busiFlagArray = new String[]{"daxis", "locationXaxis", "locationYaxis"}; Map flagMap = new HashMap<>(); for (String s : busiFlagArray) { flagMap.put(s, false); @@ -1069,7 +1069,10 @@ public class ChartViewService { if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) { detailFieldList.addAll(xAxis); detailFieldList.addAll(viewFields); + String resultMode = view.getResultMode(); + view.setResultMode(null); detailFieldSql = qp.getSQLWithPage(true, dataTableInfoDTO.getTable(), detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo); + view.setResultMode(resultMode); } } } else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.SQL.name())) { @@ -1089,7 +1092,10 @@ public class ChartViewService { if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) { detailFieldList.addAll(xAxis); detailFieldList.addAll(viewFields); + String resultMode = view.getResultMode(); + view.setResultMode(null); detailFieldSql = qp.getSQLWithPage(false, sql, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo); + view.setResultMode(resultMode); } } } else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.CUSTOM.name())) { @@ -1110,7 +1116,10 @@ public class ChartViewService { if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) { detailFieldList.addAll(xAxis); detailFieldList.addAll(viewFields); + String resultMode = view.getResultMode(); + view.setResultMode(null); detailFieldSql = qp.getSQLWithPage(false, sql, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo); + view.setResultMode(resultMode); } } } else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.UNION.name())) { @@ -1131,7 +1140,10 @@ public class ChartViewService { if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) { detailFieldList.addAll(xAxis); detailFieldList.addAll(viewFields); + String resultMode = view.getResultMode(); + view.setResultMode(null); detailFieldSql = qp.getSQLWithPage(false, sql, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo); + view.setResultMode(resultMode); } } } @@ -1182,7 +1194,10 @@ public class ChartViewService { if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) { detailFieldList.addAll(xAxis); detailFieldList.addAll(viewFields); + String resultMode = view.getResultMode(); + view.setResultMode(null); detailFieldSql = qp.getSQLTableInfo(tableName, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view); + view.setResultMode(resultMode); } } if (CollectionUtils.isNotEmpty(assistFields)) {