From 73a5de77156e33124dd29fb98e4dee9e0a7434f6 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 17 Nov 2025 16:17:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[Bug]=E4=BF=AE=E5=A4=8D=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=B8=8E=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E4=B8=8D=E7=AC=A6=20#17349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/charts/impl/table/TableInfoHandler.java | 2 +- .../src/main/java/io/dataease/chart/server/ChartDataServer.java | 1 + .../main/java/io/dataease/extensions/view/dto/ChartViewDTO.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 7da483efc8..42572dfa06 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 @@ -93,7 +93,7 @@ public class TableInfoHandler extends DefaultChartHandler { pageInfo.setPageSize(chartExtRequest.getPageSize()); } Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage); - if (view.getIsExcelExport()) { + if (view.getExportDatasetOriginData()) { for (int i = 0; i < xAxis.size(); i++) { ChartViewFieldDTO fieldDTO = null; for (ChartViewFieldDTO allField : allFields) { diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 91c444c803..ab2f8c7421 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -108,6 +108,7 @@ public class ChartDataServer implements ChartDataApi { Integer[] dsTypes = null; //downloadType = dataset 为下载原始名字 这里做数据转换模拟 table-info类型图表导出 if ("dataset".equals(request.getDownloadType())) { + viewDTO.setExportDatasetOriginData(true); viewDTO.setResultMode(ChartConstants.VIEW_RESULT_MODE.ALL); viewDTO.setType("table-info"); viewDTO.setRender("antv"); diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java index abf77a281b..93ce47c259 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java @@ -29,6 +29,7 @@ public class ChartViewDTO extends ChartViewBaseDTO { private ChartExtRequest chartExtRequest; private Boolean isExcelExport = false; + private Boolean exportDatasetOriginData = false; private boolean cache; /** * 原始数据集表ID