From 9116a86c7cedeeedefb02bafb4060efdae8689f0 Mon Sep 17 00:00:00 2001
From: riggzh <riggzh@live.com>
Date: Wed, 10 Jan 2018 16:26:47 +0800
Subject: [PATCH 1/2] Complex Table can't print

---
 src/extensions/print/bootstrap-table-print.js | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/extensions/print/bootstrap-table-print.js b/src/extensions/print/bootstrap-table-print.js
index 97a03f4989..aab0a7ffba 100644
--- a/src/extensions/print/bootstrap-table-print.js
+++ b/src/extensions/print/bootstrap-table-print.js
@@ -69,19 +69,34 @@
                         }
                     }
 
-                    function buildTable(data,columns) {
-                        var out = "<table><thead><tr>";
-                        for(var h = 0; h < columns.length; h++) {
-                            if(!columns[h].printIgnore) {
-                                out += ("<th>"+columns[h].title+"</th>");
+                    function buildTable(data, columnsArray) {
+                        var out = "<table><thead>";
+                        for(var k = 0; k < columnsArray.length; k++) {
+                            var columns = columnsArray[k];
+                            out += "<tr>";
+                            for(var h = 0; h < columns.length; h++) {
+                                if (!columns[h].printIgnore) {
+                                    out += "<th ";
+                                    if (columns[h].rowspan) {
+                                        out += (" rowspan='" + columns[h].rowspan + "'");
+                                    }
+                                    if (columns[h].colspan) {
+                                        out += (" colspan='" + columns[h].colspan + "'");
+                                    }
+                                    out += (">" + columns[h].title + "</>");
+                                }
                             }
+                            out += "</tr>";
                         }
-                        out += "</tr></thead><tbody>";
+                        out += "</thead><tbody>";
                         for(var i = 0; i < data.length; i++) {
                             out += "<tr>";
-                            for(var j = 0; j < columns.length; j++) {
-                                if(!columns[j].printIgnore) {
-                                    out += ("<td>"+ formatValue(data[i], i, columns[j])+"</td>");
+                            for(var l = 0; l < columnsArray.length; l++) {
+                                var columns = columnsArray[l];
+                                for(var j = 0; j < columns.length; j++) {
+                                    if (!columns[j].printIgnore && columns[j].field) {
+                                        out += ("<td>" + formatValue(data[i], i, columns[j]) + "</td>");
+                                    }
                                 }
                             }
                             out += "</tr>";
@@ -122,7 +137,7 @@
                     var doPrint = function (data) {
                         data=filterRows(data,getColumnFilters(that.options.columns));
                         data=sortRows(data,that.options.printSortColumn,that.options.printSortOrder);
-                        var table=buildTable(data,that.options.columns[0]);
+                        var table=buildTable(data,that.options.columns);
                         var newWin = window.open("");
                         newWin.document.write(that.options.printPageBuilder.call(this, table));
                         newWin.print();

From d49413f2f5e4c1144bb1b26d559e758475548721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E7=BF=BC?= <wenzhixin2010@gmail.com>
Date: Fri, 12 Jan 2018 23:55:24 +0800
Subject: [PATCH 2/2] Update bootstrap-table-print.js

---
 src/extensions/print/bootstrap-table-print.js | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/extensions/print/bootstrap-table-print.js b/src/extensions/print/bootstrap-table-print.js
index aab0a7ffba..881d9cba7a 100644
--- a/src/extensions/print/bootstrap-table-print.js
+++ b/src/extensions/print/bootstrap-table-print.js
@@ -70,39 +70,37 @@
                     }
 
                     function buildTable(data, columnsArray) {
-                        var out = "<table><thead>";
-                        for(var k = 0; k < columnsArray.length; k++) {
+                        var html = ['<table><thead>'];
+                        for (var k = 0; k < columnsArray.length; k++) {
                             var columns = columnsArray[k];
-                            out += "<tr>";
-                            for(var h = 0; h < columns.length; h++) {
+                            html.push('<tr>');
+                            for (var h = 0; h < columns.length; h++) {
                                 if (!columns[h].printIgnore) {
-                                    out += "<th ";
-                                    if (columns[h].rowspan) {
-                                        out += (" rowspan='" + columns[h].rowspan + "'");
-                                    }
-                                    if (columns[h].colspan) {
-                                        out += (" colspan='" + columns[h].colspan + "'");
-                                    }
-                                    out += (">" + columns[h].title + "</>");
+                                    html.push(
+                                        '<th',
+                                        sprintf(' rowspan="%s"', columns[h].rowspan),
+                                        sprintf(' colspan="%s"', columns[h].colspan),
+                                        sprintf('>%s</th>', columns[h].title)
+                                    );
                                 }
                             }
-                            out += "</tr>";
+                            html.push('</tr>');
                         }
-                        out += "</thead><tbody>";
-                        for(var i = 0; i < data.length; i++) {
-                            out += "<tr>";
+                        html.push('</thead><tbody>');
+                        for (var i = 0; i < data.length; i++) {
+                            html.push('<tr>');
                             for(var l = 0; l < columnsArray.length; l++) {
                                 var columns = columnsArray[l];
                                 for(var j = 0; j < columns.length; j++) {
                                     if (!columns[j].printIgnore && columns[j].field) {
-                                        out += ("<td>" + formatValue(data[i], i, columns[j]) + "</td>");
+                                        html.push('<td>', formatValue(data[i], i, columns[j]), '</td>');
                                     }
                                 }
                             }
-                            out += "</tr>";
+                            html.push('</tr>');
                         }
-                        out += "</tbody></table>";
-                        return out;
+                        html.push('</tbody></table>');
+                        return html.join('');
                     }
                     function sortRows(data,colName,sortOrder) {
                         if(!colName){