Pr@dev v2@fixds (#15318)

* fix:[Bug]汇总表分享的公共链接下载成Excel打开乱码 #15254

* fix:修复excel 表头支持数值

---------

Co-authored-by: taojinlong <jinlong@fit2cloud.com>
This commit is contained in:
taojinlong
2025-03-12 16:28:34 +08:00
committed by GitHub
parent eb2836ddde
commit a462964791
3 changed files with 9 additions and 14 deletions

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -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 = () => {