canvas-datagrid 0.3.17 → 0.3.21

package/lib/draw.js

@@ -164,6 +164,34 @@ export default function (self) {
     self.ctx.fill();
     return ml + aw + mr;
   }
+  function drawFilterButtonArrow(x, y) {
+    var mt =
+        ((self.style.filterButtonHeight - self.style.filterButtonArrowHeight) /
+          2) *
+        self.scale,
+      ml =
+        ((self.style.filterButtonWidth - self.style.filterButtonArrowWidth) /
+          2) *
+        self.scale,
+      aw = self.style.filterButtonArrowWidth * self.scale,
+      ah = self.style.filterButtonArrowHeight * self.scale;
+    x += self.canvasOffsetLeft;
+    y += self.canvasOffsetTop;
+    self.ctx.fillStyle = self.style.filterButtonArrowColor;
+    self.ctx.strokeStyle = self.style.filterButtonArrowBorderColor;
+    self.ctx.beginPath();
+    x = x + ml;
+    y = y + mt;
+
+    self.ctx.moveTo(x, y);
+    self.ctx.lineTo(x + aw, y);
+    self.ctx.lineTo(x + aw * 0.5, y + ah);
+    self.ctx.moveTo(x, y);
+
+    self.ctx.stroke();
+    self.ctx.fill();
+    return ml + aw;
+  }
   function radiusRect(x, y, w, h, radius) {
     x += self.canvasOffsetLeft;
     y += self.canvasOffsetTop;
@@ -601,15 +629,29 @@ export default function (self) {
         m = self.style.scrollBarBoxMargin * 2;
       self.ctx.strokeStyle = self.style.scrollBarBorderColor;
       self.ctx.lineWidth = self.style.scrollBarBorderWidth;
-      en.horizontalBox.x =
-        rowHeaderCellWidth +
-        self.style.scrollBarBoxMargin +
-        (en.horizontalBar.width - self.scrollBox.scrollBoxWidth) *
-          (self.scrollBox.scrollLeft / self.scrollBox.scrollWidth);
+      if (self.frozenColumn > 0) {
+        en.horizontalBox.x =
+          rowHeaderCellWidth +
+          self.style.scrollBarBoxMargin +
+          self.scrollCache.x[self.frozenColumn - 1] +
+          (en.horizontalBar.width -
+            self.scrollCache.x[self.frozenColumn - 1] -
+            self.scrollBox.scrollBoxWidth) *
+            (self.scrollBox.scrollLeft / self.scrollBox.scrollWidth);
+      } else {
+        en.horizontalBox.x =
+          rowHeaderCellWidth +
+          self.style.scrollBarBoxMargin +
+          (en.horizontalBar.width - self.scrollBox.scrollBoxWidth) *
+            (self.scrollBox.scrollLeft / self.scrollBox.scrollWidth);
+      }
       en.verticalBox.y =
         columnHeaderCellHeight +
         self.style.scrollBarBoxMargin +
-        (en.verticalBar.height - self.scrollBox.scrollBoxHeight) *
+        self.scrollCache.y[self.frozenRow] +
+        (en.verticalBar.height -
+          self.scrollBox.scrollBoxHeight -
+          self.scrollCache.y[self.frozenRow]) *
           (self.scrollBox.scrollTop / self.scrollBox.scrollHeight);
       if (self.scrollBox.horizontalBarVisible) {
         self.ctx.fillStyle = self.style.scrollBarBackgroundColor;
@@ -802,6 +844,9 @@ export default function (self) {
           isCorner = /cornerCell/.test(cellStyle),
           isRowHeader = 'rowHeaderCell' === cellStyle,
           isColumnHeader = 'columnHeaderCell' === cellStyle,
+          isFilterable =
+            self.filterable.rows.includes(rowIndex) &&
+            self.filterable.columns.includes(headerIndex),
           wrap = self.style.cellWhiteSpace !== 'nowrap',
           selected =
             self.selections[rowOrderIndex] &&
@@ -810,6 +855,9 @@ export default function (self) {
             self.hovers.rowIndex === rowOrderIndex &&
             (self.attributes.hoverMode === 'row' ||
               self.hovers.columnIndex === columnOrderIndex),
+          openedFilter =
+            self.selectedFilterButton.rowIndex == rowIndex &&
+            self.selectedFilterButton.columnIndex == headerIndex,
           active =
             self.activeCell.rowIndex === rowOrderIndex &&
             self.activeCell.columnIndex === columnOrderIndex,
@@ -901,6 +949,8 @@ export default function (self) {
           isColumnHeader: isColumnHeader,
           isColumnHeaderCellCap: isColumnHeaderCellCap,
           isRowHeader: isRowHeader,
+          isFilterable: isFilterable,
+          openedFilter: openedFilter,
           rowOpen: rowOpen,
           header: header,
 
@@ -1100,6 +1150,10 @@ export default function (self) {
         }
         self.ctx.restore();
 
+        if (isFilterable) {
+          drawFilterButton(cell);
+        }
+
         // Gaps may occur in row numbers between consecutively rendered rows
         // when we are filtering. We draw attention to this by drawing a thick
         // border overlapping the two consecutive row headers. If sorting, visible
@@ -1140,6 +1194,34 @@ export default function (self) {
         return cell.width;
       };
     }
+    function drawFilterButton(cell, ev) {
+      var posX = cell.x + cell.width - self.style.filterButtonWidth - 1;
+      var posY = cell.y + cell.height - self.style.filterButtonHeight - 2;
+      if (self.dispatchEvent('beforerenderfilterbutton', ev)) {
+        return;
+      }
+      self.ctx.save();
+      self.ctx.strokeStyle = self.style.filterButtonBorderColor;
+      self.ctx.fillStyle = self.style.filterButtonBackgroundColor;
+      if (cell.openedFilter) {
+        self.ctx.fillStyle = self.style.filterButtonActiveBackgroundColor;
+      } else if (cell.hovered && self.hovers.onFilterButton) {
+        self.ctx.fillStyle = self.style.filterButtonHoverBackgroundColor;
+      }
+      radiusRect(
+        posX,
+        posY,
+        self.style.filterButtonWidth,
+        self.style.filterButtonHeight,
+        self.style.filterButtonBorderRadius,
+      );
+      self.ctx.stroke();
+      self.ctx.fill();
+      drawFilterButtonArrow(posX, posY);
+      self.ctx.clip();
+      self.dispatchEvent('afterrenderfilterbutton', ev);
+      self.ctx.restore();
+    }
     function drawRowHeader(rowData, rowIndex, rowOrderIndex) {
       if (self.attributes.showRowHeaders) {
         x = 0;
@@ -1520,6 +1602,10 @@ export default function (self) {
       self.ctx.lineWidth = self.style.reorderMarkerBorderWidth;
       self.ctx.strokeStyle = self.style.reorderMarkerBorderColor;
       if (self.dragMode === 'row-reorder') {
+        for (var k = 0; k < self.selections.length; k++) {
+          if (!self.selections[k] || k == self.reorderObject.rowIndex) continue;
+          b.height += self.getRowHeight(k);
+        }
         b.width = w;
         b.x = 0;
         m.width = w;
@@ -1542,6 +1628,12 @@ export default function (self) {
           );
         }
       } else if (self.dragMode === 'column-reorder' && self.reorderObject) {
+        var selectedColumns = self.selections[0];
+        for (var k = 1; k < selectedColumns.length; k++) {
+          b.width += self.getColumnWidth(
+            self.orders.columns[selectedColumns[k]],
+          );
+        }
         b.height = h;
         b.y = 0;
         m.height = h;

package/lib/events/index.js

@@ -254,7 +254,13 @@ export default function (self) {
     setScrollBoxSize();
     self.scrollBox.scrollWidth = dataWidth - self.scrollBox.width;
     self.scrollBox.scrollHeight = dataHeight - self.scrollBox.height;
-    self.scrollBox.widthBoxRatio = self.scrollBox.width / dataWidth;
+    if (self.frozenColumn > 0) {
+      self.scrollBox.widthBoxRatio =
+        (self.scrollBox.width - self.scrollCache.x[self.frozenColumn - 1]) /
+        dataWidth;
+    } else {
+      self.scrollBox.widthBoxRatio = self.scrollBox.width / dataWidth;
+    }
     self.scrollBox.scrollBoxWidth =
       self.scrollBox.width * self.scrollBox.widthBoxRatio -
       self.style.scrollBarWidth -
@@ -266,7 +272,10 @@ export default function (self) {
     // the dragged mouse.
     // https://github.com/TonyGermaneri/canvas-datagrid/issues/97
     self.scrollBox.heightBoxRatio =
-      (self.scrollBox.height - columnHeaderCellHeight) / dataHeight;
+      (self.scrollBox.height -
+        columnHeaderCellHeight -
+        self.scrollCache.y[self.frozenRow]) /
+      dataHeight;
     self.scrollBox.scrollBoxHeight =
       self.scrollBox.height * self.scrollBox.heightBoxRatio -
       self.style.scrollBarWidth -
@@ -296,12 +305,13 @@ export default function (self) {
       self.style.scrollBarWidth -
       self.style.scrollBarBorderWidth -
       d;
-    v.y += columnHeaderCellHeight;
+    v.y += columnHeaderCellHeight + self.scrollCache.y[self.frozenRow];
     v.width = self.style.scrollBarWidth + self.style.scrollBarBorderWidth + d;
     v.height =
       self.height - columnHeaderCellHeight - self.style.scrollBarWidth - d - m;
     // vertical box
     vb.x = v.x + self.style.scrollBarBoxMargin;
+    vb.y += self.scrollCache.y[self.frozenRow];
     vb.width = self.style.scrollBarBoxWidth;
     vb.height = self.scrollBox.scrollBoxHeight;
     // corner
@@ -458,7 +468,26 @@ export default function (self) {
         self.hovers = {
           rowIndex: cell.rowIndex,
           columnIndex: cell.columnIndex,
+          onFilterButton: false,
         };
+        if (
+          cell.isFilterable &&
+          x >
+            cell.x +
+              cell.width +
+              self.canvasOffsetLeft -
+              self.style.filterButtonWidth &&
+          x < cell.x + cell.width + self.canvasOffsetLeft &&
+          y >
+            cell.y +
+              cell.height +
+              self.canvasOffsetTop -
+              self.style.filterButtonHeight &&
+          y < cell.y + cell.height + self.canvasOffsetTop
+        ) {
+          self.hovers.onFilterButton = true;
+          self.draw();
+        }
       }
       if (self.selecting || self.reorderObject) {
         delta = {
@@ -502,30 +531,57 @@ export default function (self) {
           ) {
             self.selectRow(cell.rowIndex, ctrl, null, true);
           } else if (self.attributes.selectionMode !== 'row') {
-            if (!self.dragAddToSelection && cell.rowIndex !== undefined) {
-              if (
-                self.selections[cell.rowIndex] &&
-                self.selections[cell.rowIndex].indexOf(cell.columnIndex) !== -1
-              ) {
-                self.selections[cell.rowIndex].splice(
-                  self.selections[cell.rowIndex].indexOf(cell.columnIndex),
-                  1,
-                );
+            if (cell.hovered && self.hovers.onFilterButton) {
+              if (cell.openedFilter) {
+                cell.openedFilter = false;
+                self.selectedFilterButton = {
+                  columnIndex: -1,
+                  rowIndex: -1,
+                };
+              } else {
+                self.selectedFilterButton.rowIndex = cell.rowIndex;
+                self.selectedFilterButton.columnIndex = cell.columnIndex;
+                self.contextmenuEvent(e, {
+                  x: cell.x + cell.width - self.style.filterButtonWidth,
+                  y: cell.y + cell.height,
+                  rect: { left: 0, top: 0 },
+                });
               }
+              self.draw();
+              return;
             } else {
-              self.selections[cell.rowIndex] =
-                self.selections[cell.rowIndex] || [];
-              if (
-                self.selections[cell.rowIndex].indexOf(cell.columnIndex) === -1
-              ) {
-                self.selections[cell.rowIndex].push(cell.columnIndex);
-                const event = {
-                  selections: self.selections,
-                  selectedData: self.getSelectedData(),
-                  selectedCells: self.getSelectedCells(),
-                  selectionBounds: self.getSelectionBounds(),
-                };
-                self.dispatchEvent('selectionchanged', event);
+              self.selectedFilterButton = {
+                columnIndex: -1,
+                rowIndex: -1,
+              };
+              if (self.hovers.onFilterButton) return;
+              if (!self.dragAddToSelection && cell.rowIndex !== undefined) {
+                if (
+                  self.selections[cell.rowIndex] &&
+                  self.selections[cell.rowIndex].indexOf(cell.columnIndex) !==
+                    -1
+                ) {
+                  self.selections[cell.rowIndex].splice(
+                    self.selections[cell.rowIndex].indexOf(cell.columnIndex),
+                    1,
+                  );
+                }
+              } else {
+                self.selections[cell.rowIndex] =
+                  self.selections[cell.rowIndex] || [];
+                if (
+                  self.selections[cell.rowIndex].indexOf(cell.columnIndex) ===
+                  -1
+                ) {
+                  self.selections[cell.rowIndex].push(cell.columnIndex);
+                  var event = {
+                    selections: self.selections,
+                    selectedData: self.getSelectedData(),
+                    selectedCells: self.getSelectedCells(),
+                    selectionBounds: self.getSelectionBounds(),
+                  };
+                  self.dispatchEvent('selectionchanged', event);
+                }
               }
             }
           }
@@ -538,14 +594,21 @@ export default function (self) {
             dragBounds.right !== self.selectionBounds.right) &&
           !ctrl
         ) {
-          self.selections = [];
+          if (!(cell.hovered && self.hovers.onFilterButton)) {
+            self.selections = [];
+          }
+          if (dragBounds.top === -1) {
+            dragBounds.top = 0;
+          }
           sBounds = dragBounds;
           if (self.attributes.selectionMode === 'row') {
             for (i = sBounds.top; i <= sBounds.bottom; i += 1) {
               self.selectRow(i, true, null, true);
             }
-          } else if (dragBounds.top !== -1) {
+          } else {
             self.selectArea(sBounds, true);
+            if (sBounds.left == -1 && sBounds.top !== sBounds.bottom)
+              self.isMultiRowsSelected = true;
           }
         }
 
@@ -620,7 +683,9 @@ export default function (self) {
         -1 &&
       !ctrl
     ) {
-      self.setActiveCell(i.columnIndex, i.rowIndex);
+      if (!self.hovers.onFilterButton) {
+        self.setActiveCell(i.columnIndex, i.rowIndex);
+      }
     }
     if (self.currentCell.context === 'cell') {
       if (self.currentCell.style === 'cornerCell') {
@@ -641,11 +706,6 @@ export default function (self) {
           checkSelectionChange();
           return;
         }
-        if (self.attributes.columnHeaderClickBehavior === 'select') {
-          self.selectColumn(i.header.index, ctrl, e.shiftKey);
-          self.draw();
-          return;
-        }
       }
       self.selections[i.rowIndex] = self.selections[i.rowIndex] || [];
       if (
@@ -868,6 +928,14 @@ export default function (self) {
     if (!self.attributes.allowRowReordering && rowReorder) {
       return;
     }
+    if ((e.ctrlKey || e.metaKey || e.shiftKey) && self.reorderObject) {
+      if (
+        self.dragMode === 'column-reorder' &&
+        !self.isMultiColumnsSelected(self.draggingItem.header.index)
+      ) {
+        self.selectColumn(self.draggingItem.header.index, false, false);
+      }
+    }
     if (
       self.dispatchEvent('reordering', {
         NativeEvent: e,
@@ -883,6 +951,11 @@ export default function (self) {
       Math.abs(y) > self.attributes.reorderDeadZone
     ) {
       self.reorderObject = self.draggingItem;
+      if (self.isMultiRowsSelected)
+        self.reorderObject = self.getVisibleCellByIndex(
+          -1,
+          self.activeCell.rowIndex,
+        );
       self.reorderTarget = self.currentCell;
       self.reorderObject.dragOffset = {
         x: x,
@@ -899,7 +972,7 @@ export default function (self) {
   self.stopDragReorder = function (e) {
     var oIndex,
       tIndex,
-      odata,
+      odata = [],
       cr = {
         'row-reorder': self.orders.rows,
         'column-reorder': self.orders.columns,
@@ -931,14 +1004,40 @@ export default function (self) {
       oIndex = cr[self.dragMode].indexOf(self.reorderObject[i]);
       tIndex = cr[self.dragMode].indexOf(self.reorderTarget[i]);
       if (self.dragMode === 'column-reorder') {
-        cr[self.dragMode].splice(oIndex, 1);
-        cr[self.dragMode].splice(tIndex, 0, self.reorderObject[i]);
+        var sortColumnIndices = [];
+        var seletedColumnIndices = [];
+        if (self.selections[0]) {
+          self.selections[0].forEach(function (value) {
+            sortColumnIndices.push(self.orders.columns[value]);
+          });
+        }
+        var deleteCount = sortColumnIndices.length;
+        cr[self.dragMode].splice(oIndex, deleteCount);
+        if (tIndex > oIndex) tIndex = tIndex - (deleteCount - 1);
+        for (var i = 0; i < sortColumnIndices.length; i++) {
+          seletedColumnIndices.push(tIndex + i);
+          cr[self.dragMode].splice(tIndex + i, 0, sortColumnIndices[i]);
+        }
         self.orders.columns = cr[self.dragMode];
+        self.viewData.forEach(function (row, rowIndex) {
+          self.selections[rowIndex] = seletedColumnIndices;
+        });
       } else {
-        // self.orders.rows = cr[self.dragMode];
-        odata = self.viewData[oIndex];
-        self.viewData[oIndex] = self.viewData[tIndex];
-        self.viewData[tIndex] = odata;
+        var selectedRows = [];
+        self.selections.forEach(function (row, rowIndex) {
+          if (row) {
+            selectedRows.push(row);
+            odata.push(self.viewData[rowIndex]);
+          }
+        });
+        self.viewData.splice(oIndex, odata.length);
+        self.selections = [];
+        if (tIndex > oIndex) tIndex = tIndex - (odata.length - 1);
+        self.activeCell.rowIndex = tIndex;
+        for (var i = 0; i < odata.length; i++) {
+          self.viewData.splice(tIndex + i, 0, odata[i]);
+          self.selections[tIndex + i] = selectedRows[i];
+        }
       }
       self.resize();
       self.setStorageData();
@@ -1000,7 +1099,12 @@ export default function (self) {
     ) {
       return;
     }
-    var pos = self.getLayerPos(e);
+    var pos = self.getLayerPos(e),
+      bm = self.style.gridBorderCollapse === 'collapse' ? 1 : 2,
+      columnHeaderCellBorder = self.style.columnHeaderCellBorderWidth * bm,
+      columnHeaderCellHeight = self.getColumnHeaderCellHeight(),
+      rowHeaderCellWidth = self.getRowHeaderCellWidth();
+
     self.ignoreNextClick = true;
     self.freezeMarkerPosition = pos;
     if (
@@ -1010,6 +1114,28 @@ export default function (self) {
     ) {
       self.scrollBox.scrollTop = 0;
       self.frozenRow = self.currentCell.rowIndex + 1;
+      self.scrollBox.bar.v.y =
+        columnHeaderCellHeight +
+        columnHeaderCellBorder +
+        self.scrollCache.y[self.frozenRow];
+      self.scrollBox.box.v.y =
+        columnHeaderCellHeight +
+        columnHeaderCellBorder +
+        self.scrollCache.y[self.frozenRow];
+      var dataHeight = self.scrollCache.y[self.scrollCache.y.length - 1];
+      self.scrollBox.heightBoxRatio =
+        (self.scrollBox.height -
+          columnHeaderCellHeight -
+          self.scrollCache.y[self.frozenRow]) /
+        dataHeight;
+      self.scrollBox.scrollBoxHeight =
+        self.scrollBox.height * self.scrollBox.heightBoxRatio -
+        self.style.scrollBarWidth;
+      self.scrollBox.scrollBoxHeight = Math.max(
+        self.scrollBox.scrollBoxHeight,
+        self.style.scrollBarBoxMinSize,
+      );
+      self.scrollBox.box.v.height = self.scrollBox.scrollBoxHeight;
     }
     if (
       self.currentCell &&
@@ -1018,6 +1144,22 @@ export default function (self) {
     ) {
       self.scrollBox.scrollLeft = 0;
       self.frozenColumn = self.currentCell.columnIndex + 1;
+      self.scrollBox.bar.h.x =
+        rowHeaderCellWidth + self.scrollCache.x[self.frozenColumn - 1];
+      self.scrollBox.box.h.x =
+        rowHeaderCellWidth + self.scrollCache.x[self.frozenColumn - 1];
+      var dataWidth = self.scrollCache.x[self.scrollCache.x.length - 1];
+      self.scrollBox.widthBoxRatio =
+        (self.scrollBox.width - self.scrollCache.x[self.frozenColumn - 1]) /
+        dataWidth;
+      self.scrollBox.scrollBoxWidth =
+        self.scrollBox.width * self.scrollBox.widthBoxRatio -
+        self.style.scrollBarWidth;
+      self.scrollBox.scrollBoxWidth = Math.max(
+        self.scrollBox.scrollBoxWidth,
+        self.style.scrollBarBoxMinSize,
+      );
+      self.scrollBox.box.h.width = self.scrollBox.scrollBoxWidth;
     }
     if (
       Math.abs(pos.x) > self.attributes.reorderDeadZone ||
@@ -1084,7 +1226,12 @@ export default function (self) {
       !freeze &&
       !resize
     ) {
-      self.selections = [];
+      if (
+        !(self.dragMode == 'row-reorder' && self.isMultiRowsSelected) &&
+        !(self.currentCell.hovered && self.hovers.onFilterButton)
+      ) {
+        self.selections = [];
+      }
     }
     if (self.dragStartObject.isGrid) {
       return;
@@ -1175,10 +1322,11 @@ export default function (self) {
       self.draggingItem = self.dragStartObject;
       if (
         self.dragMode === 'column-reorder' &&
-        self.attributes.columnHeaderClickBehavior === 'select'
+        !self.isMultiColumnsSelected(self.currentCell.header.index)
       ) {
         self.selectColumn(self.currentCell.header.index, ctrl, e.shiftKey);
-        self.draw();
+      } else if (self.dragMode === 'row-reorder' && !self.isMultiRowsSelected) {
+        self.selectRow(self.dragStartObject.rowIndex, ctrl, null);
       }
       document.body.addEventListener('mousemove', self.dragReorder, false);
       document.body.addEventListener('mouseup', self.stopDragReorder, false);
@@ -1187,14 +1335,9 @@ export default function (self) {
   };
   self.mouseup = function (e) {
     clearTimeout(self.scrollTimer);
-    var ctrl = e.ctrlKey || e.metaKey;
     self.cellBoundaryCrossed = true;
     self.rowBoundaryCrossed = true;
     self.columnBoundaryCrossed = true;
-    if (self.draggingItem) {
-      self.selectColumn(self.currentCell.header.index, ctrl, e.shiftKey);
-      self.draw();
-    }
     self.selecting = undefined;
     self.draggingItem = undefined;
     self.dragStartObject = undefined;
@@ -1285,6 +1428,8 @@ export default function (self) {
       self.selectNone();
     } else if (ctrl && e.key === 'a') {
       self.selectAll();
+    } else if (['Backspace', 'Delete'].includes(e.key)) {
+      self.deleteSelectedData();
     } else if (e.key === 'ArrowDown') {
       y += 1;
     } else if (e.key === 'ArrowUp') {
@@ -1470,7 +1615,10 @@ export default function (self) {
       self.currentCell.style === 'cornerCell'
     ) {
       self.autosize();
-    } else if (['cell', 'activeCell'].indexOf(self.currentCell.style) !== -1) {
+    } else if (
+      ['cell', 'activeCell'].includes(self.currentCell.style) &&
+      !self.hovers.onFilterButton
+    ) {
       self.beginEditAt(self.currentCell.columnIndex, self.currentCell.rowIndex);
     }
   };
@@ -1723,6 +1871,8 @@ export default function (self) {
     if (self.dispatchEvent('cut', { NativeEvent: e, cells: affectedCells })) {
       return;
     }
+
+    requestAnimationFrame(() => self.draw());
   };
   self.copy = function (e) {
     if (self.dispatchEvent('copy', { NativeEvent: e })) {
@@ -1740,6 +1890,7 @@ export default function (self) {
       firstRowKeys,
       isNeat = true; // Selected like [[0, 1], [0, 1]] of [[0, 3]] is neat; Selected like [[0, 1], [1, 2]] is untidy
     function htmlSafe(v) {
+      if (typeof v === 'number') return v;
       return v.replace(/</g, '&lt;').replace(/>/g, '&gt;');
     }
     s.forEach(function (column, columnIndex) {
@@ -1753,8 +1904,8 @@ export default function (self) {
         if (!firstRowKeys) firstRowKeys = Object.keys(row);
         if (isNeat && rowKeys.length !== firstRowKeys.length) isNeat = false;
         sSorted.forEach(function (column, columnIndex) {
-          if (rowKeys.indexOf(column.name) < 0) {
-            if (firstRowKeys.indexOf(column.name) < 0) {
+          if (rowKeys.indexOf(String(column.name)) < 0) {
+            if (firstRowKeys.indexOf(String(column.name)) < 0) {
               return;
             } else if (isNeat) {
               isNeat = false;