Browse Source

修改issues: sheet没有内容时会报错

sumile-ting 4 years ago
parent
commit
05d07d065e
2 changed files with 15 additions and 4 deletions
  1. 0 0
      js/dist/excel-preview.min.js
  2. 15 4
      js/src/excel-preview.js

File diff suppressed because it is too large
+ 0 - 0
js/dist/excel-preview.min.js


+ 15 - 4
js/src/excel-preview.js

@@ -107,7 +107,13 @@
     }
 
     function getTableData(sheet) {
-        const headers = []
+        const headers = [];
+        if(Object.keys(sheet).length == 0 || !sheet['!ref']) {
+            return {
+                columns: [],
+                data: []
+            }
+        }
         const range = XLSX.utils.decode_range(sheet['!ref'])
         let C
         const R = range.s.r /* start in the first row */
@@ -203,15 +209,20 @@
 
     function loadTabContent(sheetName, workbook, $table) {
         var worksheet = workbook.Sheets[sheetName];
+
         var tableConf = {
             height: defaults.height,
-            showHeader: false
+            showHeader: false,
+            classes: 'table table-bordered'
         };
         var tableData = getTableData(worksheet);
         $.extend(tableConf, tableData)
         $table.bootstrapTable(tableConf);
-        setStyles(worksheet, $table);
-        mergeCells(worksheet, $table);
+        if(Object.keys(worksheet).length > 0 && worksheet['!ref']) {
+            setStyles(worksheet, $table);
+            mergeCells(worksheet, $table);
+        }
+
     }
 
 

Some files were not shown because too many files changed in this diff