Merge pull request rusty1s#2 from GarikFF/rowspan-fix

Rowspan fix
funnywwh · Dec 10, 2016 · 30631d8 · 30631d8
2 parents d8f1044 + a139faf
commit 30631d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/dist/table2excel.js b/dist/table2excel.js
diff --git a/src/helpers/data-to-worksheet.js b/src/helpers/data-to-worksheet.js
@@ -27,7 +27,11 @@ export default function dataToWorksheet(data, typeHandlers) {
       });
 
       // only save actual cells and convert them to XLSX-Cell objects
-      if (cell) sheet[ref] = cellToObject(cell, typeHandlers);
+      if (cell) {
+        sheet[ref] = cellToObject(cell, typeHandlers);
+      } else {
+          sheet[ref] =  { t: 's', v: '' };
+      }
     });
 
     return sheet;

diff --git a/src/helpers/table-to-data.js b/src/helpers/table-to-data.js
@@ -31,7 +31,7 @@ export default function tableToData(table) {
             cells[rowIndex].length <= range.e.c
           ) {
             // ... fill the cells with empty values
-            for (let i = range.s.c; i < range.e.c; i++) {
+            for (let i = range.s.c; i <= range.e.c; i++) {
               cells[rowIndex].push(null);
             }
           }