public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 19:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-v2' into pr@dev-v2@fixds

Browse Source
This commit is contained in:
taojinlong
2024-12-02 17:14:01 +08:00
parent e7ad98c3fc 822de6f2b8
commit 2d63cfd889
5 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
View File

@@ -486,6 +486,7 @@ public class ExcelUtils {
tableFiled.setName(filedName);
tableFiled.setOriginName(filedName);
tableFiled.setFieldType(null);
tableFiled.setChecked(true);
fields.add(tableFiled);
}

8
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@@ -810,19 +810,11 @@ public class DatasourceServer implements DatasourceApi {
datasourceRequest.setDatasource(transDTO(coreDatasource));
List<DatasetTableDTO> datasetTableDTOS = ExcelUtils.getTables(datasourceRequest);
for (ExcelSheetData sheet : excelFileData.getSheets()) {
boolean find = false;
for (DatasetTableDTO datasetTableDTO : datasetTableDTOS) {
if (excelDataTableName(datasetTableDTO.getTableName()).equals(sheet.getTableName()) || isCsv(file.getOriginalFilename())) {
find = true;
sheet.setDeTableName(datasetTableDTO.getTableName());
datasourceRequest.setTable(datasetTableDTO.getTableName());
List<TableField> oldTableFields = ExcelUtils.getTableFields(datasourceRequest);
mergeFields(oldTableFields, sheet.getFields());
}
}
if (!find) {
sheet.setNewSheet(true);
}
}
}
}