Merge branch 'main' of github.com:dataease/dataease into main

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -642,10 +642,14 @@ public class DataSetTableService {
         List<TableFiled> fields = new ArrayList<>();
         List<String[]> data = new ArrayList<>();
         List<Map<String, Object>> jsonArray = new ArrayList<>();
+        List<String> sheets = new ArrayList<>();
 
         if (StringUtils.equalsIgnoreCase(suffix, "xls")) {
             HSSFWorkbook workbook = new HSSFWorkbook(inputStream);
             HSSFSheet sheet0 = workbook.getSheetAt(0);
+            for (int i=0;i<workbook.getNumberOfSheets();i++){
+                sheets.add(workbook.getSheetAt(i).getSheetName());
+            }
             if (sheet0.getNumMergedRegions() > 0) {
                 throw new RuntimeException("Sheet have merged regions.");
             }
@@ -682,6 +686,9 @@ public class DataSetTableService {
         } else if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) {
             XSSFWorkbook xssfWorkbook = new XSSFWorkbook(inputStream);
             XSSFSheet sheet0 = xssfWorkbook.getSheetAt(0);
+            for (int i=0;i<xssfWorkbook.getNumberOfSheets();i++){
+                sheets.add(xssfWorkbook.getSheetAt(i).getSheetName());
+            }
             if (sheet0.getNumMergedRegions() > 0) {
                 throw new RuntimeException("Sheet have merged regions.");
             }
@@ -753,6 +760,7 @@ public class DataSetTableService {
         Map<String, Object> map = new HashMap<>();
         map.put("fields", fields);
         map.put("data", jsonArray);
+        map.put("sheets", sheets);
         return map;
     }
 

frontend/src/lang/en.js

@@ -673,6 +673,7 @@ export default {
     title_limit: 'Title cannot be greater than 50 characters'
   },
   dataset: {
+    sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
     datalist: 'Data Set',
     add_group: 'Add Group',
     add_scene: 'Add Scene',

frontend/src/lang/tw.js

@@ -672,6 +672,7 @@ export default {
     title_limit: '標題不能大於50個字符'
   },
   dataset: {
+    sheet_warn: '有多個sheet頁面，默認抽取第一個',
     datalist: '數據集',
     add_group: '添加分組',
     add_scene: '添加場景',

frontend/src/lang/zh.js

@@ -674,6 +674,7 @@ export default {
     title_limit: '标题不能大于50个字符'
   },
   dataset: {
+    sheet_warn: '有多个Sheet页，默认抽取第一个',
     datalist: '数据集',
     add_group: '添加分组',
     add_scene: '添加场景',

frontend/src/views/chart/view/ChartEdit.vue

@@ -14,7 +14,7 @@
       </el-popover>
       <span style="float: right;line-height: 40px;">
         <el-button size="mini" @click="closeEdit">
-          {{ $t('chart.close') }}
+          {{ $t('commons.save') }}
         </el-button>
         <!--        <el-button type="primary" size="mini" @click="save">-->
         <!--          {{ $t('chart.confirm') }}-->

frontend/src/views/dataset/add/AddExcel.vue

@@ -95,6 +95,7 @@ export default {
     return {
       name: '',
       fields: [],
+      sheets: [],
       data: [],
       mode: '1',
       height: 600,
@@ -139,11 +140,12 @@ export default {
       })
     },
     uploadSuccess(response, file, fileList) {
-      // console.log(response)
-      // console.log(file)
-      // console.log(fileList)
       this.path = response.data.path
       this.fields = response.data.fields
+      this.sheets = response.data.sheets
+      if (this.sheets.length > 1) {
+        this.$warning(this.$t('dataset.sheet_warn'))
+      }
       this.data = response.data.data
       const datas = this.data
       this.$refs.plxTable.reloadData(datas)