dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5731 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
fit2cloudrd 2023-07-21 11:02:50 +08:00 committed by GitHub
commit fc026e17cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2425,56 +2425,6 @@ public class DataSetTableService {
return excelFileData;
}
// public List<ExcelSheetData> parseExcel(String filename, InputStream inputStream, boolean isPreview) throws Exception {
// List<ExcelSheetData> excelSheetDataList = new ArrayList<>();
// try {
// String suffix = filename.substring(filename.lastIndexOf(".") + 1);
// if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) {
//
// }
//
// if (StringUtils.equalsIgnoreCase(suffix, "csv")) {
// List<TableField> fields = new ArrayList<>();
// BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
// String s = reader.readLine();// first line
// String[] split = s.split(",");
// for (String s1 : split) {
// TableField tableFiled = new TableField();
// tableFiled.setName(s1);
// tableFiled.setOriginName(s1);
// tableFiled.setFieldType("TEXT");
// fields.add(tableFiled);
// }
// List<String[]> data = csvData(reader, isPreview);
// ExcelSheetData excelSheetData = new ExcelSheetData();
// String[] fieldArray = fields.stream().map(TableField::getName).toArray(String[]::new);
// excelSheetData.setFields(fields);
// excelSheetData.setData(data);
// excelSheetData.setExcelLabel(filename.substring(0, filename.lastIndexOf('.')));
// excelSheetDataList.add(excelSheetData);
// }
// inputStream.close();
// for (ExcelSheetData excelSheetData : excelSheetDataList) {
// List<String[]> data = excelSheetData.getData();
// String[] fieldArray = excelSheetData.getFields().stream().map(TableField::getName).toArray(String[]::new);
//
// List<Map<String, Object>> jsonArray = new ArrayList<>();
// if (data != null) {
// jsonArray = data.stream().map(ele -> {
// Map<String, Object> map = new HashMap<>();
// for (int i = 0; i < fieldArray.length; i++) {
// map.put(fieldArray[i], i < ele.length ? ele[i] : "");
// }
// return map;
// }).collect(Collectors.toList());
// }
// excelSheetData.setJsonArray(jsonArray);
// };
// } catch (Exception e) {
// DEException.throwException(e);
// }
// return excelSheetDataList;
// }
public List<ExcelSheetData> excelSheetDataList(InputStream inputStream, boolean isPreview) {
List<ExcelSheetData> excelSheetDataList = new ArrayList<>();
NoModelDataListener noModelDataListener = new NoModelDataListener();

4
frontend/src/components/asyncComponent/index.vue
View File

@ -54,15 +54,13 @@ export default {
// window.SyncComponentCache[this.url] = Axios.get(this.url)
res = await window.SyncComponentCache[this.url]
} else {
this.mode = await window.SyncComponentCache[this.url]
return
res = await window.SyncComponentCache[this.url]
}
if (res) {
const Fn = Function
const dynamicCode = res.data || res
const component = new Fn(`return ${dynamicCode}`)()
this.mode = component.default || component
window.SyncComponentCache[this.url] = this.mode
}
}
}