Partially fixed issue #41: colspan support for PDF format

hhurz · Oct 30, 2015 · 305f5b5 · 305f5b5
1 parent 4de4a99
commit 305f5b5
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 34 deletions.
diff --git a/tableExport.js b/tableExport.js
@@ -583,9 +583,18 @@
               }
             }
 
+            if (typeof atOptions.drawHeaderCell !== 'function') {
+              atOptions.drawHeaderCell = function (cell, data) {
+                var col = teOptions.columns [data.column.dataKey];
+
+                // return false, when cell is hidden (colspan)
+                return (col.style.hasOwnProperty("hidden") != true || col.style.hidden !== true);
+              }
+            }
+
             if (typeof atOptions.drawCell !== 'function') {
               atOptions.drawCell = function (cell, data) {
-
+                // colspan handling
                 var rowopt = teOptions.rowoptions [data.row.index + ":" + data.column.dataKey];
                 var cs = 0;
 
@@ -602,17 +611,18 @@
                     cellWidth += column.width;
                   }
 
-                  cell.width = cellWidth;
-
                   if ( cs > 1 ) {
                     if ( cell.styles.halign === 'right' )
                       textPosX = cell.textPos.x + cellWidth - cell.width;
                     else if ( cell.styles.halign === 'center' )
                       textPosX = cell.textPos.x + (cellWidth - cell.width) / 2;
                   }
 
+                  cell.width = cellWidth;
                   cell.textPos.x = textPosX;
                 }
+                else
+                  return false; // cell is hidden (colspan = -1)
               }
             }