fix: 增加excel字段重复错误提示

dataease · Jun 30, 2021 · f30b86a · f30b86a
1 parent 81e7d61
commit f30b86a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 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
@@ -946,6 +946,12 @@ private Map<String, Object> parseExcel(String filename, InputStream inputStream,
         }
 
         String[] fieldArray = fields.stream().map(TableFiled::getFieldName).toArray(String[]::new);
+
+        // 校验excel字段是否重名
+        if (checkIsRepeat(fieldArray)) {
+            DataEaseException.throwException(Translator.get("i18n_excel_field_repeat"));
+        }
+
         if (CollectionUtils.isNotEmpty(data)) {
             jsonArray = data.stream().map(ele -> {
                 Map<String, Object> map = new HashMap<>();
@@ -1087,4 +1093,19 @@ public void updateDatasetTableStatus() {
 
         }
     }
+
+    /*
+     * 判断数组中是否有重复的值
+     */
+    public static boolean checkIsRepeat(String[] array) {
+        HashSet<String> hashSet = new HashSet<String>();
+        for (int i = 0; i < array.length; i++) {
+            hashSet.add(array[i]);
+        }
+        if (hashSet.size() == array.length) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
@@ -132,6 +132,14 @@ export default {
       this.uploading = true
     },
     uploadFail(response, file, fileList) {
+      this.path = ''
+      this.fields = []
+      this.sheets = []
+      this.data = []
+      const datas = this.data
+      this.$refs.plxTable.reloadData(datas)
+      this.name = ''
+      this.fileList = []
       this.uploading = false
       this.$message({
         type: 'error',