From 53bf246e1f4f466d82e47c5130336d088e65117f Mon Sep 17 00:00:00 2001
From: zhixin <wenzhixin2010@gmail.com>
Date: Sat, 27 Jun 2015 09:48:19 +0800
Subject: [PATCH 1/3] Fix #336: supported complex header with rowspans and
 colspans.

---
 src/bootstrap-table.css                       |   7 +-
 src/bootstrap-table.js                        | 332 +++++++++++-------
 .../cookie/bootstrap-table-cookie.js          |   4 +-
 .../editable/bootstrap-table-editable.js      |   4 +-
 .../bootstrap-table-filter-control.js         |   6 +-
 .../filter/bootstrap-table-filter.js          |   2 +-
 .../bootstrap-table-multiple-sort.js          |   2 +-
 .../bootstrap-table-reorder-columns.js        |  12 +-
 .../toolbar/bootstrap-table-toolbar.js        |   2 +-
 9 files changed, 227 insertions(+), 144 deletions(-)

diff --git a/src/bootstrap-table.css b/src/bootstrap-table.css
index 4eb7c8620c..aefd770f62 100644
--- a/src/bootstrap-table.css
+++ b/src/bootstrap-table.css
@@ -40,17 +40,12 @@
 
 .fixed-table-footer,
 .fixed-table-header {
-    height: 37px; /*cellHeight*/
     overflow: hidden;
     border-radius: 4px 4px 0 0;
     -webkit-border-radius: 4px 4px 0 0;
     -moz-border-radius: 4px 4px 0 0;
 }
 
-.fixed-table-header {
-    border-bottom: 1px solid #dddddd;
-}
-
 .fixed-table-footer {
     border-top: 1px solid #dddddd;
 }
@@ -265,7 +260,7 @@
 
 .bootstrap-table .table > thead > tr > th {
     vertical-align: bottom;
-    border-bottom: 2px solid #ddd;
+    border-bottom: 1px solid #ddd;
 }
 
 /* support bootstrap 3 */
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
index 9027d71cb5..50c01af8b4 100644
--- a/src/bootstrap-table.js
+++ b/src/bootstrap-table.js
@@ -10,8 +10,7 @@
     // TOOLS DEFINITION
     // ======================
 
-    var cellHeight = 37, // update css if changed
-        cachedWidth = null;
+    var cachedWidth = null;
 
     // it only does '%s', and return '' when arguments are undefined
     var sprintf = function (str) {
@@ -56,6 +55,48 @@
         return index;
     };
 
