From 41deddbbfaed1e8bcf75fc1ff0314402f1431acb Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 18 May 2021 17:28:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20excel=20=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 19 +++++++++++-------- frontend/src/main.js | 1 - 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 2b30b0ae43..7407fcc0c7 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -661,13 +661,15 @@ public class DataSetTableService { for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) { if (i == 0) { TableFiled tableFiled = new TableFiled(); - tableFiled.setFieldName(readCell(row.getCell(j))); - tableFiled.setRemarks(readCell(row.getCell(j))); tableFiled.setFieldType("TEXT"); tableFiled.setFieldSize(1024); - if(StringUtils.isEmpty(tableFiled.getFieldName())){ - continue; + String columnName = readCell(row.getCell(j)); + if(StringUtils.isEmpty(columnName)){ + columnName = "NONE_" + String.valueOf(j); } + tableFiled.setFieldName(columnName); + tableFiled.setRemarks(columnName); + fields.add(tableFiled); } else { r[j] = readCell(row.getCell(j)); @@ -695,13 +697,14 @@ public class DataSetTableService { for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) { if (i == 0) { TableFiled tableFiled = new TableFiled(); - tableFiled.setFieldName(readCell(row.getCell(j))); - tableFiled.setRemarks(readCell(row.getCell(j))); tableFiled.setFieldType("TEXT"); tableFiled.setFieldSize(1024); - if(StringUtils.isEmpty(tableFiled.getFieldName())){ - continue; + String columnName = readCell(row.getCell(j)); + if(StringUtils.isEmpty(columnName)){ + columnName = "NONE_" + String.valueOf(j); } + tableFiled.setFieldName(columnName); + tableFiled.setRemarks(columnName); fields.add(tableFiled); } else { r[j] = readCell(row.getCell(j)); diff --git a/frontend/src/main.js b/frontend/src/main.js index 71e30297a4..02d94c008c 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -67,7 +67,6 @@ Vue.use(message) Vue.config.productionTip = false Vue.prototype.hasDataPermission = function(pTarget, pSource) { - debugger if (pSource && pTarget) { return pSource.indexOf(pTarget) > -1 }