From 2500dc6f35c146c5b66b55f5a74b12caad13b763 Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 1 Nov 2023 18:07:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20antv=E6=95=A3=E7=82=B9=E5=9B=BE=E9=92=BB?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/doris/DorisQueryProvider.java | 2 +- .../engine/mysql/MysqlQueryProvider.java | 2 +- .../provider/query/ck/CKQueryProvider.java | 2 +- .../provider/query/db2/Db2QueryProvider.java | 2 +- .../provider/query/es/EsQueryProvider.java | 2 +- .../query/hive/HiveQueryProvider.java | 2 +- .../query/impala/ImpalaQueryProvider.java | 2 +- .../query/mongodb/MongoQueryProvider.java | 2 +- .../query/mysql/MysqlQueryProvider.java | 2 +- .../query/oracle/OracleQueryProvider.java | 2 +- .../provider/query/pg/PgQueryProvider.java | 2 +- .../query/redshift/RedshiftQueryProvider.java | 2 +- .../sqlserver/SqlserverQueryProvider.java | 2 +- .../service/chart/ChartViewService.java | 36 ++++++++++++++++--- .../service/chart/util/ChartDataBuild.java | 31 +++++++++++----- .../datasource/dm/query/DmQueryProvider.java | 2 +- .../kingbase/query/KingbaseQueryProvider.java | 2 +- .../kylin/query/KylinQueryProvider.java | 2 +- .../dm/query/MaxcomputeQueryProvider.java | 2 +- .../mongo/query/MongobiQueryProvider.java | 2 +- .../dm/query/PrestoQueryProvider.java | 2 +- 21 files changed, 72 insertions(+), 33 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index 929f45ff42..91d1229f9f 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -653,7 +653,7 @@ public class DorisQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java index bc425a04f8..d25126ecbf 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java @@ -602,7 +602,7 @@ public class MysqlQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index 653bc2b089..414539684c 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -633,7 +633,7 @@ public class CKQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java index 7750f94709..6394299e21 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java @@ -621,7 +621,7 @@ public class Db2QueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index be5c96eed9..db09106e94 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -627,7 +627,7 @@ public class EsQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index b677c0a701..efec86062f 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -586,7 +586,7 @@ public class HiveQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java index afb4867912..be73be8d1c 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java @@ -573,7 +573,7 @@ public class ImpalaQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index d8ad59fc31..8e4bac9bb8 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -557,7 +557,7 @@ public class MongoQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index f32a2ad515..7296b1a164 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -611,7 +611,7 @@ public class MysqlQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 201dd395a3..b384b29fe9 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -676,7 +676,7 @@ public class OracleQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index 4682f88323..3e1fd0a9f7 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -614,7 +614,7 @@ public class PgQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index b550a81485..564e2c40f0 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -621,7 +621,7 @@ public class RedshiftQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index ced343ad33..b3a24f8744 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -623,7 +623,7 @@ public class SqlserverQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { 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 8d5dd245c2..45dafde4cb 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 @@ -913,6 +913,9 @@ public class ChartViewService { ChartDrillRequest head = drillRequestList.get(0); Map dimValMap = new HashMap<>(); head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue())); + + boolean isAntVScatterNumberXAxis = CollectionUtils.isNotEmpty(xAxis) && StringUtils.equals(xAxis.get(0).getGroupType(), "q") && StringUtils.equalsIgnoreCase(view.getRender(), "antv"); + for (int i = 0; i < drillRequestList.size(); i++) { ChartDrillRequest request = drillRequestList.get(i); ChartViewFieldDTO chartViewFieldDTO = drill.get(i); @@ -924,14 +927,23 @@ public class ChartViewService { dimValMap.put(requestDimension.getId(), requestDimension.getValue()); if (!checkDrillExist(xAxis, extStack, requestDimension.getId(), view)) { chartFieldMap.put(chartViewFieldDTO.getId(), chartViewFieldDTO); - xAxis.add(chartViewFieldDTO); + + if (isAntVScatterNumberXAxis) { + extStack.add(chartViewFieldDTO); + } else { + xAxis.add(chartViewFieldDTO); + } } if (i == drillRequestList.size() - 1) { ChartViewFieldDTO nextDrillField = drill.get(i + 1); if (!checkDrillExist(xAxis, extStack, nextDrillField.getId(), view)) { // get drill list first element's sort,then assign to nextDrillField nextDrillField.setSort(getDrillSort(xAxis, drill.get(0))); - xAxis.add(nextDrillField); + if (isAntVScatterNumberXAxis) { + extStack.add(nextDrillField); + } else { + xAxis.add(nextDrillField); + } } } } @@ -1656,6 +1668,20 @@ public class ChartViewService { } private boolean checkDrillExist(List xAxis, List extStack, String fieldId, ChartViewWithBLOBs view) { + + if (CollectionUtils.isNotEmpty(xAxis)) { + //针对判断 antv 散点图 + if (StringUtils.equals(xAxis.get(0).getGroupType(), "q") && StringUtils.equalsIgnoreCase(view.getRender(), "antv")) { + if (CollectionUtils.isNotEmpty(extStack)) { + for (ChartViewFieldDTO x : extStack) { + if (StringUtils.equalsIgnoreCase(x.getId(), fieldId)) { + return true; + } + } + } + } + } + if (CollectionUtils.isNotEmpty(xAxis)) { for (ChartViewFieldDTO x : xAxis) { if (StringUtils.equalsIgnoreCase(x.getId(), fieldId)) { @@ -2129,7 +2155,7 @@ public class ChartViewService { JSONObject jsonObject = JSONObject.parseObject(senior); List list = new ArrayList<>(); JSONObject threshold = jsonObject.getJSONObject("threshold"); - if (ObjectUtils.isEmpty(threshold) || StringUtils.isBlank(threshold.toJSONString())){ + if (ObjectUtils.isEmpty(threshold) || StringUtils.isBlank(threshold.toJSONString())) { return list; } JSONArray tableThreshold = threshold.getJSONArray("tableThreshold"); @@ -2161,7 +2187,7 @@ public class ChartViewService { return list; } - private boolean solveThresholdCondition(ChartSeniorAssistDTO fieldDTO, String tableId){ + private boolean solveThresholdCondition(ChartSeniorAssistDTO fieldDTO, String tableId) { String fieldId = fieldDTO.getFieldId(); String summary = fieldDTO.getSummary(); if (StringUtils.isEmpty(fieldId) || StringUtils.isEmpty(summary)) { @@ -2177,7 +2203,7 @@ public class ChartViewService { return true; } - private List getConditionFields(ChartSeniorThresholdDTO condition){ + private List getConditionFields(ChartSeniorThresholdDTO condition) { List list = new ArrayList<>(); if (StringUtils.equalsIgnoreCase(condition.getField(), "0")) { return list; diff --git a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index 8733d39aed..906ee1e517 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -313,7 +313,7 @@ public class ChartDataBuild { String[] row = data.get(i1); StringBuilder a = new StringBuilder(); - if (isDrill) { + if (isDrill && !xIsNumber) { a.append(row[extGroupList.size() + xAxis.size() - 1]); } else { for (int i = extGroupList.size(); i < extGroupList.size() + xAxis.size(); i++) { @@ -329,7 +329,7 @@ public class ChartDataBuild { AxisChartDataAntVDTO axisChartDataDTO = new AxisChartDataAntVDTO(); if (xIsNumber) { - BigDecimal v = null; + Object v = a.toString(); try { v = new BigDecimal(a.toString()); } catch (Exception ignore) { @@ -345,11 +345,20 @@ public class ChartDataBuild { List dimensionList = new ArrayList<>(); List quotaList = new ArrayList<>(); - for (int j = 0; j < xAxis.size(); j++) { - ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); - chartDimensionDTO.setId(xAxis.get(j).getId()); - chartDimensionDTO.setValue(row[j]); - dimensionList.add(chartDimensionDTO); + if (xIsNumber && CollectionUtils.isNotEmpty(extGroupList)) { + for (int j = 0; j < extGroupList.size(); j++) { + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(extGroupList.get(j).getId()); + chartDimensionDTO.setValue(row[j]); + dimensionList.add(chartDimensionDTO); + } + } else { + for (int j = 0; j < xAxis.size(); j++) { + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(xAxis.get(j).getId()); + chartDimensionDTO.setValue(row[j]); + dimensionList.add(chartDimensionDTO); + } } axisChartDataDTO.setDimensionList(dimensionList); @@ -365,7 +374,11 @@ public class ChartDataBuild { } if (CollectionUtils.isNotEmpty(extGroup) && xIsNumber) { //有分组时其实就是第一个 - axisChartDataDTO.setCategory(row[0]); + if (isDrill) { + axisChartDataDTO.setCategory(row[extGroupList.size() - 1]); + } else { + axisChartDataDTO.setCategory(row[0]); + } } else { axisChartDataDTO.setCategory(yAxis.get(j).getName()); } @@ -988,7 +1001,7 @@ public class ChartDataBuild { } } if (xIsNumber && CollectionUtils.isNotEmpty(extStack)) { - fields.add(extStack.get(0)); + fields.addAll(extStack); } if (xIsNumber) { diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java index f8bdad6754..4c23f4491d 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java +++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java @@ -725,7 +725,7 @@ public class DmQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java index 5fed752ae8..95513e6017 100644 --- a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java +++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java @@ -747,7 +747,7 @@ public class KingbaseQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java index 7ad5ae0488..44d78aaa42 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java +++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java @@ -577,7 +577,7 @@ public class KylinQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java index 60d60390d0..6aa592ef0e 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java @@ -592,7 +592,7 @@ public class MaxcomputeQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java index eca34019e8..72f509d231 100644 --- a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java +++ b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java @@ -592,7 +592,7 @@ public class MongobiQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) { diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java index ab7f0421c9..0707691b2b 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java +++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java @@ -582,7 +582,7 @@ public class PrestoQueryProvider extends QueryProvider { //然后是数值格式的情况还需要传extGroup if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) { - xAxisList.add(extGroup.get(0)); + xAxisList.addAll(extGroup); } if (CollectionUtils.isNotEmpty(xAxisList)) {