From a4b2ec825019014cb122fa54e462b1798784a99a Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 25 Nov 2022 16:50:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9B=B4?= =?UTF-8?q?=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java | 2 +- .../main/java/io/dataease/service/chart/ChartViewService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java index cee2bb0bf8..635da3b188 100644 --- a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java +++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java @@ -45,5 +45,5 @@ public class ChartViewDTO extends ChartViewWithBLOBs { private long totalPage; private long totalItems; private int datasetMode; - private String datasetType; + private String datasourceType; } diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 94cf5c9cfb..884566c6eb 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -302,7 +302,8 @@ public class ChartViewService { DatasetTable datasetTable = dataSetTableService.get(view.getTableId()); if (ObjectUtils.isNotEmpty(datasetTable)) { view.setDatasetMode(datasetTable.getMode()); - view.setDatasetType(datasetTable.getType()); + Datasource datasource = datasourceService.get(datasetTable.getDataSourceId()); + view.setDatasourceType(datasource != null ? datasource.getType() : null); } // 如果是从仪表板获取视图数据，则仪表板的查询模式，查询结果的数量，覆盖视图对应的属性 if (CommonConstants.VIEW_RESULT_MODE.CUSTOM.equals(request.getResultMode())) {