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 b56a970928..e7a774bcb1 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 @@ -274,7 +274,6 @@ public class ChartDataServer implements ChartDataApi { } else { setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null); } - setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null); } else { for (int i = 0; i < request.getMultiInfo().size(); i++) { ChartExcelRequestInner requestInner = request.getMultiInfo().get(i); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java index 229d66f2e2..9231adcc0f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java @@ -4,6 +4,7 @@ package io.dataease.datasource.provider; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.metadata.ReadSheet; @@ -564,7 +565,13 @@ public class ExcelUtils { super.invokeHead(headMap, context); for (Integer key : headMap.keySet()) { ReadCellData cellData = headMap.get(key); - String value = cellData.getStringValue(); + String value = null; + if (cellData.getType().equals(CellDataTypeEnum.STRING)) { + value = cellData.getStringValue(); + } + if (cellData.getType().equals(CellDataTypeEnum.NUMBER)) { + value = cellData.getNumberValue().toString(); + } if (StringUtils.isEmpty(value)) { continue; } diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue index 704f513503..73ac6017ce 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue @@ -315,18 +315,7 @@ const handleShowFinishPage = ({ id, name, pid }) => { emitter.on('showFinishPage', handleShowFinishPage) const prev = () => { - if (activeApiStep.value === 1) { - ElMessageBox.confirm(t('data_source.the_previous_step'), { - confirmButtonType: 'primary', - type: 'warning', - autofocus: false, - showClose: false - }).then(() => { - prevConfirm() - }) - } else { - prevConfirm() - } + prevConfirm() } const prevConfirm = () => {