+    // http://jsfiddle.net/wenyi/47nz7ez9/3/
+    var setFieldIndex = function (columns) {
+        var i, j, k,
+            totalCol = 0,
+            flag = [];
+
+        for (i = 0; i < columns[0].length; i++) {
+            totalCol += columns[0][i].colspan || 1;
+        }
+
+        for (i = 0; i < columns.length; i++) {
+            flag[i] = [];
+            for (j = 0; j < totalCol; j++) {
+                flag[i][j] = false;
+            }
+        }
+
+        for (i = 0; i < columns.length; i++) {
+            for (j = 0; j < columns[i].length; j++) {
+                var r = columns[i][j],
+                    rowspan = r.rowspan || 1,
+                    colspan = r.colspan　|| 1,
+                    index = $.inArray(false, flag[i]);
+
+                if (colspan === 1) {
+                    r.fieldIndex = index;
+                    // when field is undefined, use index instead
+                    if (typeof r.field === 'undefined') {
+                        r.field = index;
+                    }
+                }
+
+                for (k = 0; k < rowspan; k++) {
+                    flag[i + k][index] = true;
+                }
+                for (k = 0; k < colspan; k++) {
+                    flag[i][index + k] = true;
+                }
+            }
+        }
+    }
+
     var getScrollBarWidth = function () {
         if (cachedWidth === null) {
             var inner = $('<p/>').addClass('fixed-table-scroll-inner'),
@@ -191,7 +232,7 @@
         sortName: undefined,
         sortOrder: 'asc',
         striped: false,
-        columns: [],
+        columns: [[]],
         data: [],
         method: 'get',
         url: undefined,
@@ -522,23 +563,37 @@
         if (!this.$header.length) {
             this.$header = $('<thead></thead>').appendTo(this.$el);
         }
-        if (!this.$header.find('tr').length) {
-            this.$header.append('<tr></tr>');
-        }
-        this.$header.find('th').each(function () {
-            var column = $.extend({}, {
-                title: $(this).html(),
-                'class': $(this).attr('class'),
-                titleTooltip: $(this).attr('title')
-            }, $(this).data());
-
+        this.$header.find('tr').each(function () {
+            var column = [];
+
+            $(this).find('th').each(function () {
+                column.push($.extend({}, {
+                    title: $(this).html(),
+                    'class': $(this).attr('class'),
+                    titleTooltip: $(this).attr('title'),
+                    rowspan: $(this).attr('rowspan') ? +$(this).attr('rowspan') : undefined,
+                    colspan: $(this).attr('colspan') ? +$(this).attr('colspan') : undefined
+                }, $(this).data()));
+            });
             columns.push(column);
         });
+        if (!$.isArray(this.options.columns[0])) {
+            this.options.columns = [this.options.columns];
+        }
         this.options.columns = $.extend(true, [], columns, this.options.columns);
-        $.each(this.options.columns, function (i, column) {
-            that.options.columns[i] = $.extend({}, BootstrapTable.COLUMN_DEFAULTS, {
-                field: i
-            }, column); // when field is undefined, use index instead
+        this.columns = [];
+
+        setFieldIndex(this.options.columns);
+        $.each(this.options.columns, function (i, columns) {
+            $.each(columns, function (j, column) {
+                column = $.extend({}, BootstrapTable.COLUMN_DEFAULTS, column);
+
+                if (typeof column.fieldIndex !== 'undefined') {
+                    that.columns[column.fieldIndex] = column;
+                }
+
+                that.options.columns[i][j] = column;
+            });
         });
 
         // if options.data is setting, do not process tbody data
@@ -555,7 +610,7 @@
             row._data = getRealDataAttr($(this).data());
 
             $(this).find('td').each(function (i) {
-                var field = that.options.columns[i].field;
+                var field = that.columns[i].field;
 
                 row[field] = $(this).html();
                 // save td's id, class and data-* attributes
@@ -572,7 +627,7 @@
 
     BootstrapTable.prototype.initHeader = function () {
         var that = this,
-            visibleColumns = [],
+            visibleColumns = {},
             html = [];
 
         this.header = {
@@ -588,92 +643,102 @@
             searchables: []
         };
 
-        if (!this.options.cardView && this.options.detailView) {
-            html.push('<th class="detail"><div class="fht-cell"></div></th>');
-            visibleColumns.push({});
-        }
+        $.each(this.options.columns, function (i, columns) {
+            html.push('<tr>');
 
-        $.each(this.options.columns, function (i, column) {
-            var text = '',
-                halign = '', // header align style
-                align = '', // body align style
-                style = '',
-                class_ = sprintf(' class="%s"', column['class']),
-                order = that.options.sortOrder || column.order,
-                unitWidth = 'px',
-                width = column.width;
-
-            if (column.width !== undefined && (!that.options.cardView)) {
-                if (typeof column.width === 'string') {
-                    if (column.width.indexOf('%') !== -1) {
-                        unitWidth = '%';
-                    }
-                }
-            }
-            if (column.width && typeof column.width === 'string') {
-                width = column.width.replace('%', '').replace('px', '');
+            if (i == 0 && !that.options.cardView && that.options.detailView) {
+                html.push(sprintf('<th class="detail" rowspan="%s"><div class="fht-cell"></div></th>',
+                    that.options.columns.length));
             }
 
-            halign = sprintf('text-align: %s; ', column.halign ? column.halign : column.align);
-            align = sprintf('text-align: %s; ', column.align);
-            style = sprintf('vertical-align: %s; ', column.valign);
-            style += sprintf('width: %s%s; ', column.checkbox || column.radio ? 36 : width, unitWidth);
-
-            that.header.fields.push(column.field);
-            that.header.styles.push(align + style);
-            that.header.classes.push(class_);
-            that.header.formatters.push(column.formatter);
-            that.header.events.push(column.events);
-            that.header.sorters.push(column.sorter);
-            that.header.sortNames.push(column.sortName);
-            that.header.cellStyles.push(column.cellStyle);
-            that.header.clickToSelects.push(column.clickToSelect);
-            that.header.searchables.push(column.searchable);
+            $.each(columns, function (j, column) {
+                var text = '',
+                    halign = '', // header align style
+                    align = '', // body align style
+                    style = '',
+                    class_ = sprintf(' class="%s"', column['class']),
+                    order = that.options.sortOrder || column.order,
+                    unitWidth = 'px',
+                    width = column.width;
+
+                if (column.width !== undefined && (!that.options.cardView)) {
+                    if (typeof column.width === 'string') {
+                        if (column.width.indexOf('%') !== -1) {
+                            unitWidth = '%';
+                        }
+                    }
+                }
+                if (column.width && typeof column.width === 'string') {
+                    width = column.width.replace('%', '').replace('px', '');
+                }
 
-            if (!column.visible) {
-                return;
-            }
+                halign = sprintf('text-align: %s; ', column.halign ? column.halign : column.align);
+                align = sprintf('text-align: %s; ', column.align);
+                style = sprintf('vertical-align: %s; ', column.valign);
+                style += sprintf('width: %s%s; ', column.checkbox || column.radio ? 36 : width, unitWidth);
+
+                if (typeof column.fieldIndex !== 'undefined') {
+                    that.header.fields[column.fieldIndex] = column.field;
+                    that.header.styles[column.fieldIndex] = align + style;
+                    that.header.classes[column.fieldIndex] = class_;
+                    that.header.formatters[column.fieldIndex] = column.formatter;
+                    that.header.events[column.fieldIndex] = column.events;
+                    that.header.sorters[column.fieldIndex] = column.sorter;
+                    that.header.sortNames[column.fieldIndex] = column.sortName;
+                    that.header.cellStyles[column.fieldIndex] = column.cellStyle;
+                    that.header.clickToSelects[column.fieldIndex] = column.clickToSelect;
+                    that.header.searchables[column.fieldIndex] = column.searchable;
+
+                    if (!column.visible) {
+                        return;
+                    }
 
-            if (that.options.cardView && (!column.cardVisible)) {
-                return;
-            }
+                    if (that.options.cardView && (!column.cardVisible)) {
+                        return;
+                    }
 
-            visibleColumns.push(column);
+                    visibleColumns[column.field] = column;
+                }
 
-            html.push('<th' + sprintf(' title="%s"', column.titleTooltip),
-                column.checkbox || column.radio ?
-                sprintf(' class="bs-checkbox %s"', column['class'] || '') :
-                class_,
-                sprintf(' style="%s"', halign + style),
-                '>');
+                html.push('<th' + sprintf(' title="%s"', column.titleTooltip),
+                    column.checkbox || column.radio ?
+                    sprintf(' class="bs-checkbox %s"', column['class'] || '') :
+                    class_,
+                    sprintf(' style="%s"', halign + style),
+                    sprintf(' rowspan="%s"', column.rowspan),
+                    sprintf(' colspan="%s"', column.colspan),
+                    sprintf(' data-field="%s"', column.field),
+                    '>');
 
-            html.push(sprintf('<div class="th-inner %s">', that.options.sortable && column.sortable ?
-                'sortable both' : ''));
+                html.push(sprintf('<div class="th-inner %s">', that.options.sortable && column.sortable ?
+                    'sortable both' : ''));
 
-            text = column.title;
+                text = column.title;
 
-            if (column.checkbox) {
-                if (!that.options.singleSelect && that.options.checkboxHeader) {
-                    text = '<input name="btSelectAll" type="checkbox" />';
+                if (column.checkbox) {
+                    if (!that.options.singleSelect && that.options.checkboxHeader) {
+                        text = '<input name="btSelectAll" type="checkbox" />';
+                    }
+                    that.header.stateField = column.field;
+                }
+                if (column.radio) {
+                    text = '';
+                    that.header.stateField = column.field;
+                    that.options.singleSelect = true;
                 }
-                that.header.stateField = column.field;
-            }
-            if (column.radio) {
-                text = '';
-                that.header.stateField = column.field;
-                that.options.singleSelect = true;
-            }
 
-            html.push(text);
-            html.push('</div>');
-            html.push('<div class="fht-cell"></div>');
-            html.push('</div>');
-            html.push('</th>');
+                html.push(text);
+                html.push('</div>');
+                html.push('<div class="fht-cell"></div>');
+                html.push('</div>');
+                html.push('</th>');
+            });
+            html.push('</tr>');
         });
 
-        this.$header.find('tr').html(html.join(''));
-        this.$header.find('th').each(function (i) {
-            $(this).data(visibleColumns[i]);
+        this.$header.html(html.join(''));
+        this.$header.find('th[data-field]').each(function (i) {
+            $(this).data(visibleColumns[$(this).data('field')]);
         });
         this.$container.off('click', '.th-inner').on('click', '.th-inner', function (event) {
             if (that.options.sortable && $(this).parent().data().sortable) {
@@ -688,7 +753,7 @@
         } else {
             this.$header.show();
             this.$tableHeader.show();
-            this.$tableLoading.css('top', cellHeight + 'px');
+            this.$tableLoading.css('top', this.$header.outerHeight() + 1);
             // Assign the correct sortable arrow
             this.getCaret();
         }
@@ -875,7 +940,7 @@
                 '</button>',
                 '<ul class="dropdown-menu" role="menu">');
 
-            $.each(this.options.columns, function (i, column) {
+            $.each(this.columns, function (i, column) {
                 if (column.radio || column.checkbox) {
                     return;
                 }
@@ -934,7 +999,7 @@
             $keepOpen.find('input').off('click').on('click', function () {
                 var $this = $(this);
 
-                that.toggleColumn(getFieldIndex(that.options.columns,
+                that.toggleColumn(getFieldIndex(that.columns,
                     $(this).data('field')), $this.prop('checked'), false);
                 that.trigger('column-switch', $(this).data('field'), $this.prop('checked'));
             });
@@ -1007,7 +1072,7 @@
                 for (var key in item) {
                     key = $.isNumeric(key) ? parseInt(key, 10) : key;
                     var value = item[key],
-                        column = that.options.columns[getFieldIndex(that.options.columns, key)],
+                        column = that.columns[getFieldIndex(that.columns, key)],
                         j = $.inArray(key, that.header.fields);
 
                     // Fix #142: search use formated data
@@ -1348,7 +1413,7 @@
                     data_ = '',
                     rowspan_ = '',
                     title_ = '',
-                    column = that.options.columns[getFieldIndex(that.options.columns, field)];
+                    column = that.columns[getFieldIndex(that.columns, field)];
 
                 if (!column.visible) {
                     return;
@@ -1421,7 +1486,7 @@
 
                     text = that.options.cardView ? ['<div class="card-view">',
                         that.options.showHeader ? sprintf('<span class="title" %s>%s</span>', style,
-                            getPropertyFromOther(that.options.columns, 'field', 'title', field)) : '',
+                            getPropertyFromOther(that.columns, 'field', 'title', field)) : '',
                         sprintf('<span class="value">%s</span>', value),
                         '</div>'
                     ].join('') : [sprintf('<td%s %s %s %s %s %s>', id_, class_, style, data_, rowspan_, title_),
@@ -1533,13 +1598,11 @@
             }
 
             var field = that.header.fields[i],
-                fieldIndex = -1;
-            that.$header.find('th').each(function (i) {
-                if (field === $(this).data('field')) {
-                    fieldIndex = i;
-                    return false;
-                }
-            });
+                fieldIndex = $.inArray(field, that.getVisibleFields());
+
+            if (that.options.detailView && !that.options.cardView) {
+                fieldIndex += 1;
+            }
 
             for (var key in events) {
                 that.$body.find('tr').each(function () {
@@ -1706,7 +1769,7 @@
             scrollWidth;
 
         if (that.$el.is(':hidden')) {
-            that.timeoutFooter_ = setTimeout($.proxy(that.fitHeader, that), 100);
+            that.timeoutId_ = setTimeout($.proxy(that.fitHeader, that), 100);
             return;
         }
         fixedBody = this.$tableBody.get(0);
@@ -1725,12 +1788,25 @@
             .append(this.$header_);
 
         // fix bug: $.data() is not working as expected after $.append()
-        this.$header.find('th').each(function (i) {
-            that.$header_.find('th').eq(i).data($(this).data());
+        this.$header.find('th[data-field]').each(function (i) {
+            that.$header_.find(sprintf('th[data-field="%s"]', $(this).data('field'))).data($(this).data());
         });
 
+        var visibleFields = this.getVisibleFields();
+
         this.$body.find('tr:first-child:not(.no-records-found) > *').each(function (i) {
-            that.$header_.find('div.fht-cell').eq(i).width($(this).innerWidth());
+            var $this = $(this),
+                index = i;
+
+            if (that.options.detailView && !that.options.cardView) {
+                if (i === 0) {
+                    that.$header_.find('th.detail').find('.fht-cell').width($this.innerWidth());
+                }
+                index = i - 1;
+            }
+
+            that.$header_.find(sprintf('th[data-field="%s"]', visibleFields[index]))
+                .find('.fht-cell').width($this.innerWidth());
         });
         // horizontal scroll event
         // TODO: it's probably better improving the layout than binding to scroll event
@@ -1753,7 +1829,7 @@
             html.push('<td></td>');
         }
 
-        $.each(this.options.columns, function (i, column) {
+        $.each(this.columns, function (i, column) {
             var falign = '', // footer align style
                 style = '',
                 class_ = sprintf(' class="%s"', column['class']);
@@ -1812,7 +1888,7 @@
         if (index === -1) {
             return;
         }
-        this.options.columns[index].visible = checked;
+        this.columns[index].visible = checked;
         this.initHeader();
         this.initSearch();
         this.initPagination();
@@ -1839,6 +1915,21 @@
         $(this.$body[0]).children().filter(sprintf(isIdField ? '[data-uniqueid="%s"]' : '[data-index="%s"]', index))[visible ? 'show' : 'hide']();
     };
 
+    BootstrapTable.prototype.getVisibleFields = function () {
+        var that = this,
+            visibleFields = [];
+
+        $.each(this.header.fields, function (j, field) {
+            var column = that.columns[getFieldIndex(that.columns, field)];
+
+            if (!column.visible) {
+                return;
+            }
+            visibleFields.push(field);
+        });
+        return visibleFields;
+    };
+
     // PUBLIC FUNCTION DEFINITION
     // =======================
 
@@ -1870,7 +1961,7 @@
         if (this.options.showHeader && this.options.height) {
             this.$tableHeader.show();
             this.resetHeader();
-            padding += cellHeight;
+            padding += this.$header.outerHeight();
         } else {
             this.$tableHeader.hide();
             this.trigger('post-header');
@@ -1879,7 +1970,7 @@
         if (this.options.showFooter) {
             this.resetFooter();
             if (this.options.height) {
-                padding += cellHeight;
+                padding += this.$tableFooter.outerHeight();
             }
         }
 
@@ -2063,19 +2154,16 @@
 
     BootstrapTable.prototype.mergeCells = function (options) {
         var row = options.index,
-            col = -1,
+            col = $.inArray(options.field, this.getVisibleFields()),
             rowspan = options.rowspan || 1,
             colspan = options.colspan || 1,
             i, j,
             $tr = this.$body.find('tr'),
             $td;
 
-        this.$header.find('th').each(function (i) {
-            if ($(this).data('field') === options.field) {
-                col = i;
-                return false;
-            }
-        });
+        if (this.options.detailView && !this.options.cardView) {
+            col += 1;
+        }
 
         $td = $tr.eq(row).find('td').eq(col);
 
@@ -2235,15 +2323,15 @@
     };
 
     BootstrapTable.prototype.showColumn = function (field) {
-        this.toggleColumn(getFieldIndex(this.options.columns, field), true, true);
+        this.toggleColumn(getFieldIndex(this.columns, field), true, true);
     };
 
     BootstrapTable.prototype.hideColumn = function (field) {
-        this.toggleColumn(getFieldIndex(this.options.columns, field), false, true);
+        this.toggleColumn(getFieldIndex(this.columns, field), false, true);
     };
 
     BootstrapTable.prototype.getHiddenColumns = function () {
-        return $.grep(this.options.columns, function( column ) {
+        return $.grep(this.columns, function( column ) {
             return !column.visible;
         });
     };
diff --git a/src/extensions/cookie/bootstrap-table-cookie.js b/src/extensions/cookie/bootstrap-table-cookie.js
index dc99502b66..bf8465a748 100644
--- a/src/extensions/cookie/bootstrap-table-cookie.js
+++ b/src/extensions/cookie/bootstrap-table-cookie.js
@@ -149,7 +149,7 @@
         this.options.searchText = searchTextCookie ? searchTextCookie : '';
 
         if (columnsCookie) {
-            $.each(this.options.columns, function (i, column) {
+            $.each(this.columns, function (i, column) {
                 column.visible = columnsCookie.indexOf(column.field) !== -1;
             });
         }
@@ -196,7 +196,7 @@
 
         var visibleColumns = [];
 
-        $.each(this.options.columns, function (i, column) {
+        $.each(this.columns, function (i, column) {
             if (column.visible) {
                 visibleColumns.push(column.field);
             }
diff --git a/src/extensions/editable/bootstrap-table-editable.js b/src/extensions/editable/bootstrap-table-editable.js
index cd37f42b19..a70575c116 100644
--- a/src/extensions/editable/bootstrap-table-editable.js
+++ b/src/extensions/editable/bootstrap-table-editable.js
@@ -34,7 +34,7 @@
             return;
         }
 
-        $.each(this.options.columns, function (i, column) {
+        $.each(this.columns, function (i, column) {
             if (!column.editable) {
                 return;
             }
@@ -61,7 +61,7 @@
             return;
         }
 
-        $.each(this.options.columns, function (i, column) {
+        $.each(this.columns, function (i, column) {
             if (!column.editable) {
                 return;
             }
diff --git a/src/extensions/filter-control/bootstrap-table-filter-control.js b/src/extensions/filter-control/bootstrap-table-filter-control.js
index 06d2391bc1..b14800ea1c 100644
--- a/src/extensions/filter-control/bootstrap-table-filter-control.js
+++ b/src/extensions/filter-control/bootstrap-table-filter-control.js
@@ -164,7 +164,7 @@
             html,
             timeoutId = 0;
 
-        $.each(that.options.columns, function (i, column) {
+        $.each(that.columns, function (i, column) {
             isVisible = 'hidden';
             html = [];
 
@@ -247,7 +247,7 @@
             });
 
             if (header.find('.date-filter-control').length > 0) {
-                $.each(that.options.columns, function (i, column) {
+                $.each(that.columns, function (i, column) {
                     if (column.filterControl !== undefined && column.filterControl.toLowerCase() === 'datepicker') {
                         header.find('.date-filter-control.' + column.field).datepicker(column.filterDatepickerOptions)
                             .on('changeDate', function (e) {
@@ -366,7 +366,7 @@
 
             $.each(this.header.fields, function (j, field) {
                 var value = item[field],
-                    column = that.options.columns[getFieldIndex(that.options.columns, field)];
+                    column = that.columns[getFieldIndex(that.columns, field)];
 
                 value = calculateObjectValue(that.header, that.header.formatters[j], [value, item, i], value);
 
diff --git a/src/extensions/filter/bootstrap-table-filter.js b/src/extensions/filter/bootstrap-table-filter.js
index 086566916f..14af13da06 100644
--- a/src/extensions/filter/bootstrap-table-filter.js
+++ b/src/extensions/filter/bootstrap-table-filter.js
@@ -43,7 +43,7 @@
     };
 
     BootstrapTable.prototype.getColumns = function () {
-        return this.options.columns;
+        return this.columns;
     };
 
     BootstrapTable.prototype.registerSearchCallback = function (callback) {
diff --git a/src/extensions/multiple-sort/bootstrap-table-multiple-sort.js b/src/extensions/multiple-sort/bootstrap-table-multiple-sort.js
index bb11127685..789e5e030d 100644
--- a/src/extensions/multiple-sort/bootstrap-table-multiple-sort.js
+++ b/src/extensions/multiple-sort/bootstrap-table-multiple-sort.js
@@ -328,7 +328,7 @@
         var $multiSortName = this.$sortModal.find('.multi-sort-name').last(),
             $multiSortOrder = this.$sortModal.find('.multi-sort-order').last();
 
-        this.options.columns.forEach(function(column) {
+        this.columns.forEach(function(column) {
             if (column.sortable === false || column.visible === false) {
                 return true;
             }
diff --git a/src/extensions/reorder-columns/bootstrap-table-reorder-columns.js b/src/extensions/reorder-columns/bootstrap-table-reorder-columns.js
index d8c0a52931..4dfd0c1875 100644
--- a/src/extensions/reorder-columns/bootstrap-table-reorder-columns.js
+++ b/src/extensions/reorder-columns/bootstrap-table-reorder-columns.js
@@ -103,8 +103,8 @@
                 });
 
                 //Exist columns not shown
-                if (ths.length < that.options.columns.length) {
-                    columnsHidden = $.grep(that.options.columns, function (column) {
+                if (ths.length < that.columns.length) {
+                    columnsHidden = $.grep(that.columns, function (column) {
                        return !column.visible;
                     });
                     for (var i = 0; i < columnsHidden.length; i++) {
@@ -113,14 +113,14 @@
                 }
 
                 for (var i = 0; i < ths.length; i++ ) {
-                    columnIndex = getFieldIndex(that.options.columns, ths[i]);
+                    columnIndex = getFieldIndex(that.columns, ths[i]);
                     if (columnIndex !== -1) {
-                        columns.push(that.options.columns[columnIndex]);
-                        that.options.columns.splice(columnIndex, 1);
+                        columns.push(that.columns[columnIndex]);
+                        that.columns.splice(columnIndex, 1);
                     }
                 }
 
-                that.options.columns = that.options.columns.concat(columns);
+                that.columns = that.columns.concat(columns);
                 that.header.fields = ths;
                 that.resetView();
                 that.trigger('reorder-column', ths);
diff --git a/src/extensions/toolbar/bootstrap-table-toolbar.js b/src/extensions/toolbar/bootstrap-table-toolbar.js
index 0e7f4dbb29..879da898d7 100644
--- a/src/extensions/toolbar/bootstrap-table-toolbar.js
+++ b/src/extensions/toolbar/bootstrap-table-toolbar.js
@@ -173,7 +173,7 @@
 
         that.$toolbar.find('button[name="advancedSearch"]')
             .off('click').on('click', function() {
-                showAvdSearch(that.options.columns, that.options.formatAdvancedSearch(), that.options.formatAdvancedCloseButton(), that);
+                showAvdSearch(that.columns, that.options.formatAdvancedSearch(), that.options.formatAdvancedCloseButton(), that);
             });
     };
 

From 62e21893d7fba3bbcbe56350fccd0102ad102339 Mon Sep 17 00:00:00 2001
From: zhixin <wenzhixin2010@gmail.com>
Date: Sat, 27 Jun 2015 09:53:52 +0800
Subject: [PATCH 2/3] Fix typo.

---
 src/bootstrap-table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
index 50c01af8b4..dfd0e0450f 100644
--- a/src/bootstrap-table.js
+++ b/src/bootstrap-table.js
@@ -76,7 +76,7 @@
             for (j = 0; j < columns[i].length; j++) {
                 var r = columns[i][j],
                     rowspan = r.rowspan || 1,
-                    colspan = r.colspan　|| 1,
+                    colspan = r.colspan || 1,
                     index = $.inArray(false, flag[i]);
 
                 if (colspan === 1) {

From 64446db19a6816562300a9c779c76ee7f261f799 Mon Sep 17 00:00:00 2001
From: zhixin <wenzhixin2010@gmail.com>
Date: Sat, 27 Jun 2015 10:07:22 +0800
Subject: [PATCH 3/3] Added rowspan and colspan docs.

---
 docs/_i18n/en/documentation/column-options.md  | 16 +++++++++++++++-
 docs/_i18n/es/documentation/column-options.md  | 18 ++++++++++++++++--
 .../zh-cn/documentation/column-options.md      | 16 +++++++++++++++-
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/docs/_i18n/en/documentation/column-options.md b/docs/_i18n/en/documentation/column-options.md
index 45fc34d3b9..4c62870ed4 100644
--- a/docs/_i18n/en/documentation/column-options.md
+++ b/docs/_i18n/en/documentation/column-options.md
@@ -62,12 +62,26 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         <td>undefined</td>
         <td>The column class name.</td>
     </tr>
+    <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
     <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indicate how to align the column data. "left', 'right', 'center' can be used.</td>
+        <td>Indicate how to align the column data. 'left', 'right', 'center' can be used.</td>
     </tr>
     <tr>
         <td>halign</td>
diff --git a/docs/_i18n/es/documentation/column-options.md b/docs/_i18n/es/documentation/column-options.md
index d1515d274f..f0cec28f1f 100644
--- a/docs/_i18n/es/documentation/column-options.md
+++ b/docs/_i18n/es/documentation/column-options.md
@@ -62,12 +62,26 @@ Las propiedades de la columna están definidas en `jQuery.fn.bootstrapTable.colu
         <td>undefined</td>
         <td>La clase CSS de la columna.</td>
     </tr>
+    <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
     <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indica cómo se alinea la columna. Se puede usar "left', 'right', 'center'.</td>
+        <td>Indica cómo se alinea la columna. Se puede usar 'left', 'right', 'center'.</td>
     </tr>
     <tr>
         <td>halign</td>
@@ -216,4 +230,4 @@ Las propiedades de la columna están definidas en `jQuery.fn.bootstrapTable.colu
         <td>True para incluir la columna en la búsqueda.</td>
     </tr>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/docs/_i18n/zh-cn/documentation/column-options.md b/docs/_i18n/zh-cn/documentation/column-options.md
index 45fc34d3b9..4c62870ed4 100644
--- a/docs/_i18n/zh-cn/documentation/column-options.md
+++ b/docs/_i18n/zh-cn/documentation/column-options.md
@@ -62,12 +62,26 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         <td>undefined</td>
         <td>The column class name.</td>
     </tr>
+    <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
     <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indicate how to align the column data. "left', 'right', 'center' can be used.</td>
+        <td>Indicate how to align the column data. 'left', 'right', 'center' can be used.</td>
     </tr>
     <tr>
         <td>halign</td>