vxe-table 3.4.12 → 3.4.14-beta.2

package/lib/table/src/methods.js

@@ -432,14 +432,34 @@ var Methods = {
   },
 
   /**
-   * 手动处理数据
+   * 手动处理数据，用于手动排序与筛选
    * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
    */
   updateData: function updateData() {
-    return this.handleTableData(true).then(this.updateFooter).then(this.recalculate);
+    var _this2 = this;
+
+    var scrollXLoad = this.scrollXLoad,
+        scrollYLoad = this.scrollYLoad;
+    return this.handleTableData(true).then(function () {
+      _this2.updateFooter();
+
+      if (scrollXLoad || scrollYLoad) {
+        if (scrollXLoad) {
+          _this2.updateScrollXSpace();
+        }
+
+        if (scrollYLoad) {
+          _this2.updateScrollYSpace();
+        }
+
+        return _this2.refreshScroll();
+      }
+    }).then(function () {
+      return _this2.recalculate();
+    });
   },
   handleTableData: function handleTableData(force) {
-    var _this2 = this;
+    var _this3 = this;
 
     var scrollYLoad = this.scrollYLoad,
         scrollYStore = this.scrollYStore,
@@ -456,7 +476,7 @@ var Methods = {
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach(function (row, $index) {
-      var rowid = getRowid(_this2, row);
+      var rowid = getRowid(_this3, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -481,7 +501,7 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadTableData: function loadTableData(datas) {
-    var _this3 = this;
+    var _this4 = this;
 
     var keepSource = this.keepSource,
         treeConfig = this.treeConfig,
@@ -584,31 +604,31 @@ var Methods = {
     this.handleTableData(true);
     this.updateFooter();
     return this.$nextTick().then(function () {
-      _this3.updateHeight();
+      _this4.updateHeight();
 
-      _this3.updateStyle();
+      _this4.updateStyle();
     }).then(function () {
-      _this3.computeScrollLoad();
+      _this4.computeScrollLoad();
     }).then(function () {
       // 是否启用了虚拟滚动
       if (sYLoad) {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
 
-      _this3.handleReserveStatus();
+      _this4.handleReserveStatus();
 
-      _this3.checkSelectionStatus();
+      _this4.checkSelectionStatus();
 
       return new Promise(function (resolve) {
-        _this3.$nextTick().then(function () {
-          return _this3.recalculate();
+        _this4.$nextTick().then(function () {
+          return _this4.recalculate();
         }).then(function () {
           // 是否变更虚拟滚动
           if (oldScrollYLoad === sYLoad) {
-            (0, _util.restoreScrollLocation)(_this3, lastScrollLeft, lastScrollTop).then(resolve);
+            (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return (0, _util.restoreScrollLocation)(_this3, lastScrollLeft, lastScrollTop).then(resolve);
+              return (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
             });
           }
         });
@@ -621,23 +641,23 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadData: function loadData(datas) {
-    var _this4 = this;
+    var _this5 = this;
 
     var inited = this.inited,
         initStatus = this.initStatus;
     return this.loadTableData(datas).then(function () {
-      _this4.inited = true;
-      _this4.initStatus = true;
+      _this5.inited = true;
+      _this5.initStatus = true;
 
       if (!initStatus) {
-        _this4.handleLoadDefaults();
+        _this5.handleLoadDefaults();
       }
 
       if (!inited) {
-        _this4.handleInitDefaults();
+        _this5.handleInitDefaults();
       }
 
-      return _this4.recalculate();
+      return _this5.recalculate();
     });
   },
 
@@ -646,21 +666,21 @@ var Methods = {
    * @param {Array} datas 数据
    */
   reloadData: function reloadData(datas) {
-    var _this5 = this;
+    var _this6 = this;
 
     var inited = this.inited;
     return this.clearAll().then(function () {
-      _this5.inited = true;
-      _this5.initStatus = true;
-      return _this5.loadTableData(datas);
+      _this6.inited = true;
+      _this6.initStatus = true;
+      return _this6.loadTableData(datas);
     }).then(function () {
-      _this5.handleLoadDefaults();
+      _this6.handleLoadDefaults();
 
       if (!inited) {
-        _this5.handleInitDefaults();
+        _this6.handleInitDefaults();
       }
 
-      return _this5.recalculate();
+      return _this6.recalculate();
     });
   },
 
@@ -710,10 +730,10 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   loadColumn: function loadColumn(columns) {
-    var _this6 = this;
+    var _this7 = this;
 
     var collectColumn = _xeUtils.default.mapTree(columns, function (column) {
-      return _cell.default.createColumn(_this6, column);
+      return _cell.default.createColumn(_this7, column);
     }, {
       children: 'children'
     });
@@ -727,14 +747,14 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   reloadColumn: function reloadColumn(columns) {
-    var _this7 = this;
+    var _this8 = this;
 
     return this.clearAll().then(function () {
-      return _this7.loadColumn(columns);
+      return _this8.loadColumn(columns);
     });
   },
   handleColumn: function handleColumn(collectColumn) {
-    var _this8 = this;
+    var _this9 = this;
 
     this.collectColumn = collectColumn;
     var tableFullColumn = getColumnList(collectColumn);
@@ -742,8 +762,8 @@ var Methods = {
     this.cacheColumnMap();
     this.restoreCustomStorage();
     this.parseColumns().then(function () {
-      if (_this8.scrollXLoad) {
-        _this8.loadScrollXData(true);
+      if (_this9.scrollXLoad) {
+        _this9.loadScrollXData(true);
       }
     });
     this.clearMergeCells();
@@ -757,14 +777,14 @@ var Methods = {
     }
 
     return this.$nextTick().then(function () {
-      if (_this8.$toolbar) {
-        _this8.$toolbar.syncUpdate({
+      if (_this9.$toolbar) {
+        _this9.$toolbar.syncUpdate({
           collectColumn: collectColumn,
-          $table: _this8
+          $table: _this9
         });
       }
 
-      return _this8.recalculate();
+      return _this9.recalculate();
     });
   },
 
@@ -773,7 +793,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap: function cacheRowMap(source) {
-    var _this9 = this;
+    var _this10 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
@@ -787,7 +807,7 @@ var Methods = {
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = getRowid(_this9, row);
+      var rowid = getRowid(_this10, row);
       var seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -837,7 +857,7 @@ var Methods = {
     }
   },
   loadTreeChildren: function loadTreeChildren(row, childRecords) {
-    var _this10 = this;
+    var _this11 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -853,10 +873,10 @@ var Methods = {
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = getRowid(_this10, row);
+        var rowid = getRowid(_this11, row);
 
         var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this10, item);
+          return rowid === getRowid(_this11, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -865,7 +885,7 @@ var Methods = {
       }
 
       _xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = getRowid(_this10, childRow);
+        var rowid = getRowid(_this11, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -889,7 +909,7 @@ var Methods = {
         row[mapChildren] = rows;
       }
 
-      _this10.updateAfterDataIndex();
+      _this11.updateAfterDataIndex();
 
       return rows;
     });
@@ -900,7 +920,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this11 = this;
+    var _this12 = this;
 
     var tableFullColumn = this.tableFullColumn,
         collectColumn = this.collectColumn,
@@ -987,16 +1007,16 @@ var Methods = {
       }
 
       if (process.env.NODE_ENV === 'development') {
-        if (_this11.showOverflow && column.showOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-overflow=".concat(_this11.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
+        if (_this12.showOverflow && column.showOverflow === false) {
+          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-overflow=".concat(_this12.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
         }
 
-        if (_this11.showHeaderOverflow && column.showHeaderOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this11.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
+        if (_this12.showHeaderOverflow && column.showHeaderOverflow === false) {
+          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this12.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
         }
 
-        if (_this11.showFooterOverflow && column.showFooterOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this11.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
+        if (_this12.showFooterOverflow && column.showFooterOverflow === false) {
+          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
         }
       }
 
@@ -1248,13 +1268,13 @@ var Methods = {
    * @param {Array} records 新数据
    */
   createData: function createData(records) {
-    var _this12 = this;
+    var _this13 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
 
     var handleRrecord = function handleRrecord(record) {
-      return _this12.defineField(Object.assign({}, record));
+      return _this13.defineField(Object.assign({}, record));
     };
 
     var rows = treeConfig ? _xeUtils.default.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
@@ -1269,7 +1289,7 @@ var Methods = {
    * @param {Array/Object} records 新数据
    */
   createRow: function createRow(records) {
-    var _this13 = this;
+    var _this14 = this;
 
     var isArr = _xeUtils.default.isArray(records);
 
@@ -1278,7 +1298,7 @@ var Methods = {
     }
 
     return this.$nextTick().then(function () {
-      return _this13.createData(records).then(function (rows) {
+      return _this14.createData(records).then(function (rows) {
         return isArr ? rows : rows[0];
       });
     });
@@ -1292,7 +1312,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this14 = this;
+    var _this15 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -1318,8 +1338,8 @@ var Methods = {
 
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this14.isInsertByRow(row)) {
-          var rowIndex = _this14.getRowIndex(row);
+        if (!_this15.isInsertByRow(row)) {
+          var rowIndex = _this15.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
             throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['revertData']));
@@ -1403,7 +1423,7 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this15 = this;
+    var _this16 = this;
 
     var visibleColumn = this.visibleColumn,
         keepSource = this.keepSource,
@@ -1424,7 +1444,7 @@ var Methods = {
         var children = treeOpts.children;
 
         var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this15, item);
+          return rowid === getRowid(_this16, item);
         }, treeOpts);
 
         row = Object.assign({}, row, _defineProperty({}, children, null));
@@ -1589,7 +1609,7 @@ var Methods = {
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData: function updateAfterFullData() {
-    var _this16 = this;
+    var _this17 = this;
 
     var tableFullColumn = this.tableFullColumn,
         tableFullData = this.tableFullData,
@@ -1609,7 +1629,8 @@ var Methods = {
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
-      var sortable = column.sortable,
+      var property = column.property,
+          sortable = column.sortable,
           order = column.order,
           filters = column.filters;
 
@@ -1635,7 +1656,8 @@ var Methods = {
       if (!allRemoteSort && sortable && order) {
         orderColumns.push({
           column: column,
-          property: column.property,
+          field: column.property,
+          property: property,
           order: order
         });
       }
@@ -1665,7 +1687,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this16
+                  $table: _this17
                 });
               });
             } else if (compFilterMethod) {
@@ -1676,7 +1698,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this16
+                  $table: _this17
                 });
               });
             } else if (allFilterMethod) {
@@ -1695,7 +1717,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this16
+                  $table: _this17
                 });
               });
             }
@@ -1748,7 +1770,7 @@ var Methods = {
           tableTree = _xeUtils.default.orderBy(tableTree, orderColumns.map(function (_ref2) {
             var column = _ref2.column,
                 order = _ref2.order;
-            return [getOrderField(_this16, column), order];
+            return [getOrderField(_this17, column), order];
           }));
         }
 
@@ -1771,7 +1793,7 @@ var Methods = {
             tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(function (_ref3) {
               var column = _ref3.column,
                   order = _ref3.order;
-              return [getOrderField(_this16, column), order];
+              return [getOrderField(_this17, column), order];
             }));
           } else {
             // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
@@ -1786,7 +1808,7 @@ var Methods = {
             tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
               var column = _ref4.column,
                   order = _ref4.order;
-              return [getOrderField(_this16, column), order];
+              return [getOrderField(_this17, column), order];
             }));
           }
         }
@@ -1805,7 +1827,7 @@ var Methods = {
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex: function updateAfterDataIndex() {
-    var _this17 = this;
+    var _this18 = this;
 
     var treeConfig = this.treeConfig,
         afterFullData = this.afterFullData,
@@ -1816,7 +1838,7 @@ var Methods = {
 
     if (treeConfig) {
       _xeUtils.default.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = getRowid(_this17, row);
+        var rowid = getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -1845,7 +1867,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = getRowid(_this17, row);
+        var rowid = getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -1936,7 +1958,7 @@ var Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults: function handleLoadDefaults() {
-    var _this18 = this;
+    var _this19 = this;
 
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
@@ -1963,7 +1985,7 @@ var Methods = {
     }
 
     this.$nextTick(function () {
-      return setTimeout(_this18.recalculate);
+      return setTimeout(_this19.recalculate);
     });
   },
 
@@ -2220,12 +2242,12 @@ var Methods = {
    * 刷新列配置
    */
   refreshColumn: function refreshColumn() {
-    var _this19 = this;
+    var _this20 = this;
 
     return this.parseColumns().then(function () {
-      return _this19.refreshScroll();
+      return _this20.refreshScroll();
     }).then(function () {
-      return _this19.recalculate();
+      return _this20.recalculate();
     });
   },
 
@@ -2234,7 +2256,7 @@ var Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns: function parseColumns() {
-    var _this20 = this;
+    var _this21 = this;
 
     var leftList = [];
     var centerList = [];
@@ -2361,11 +2383,11 @@ var Methods = {
     this.visibleColumn = visibleColumn;
     this.handleTableColumn();
     return this.updateFooter().then(function () {
-      return _this20.recalculate();
+      return _this21.recalculate();
     }).then(function () {
-      _this20.updateCellAreas();
+      _this21.updateCellAreas();
 
-      return _this20.recalculate();
+      return _this21.recalculate();
     });
   },
 
@@ -2449,7 +2471,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this21 = this;
+    var _this22 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -2465,9 +2487,9 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this21.autoCellWidth(headerElem, bodyElem, footerElem);
+          _this22.autoCellWidth(headerElem, bodyElem, footerElem);
 
-          return _this21.computeScrollLoad();
+          return _this22.computeScrollLoad();
         });
       }
     }
@@ -2615,7 +2637,7 @@ var Methods = {
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this22 = this;
+    var _this23 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -2719,7 +2741,7 @@ var Methods = {
 
           if (isGroup && listElem) {
             _xeUtils.default.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this22.getColumnNode(thElem);
+              var colNode = _this23.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -2900,10 +2922,10 @@ var Methods = {
 
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this22.getColumnIndex(column);
+                      var columnIndex = _this23.getColumnIndex(column);
 
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this22.getColumns(columnIndex + _index);
+                        var nextColumn = _this23.getColumns(columnIndex + _index);
 
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
@@ -2953,7 +2975,7 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this23 = this;
+    var _this24 = this;
 
     var evntList = _vXETable.default.interceptor.get(type);
 
@@ -2961,8 +2983,8 @@ var Methods = {
 
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this23.$xegrid,
-        $table: _this23,
+        $grid: _this24.$xegrid,
+        $table: _this24,
         $event: evnt
       }, args)) === false;
     })) {
@@ -2982,7 +3004,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this24 = this;
+    var _this25 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -3043,7 +3065,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this24.height && !_this24.overflowY) {
+                if (!isClearActived && _this25.height && !_this25.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -3054,7 +3076,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this24.clearActived(evnt);
+                    return _this25.clearActived(evnt);
                   });
                 }
               });
@@ -3068,9 +3090,9 @@ var Methods = {
 
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this24.clearCellAreas();
+            _this25.clearCellAreas();
 
-            _this24.clearCopyCellArea();
+            _this25.clearCopyCellArea();
           });
         }
       }
@@ -3105,7 +3127,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this25 = this;
+    var _this26 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
@@ -3120,33 +3142,33 @@ var Methods = {
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        if (keyboardConfig && mouseConfig && mouseOpts.area && _this25.handleKeyboardEvent) {
-          _this25.handleKeyboardEvent(evnt);
+        if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
+          _this26.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation(); // 如果按下了 Esc 键，关闭快捷菜单、筛选
 
-          _this25.closeFilter();
+          _this26.closeFilter();
 
-          _this25.closeMenu();
+          _this26.closeMenu();
 
           if (keyboardConfig && keyboardOpts.isEsc) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               var params = actived.args;
 
-              _this25.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this26.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this25.$nextTick(function () {
-                  return _this25.handleSelected(params, evnt);
+                _this26.$nextTick(function () {
+                  return _this26.handleSelected(params, evnt);
                 });
               }
             }
           }
         }
 
-        _this25.emitEvent('keydown', {}, evnt);
+        _this26.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -3155,27 +3177,27 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this26 = this;
+    var _this27 = this;
 
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        var filterStore = _this26.filterStore,
-            isCtxMenu = _this26.isCtxMenu,
-            ctxMenuStore = _this26.ctxMenuStore,
-            editStore = _this26.editStore,
-            editOpts = _this26.editOpts,
-            editConfig = _this26.editConfig,
-            mouseConfig = _this26.mouseConfig,
-            mouseOpts = _this26.mouseOpts,
-            keyboardConfig = _this26.keyboardConfig,
-            keyboardOpts = _this26.keyboardOpts,
-            treeConfig = _this26.treeConfig,
-            treeOpts = _this26.treeOpts,
-            highlightCurrentRow = _this26.highlightCurrentRow,
-            currentRow = _this26.currentRow,
-            bodyCtxMenu = _this26.bodyCtxMenu,
-            rowOpts = _this26.rowOpts;
+        var filterStore = _this27.filterStore,
+            isCtxMenu = _this27.isCtxMenu,
+            ctxMenuStore = _this27.ctxMenuStore,
+            editStore = _this27.editStore,
+            editOpts = _this27.editOpts,
+            editConfig = _this27.editConfig,
+            mouseConfig = _this27.mouseConfig,
+            mouseOpts = _this27.mouseOpts,
+            keyboardConfig = _this27.keyboardConfig,
+            keyboardOpts = _this27.keyboardOpts,
+            treeConfig = _this27.treeConfig,
+            treeOpts = _this27.treeOpts,
+            highlightCurrentRow = _this27.highlightCurrentRow,
+            currentRow = _this27.currentRow,
+            bodyCtxMenu = _this27.bodyCtxMenu,
+            rowOpts = _this27.rowOpts;
         var selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -3202,7 +3224,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this26.closeFilter();
+            _this27.closeFilter();
           }
 
           return;
@@ -3213,20 +3235,20 @@ var Methods = {
           evnt.preventDefault();
 
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this27.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this26.ctxMenuList);
+            _this27.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this27.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
-          _this26.handleKeyboardEvent(evnt);
+        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
+          _this27.handleKeyboardEvent(evnt);
         } else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
           // 空格键支持选中复选框
           evnt.preventDefault();
 
           if (selected.column.type === 'checkbox') {
-            _this26.handleToggleCheckRowEvent(evnt, selected.args);
+            _this27.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this26.triggerRadioRowEvent(evnt, selected.args);
+            _this27.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && (0, _utils.isEnableConf)(editConfig)) {
           if (!isEditStatus) {
@@ -3235,15 +3257,15 @@ var Methods = {
               evnt.stopPropagation();
               evnt.preventDefault();
 
-              _this26.handleActived(selected.args, evnt);
+              _this27.handleActived(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          _this26._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
-          clearTimeout(_this26.keyCtxTimeout);
-          _this26.keyCtxTimeout = setTimeout(function () {
-            _this26._keyCtx = false;
+          _this27._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          clearTimeout(_this27.keyCtxTimeout);
+          _this27.keyCtxTimeout = setTimeout(function () {
+            _this27._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
@@ -3252,12 +3274,12 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this26.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this27.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this26.$nextTick(function () {
-                  return _this26.handleSelected(params, evnt);
+                _this27.$nextTick(function () {
+                  return _this27.handleSelected(params, evnt);
                 });
               }
             }
@@ -3268,15 +3290,15 @@ var Methods = {
 
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this27.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this26.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this27.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this27.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this26.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this27.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -3287,14 +3309,14 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this26,
+                  $table: _this27,
                   row: targetRow
                 };
 
-                _this26.setTreeExpand(currentRow, true).then(function () {
-                  return _this26.scrollToRow(targetRow);
+                _this27.setTreeExpand(currentRow, true).then(function () {
+                  return _this27.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this26.triggerCurrentRowEvent(evnt, params);
+                  return _this27.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -3303,18 +3325,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this26.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this27.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this26.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this27.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this26.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this27.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this26.moveTabSelected(actived.args, hasShiftKey, evnt);
+            _this27.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
         } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
@@ -3325,10 +3347,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this26.getRowIndex(selected.row),
+                  rowIndex: _this27.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this26.getColumnIndex(selected.column),
-                  $table: _this26
+                  columnIndex: _this27.getColumnIndex(selected.column),
+                  $table: _this27
                 });
               } else {
                 setCellValue(selected.row, selected.column, null);
@@ -3338,21 +3360,21 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this26.getRowIndex(selected.row),
+                    rowIndex: _this27.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this26.getColumnIndex(selected.column),
-                    $table: _this26
+                    columnIndex: _this27.getColumnIndex(selected.column),
+                    $table: _this27
                   });
                 } else {
-                  _this26.handleActived(selected.args, evnt);
+                  _this27.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this26.updateFooter();
+                _this27.updateFooter();
               }
             } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
-              var _XEUtils$findTree = _xeUtils.default.findTree(_this26.afterFullData, function (item) {
+              var _XEUtils$findTree = _xeUtils.default.findTree(_this27.afterFullData, function (item) {
                 return item === currentRow;
               }, treeOpts),
                   parentRow = _XEUtils$findTree.parent;
@@ -3360,14 +3382,14 @@ var Methods = {
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this26,
+                  $table: _this27,
                   row: parentRow
                 };
 
-                _this26.setTreeExpand(parentRow, false).then(function () {
-                  return _this26.scrollToRow(parentRow);
+                _this27.setTreeExpand(parentRow, false).then(function () {
+                  return _this27.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this26.triggerCurrentRowEvent(evnt, params);
+                  return _this27.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -3380,25 +3402,27 @@ var Methods = {
           // 如果是按下非功能键之外允许直接编辑
 
           if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
-            if (!editOpts.activeMethod || editOpts.activeMethod(selected.args)) {
+            if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
+              $table: _this27
+            }))) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this26.getRowIndex(selected.row),
+                  rowIndex: _this27.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this26.getColumnIndex(selected.column),
-                  $table: _this26
+                  columnIndex: _this27.getColumnIndex(selected.column),
+                  $table: _this27
                 });
               } else {
                 setCellValue(selected.row, selected.column, null);
 
-                _this26.handleActived(selected.args, evnt);
+                _this27.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this26.emitEvent('keydown', {}, evnt);
+        _this27.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -3468,12 +3492,12 @@ var Methods = {
     this.recalculate(true);
   },
   handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this27 = this;
+    var _this28 = this;
 
     var tooltipOpts = this.tooltipOpts;
     setTimeout(function () {
-      if (!_this27.tooltipActive) {
-        _this27.closeTooltip();
+      if (!_this28.tooltipActive) {
+        _this28.closeTooltip();
       }
     }, tooltipOpts.leaveDelay);
     return false;
@@ -3484,17 +3508,17 @@ var Methods = {
     this.closeTooltip();
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this28 = this;
+    var _this29 = this;
 
     var tooltipOpts = this.tooltipOpts;
     this.tooltipActive = false;
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        var tooltip = _this28.$refs.tooltip;
+        var tooltip = _this29.$refs.tooltip;
 
         if (tooltip && !tooltip.isHover) {
-          _this28.closeTooltip();
+          _this29.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -3727,14 +3751,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this29 = this;
+    var _this30 = this;
 
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this29.handleSelectRow({
+      return _this30.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -3758,7 +3782,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value) {
-    var _this30 = this;
+    var _this31 = this;
 
     var row = _ref6.row;
     var selection = this.selection,
@@ -3791,7 +3815,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this30.handleCheckboxReserveRow(row, value);
+              _this31.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3865,7 +3889,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this30.handleCheckboxReserveRow(row, value);
+              _this31.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3969,7 +3993,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this31 = this;
+    var _this32 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -4082,11 +4106,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this31, row)] = row;
+            checkboxReserveRowMap[getRowid(_this32, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this31.handleCheckboxReserveRow(row, false);
+            return _this32.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -4109,17 +4133,31 @@ var Methods = {
         checkMethod = checkboxOpts.checkMethod;
 
     if (!checkStrictly) {
+      var disableRows = [];
+      var checkRows = [];
+      var isAllResolve = false;
       var isAllSelected = false;
       var isIndeterminate = false;
 
       if (checkField) {
-        isAllSelected = afterFullData.length && afterFullData.every(checkMethod ? function (row) {
-          return !checkMethod({
+        isAllResolve = afterFullData.every(checkMethod ? function (row) {
+          if (!checkMethod({
             row: row
-          }) || _xeUtils.default.get(row, checkField);
+          })) {
+            disableRows.push(row);
+            return true;
+          }
+
+          if (_xeUtils.default.get(row, checkField)) {
+            checkRows.push(row);
+            return true;
+          }
+
+          return false;
         } : function (row) {
           return _xeUtils.default.get(row, checkField);
         });
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
 
         if (treeConfig) {
           if (halfField) {
@@ -4143,13 +4181,24 @@ var Methods = {
           }
         }
       } else {
-        isAllSelected = afterFullData.length && afterFullData.every(checkMethod ? function (row) {
-          return !checkMethod({
+        isAllResolve = afterFullData.every(checkMethod ? function (row) {
+          if (!checkMethod({
             row: row
-          }) || selection.indexOf(row) > -1;
+          })) {
+            disableRows.push(row);
+            return true;
+          }
+
+          if (selection.indexOf(row) > -1) {
+            checkRows.push(row);
+            return true;
+          }
+
+          return false;
         } : function (row) {
           return selection.indexOf(row) > -1;
         });
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
 
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -4281,7 +4330,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this32 = this;
+    var _this33 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -4296,11 +4345,11 @@ var Methods = {
 
       if (treeConfig) {
         _xeUtils.default.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[getRowid(_this32, row)] = 1;
+          afterFullIdMaps[getRowid(_this33, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[getRowid(_this32, row)] = 1;
+          afterFullIdMaps[getRowid(_this33, row)] = 1;
         });
       }
 
@@ -4366,7 +4415,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this33 = this;
+    var _this34 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -4389,7 +4438,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this33.handleCheckboxReserveRow(row, false);
+        return _this34.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -4681,13 +4730,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this34 = this;
+    var _this35 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this34.handleActived(params, evnt).then(function () {
-        return _this34.checkValidate('change');
+      _this35.handleActived(params, evnt).then(function () {
+        return _this35.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -4790,7 +4839,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this35 = this;
+    var _this36 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -4805,15 +4854,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this35.handleActived(params, evnt).then(function () {
-              return _this35.checkValidate('change');
+            _this36.handleActived(params, evnt).then(function () {
+              return _this36.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this35.checkValidate('change');
+            return _this36.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -4824,7 +4873,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this36 = this;
+    var _this37 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -4841,7 +4890,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this36.getColumnByField(field);
+            var column = _this37.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -4884,7 +4933,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this37 = this;
+    var _this38 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -4917,7 +4966,7 @@ var Methods = {
         var column = field;
 
         if (_xeUtils.default.isString(field)) {
-          column = _this37.getColumnByField(field);
+          column = _this38.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -4926,7 +4975,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this37, column);
+            order = getNextSortOrder(_this38, column);
           }
 
           if (column.order !== order) {
@@ -4990,12 +5039,14 @@ var Methods = {
   getSortColumns: function getSortColumns() {
     var sortList = [];
     this.tableFullColumn.forEach(function (column) {
-      var order = column.order;
+      var property = column.property,
+          order = column.order;
 
       if ((column.sortable || column.remoteSort) && order) {
         sortList.push({
           column: column,
-          property: column.property,
+          field: column.property,
+          property: property,
           order: order
         });
       }
@@ -5077,7 +5128,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this38 = this;
+    var _this39 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -5085,7 +5136,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this38.handleAsyncRowExpand(row);
+        return _this39.handleAsyncRowExpand(row);
       });
     }
 
@@ -5164,29 +5215,29 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this39 = this;
+    var _this40 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this39.expandLazyLoadeds.push(row);
+      _this40.expandLazyLoadeds.push(row);
 
-      _this39.expandOpts.loadMethod({
-        $table: _this39,
+      _this40.expandOpts.loadMethod({
+        $table: _this40,
         row: row,
-        rowIndex: _this39.getRowIndex(row),
-        $rowIndex: _this39.getVMRowIndex(row)
+        rowIndex: _this40.getRowIndex(row),
+        $rowIndex: _this40.getVMRowIndex(row)
       }).catch(function (e) {
         return e;
       }).then(function () {
         rest.expandLoaded = true;
 
-        _xeUtils.default.remove(_this39.expandLazyLoadeds, function (item) {
+        _xeUtils.default.remove(_this40.expandLazyLoadeds, function (item) {
           return item === row;
         });
 
-        _this39.rowExpandeds.push(row);
+        _this40.rowExpandeds.push(row);
 
-        resolve(_this39.$nextTick().then(_this39.recalculate));
+        resolve(_this40.$nextTick().then(_this40.recalculate));
       });
     });
   },
@@ -5199,7 +5250,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this40 = this;
+    var _this41 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -5232,8 +5283,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this40.getRowIndex(row),
-          $rowIndex: _this40.getVMRowIndex(row)
+          rowIndex: _this41.getRowIndex(row),
+          $rowIndex: _this41.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -5244,7 +5295,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this40.handleAsyncRowExpand(row));
+              lazyRests.push(_this41.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -5258,7 +5309,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this40.handleRowExpandReserve(row, expanded);
+          return _this41.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -5279,7 +5330,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this41 = this;
+    var _this42 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -5290,13 +5341,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this41.handleRowExpandReserve(row, false);
+        return _this42.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this41.recalculate();
+        _this42.recalculate();
       }
     });
   },
@@ -5376,7 +5427,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this42 = this;
+    var _this43 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -5386,15 +5437,15 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this42.handleAsyncTreeExpandChilds(row);
+        return _this43.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this42.handleVirtualTreeToList();
+          _this43.handleVirtualTreeToList();
 
-          return _this42.handleTableData();
+          return _this43.handleTableData();
         }
       }).then(function () {
-        return _this42.recalculate();
+        return _this43.recalculate();
       });
     }
 
@@ -5472,7 +5523,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this43 = this;
+    var _this44 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -5486,7 +5537,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this43,
+        $table: _this44,
         row: row
       }).catch(function () {
         return [];
@@ -5502,29 +5553,29 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this43.loadTreeChildren(row, childRecords).then(function (childRows) {
+          _this44.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
 
 
-            if (!checkStrictly && _this43.isCheckedByCheckboxRow(row)) {
-              _this43.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this44.isCheckedByCheckboxRow(row)) {
+              _this44.setCheckboxRow(childRows, true);
             }
 
-            _this43.$nextTick().then(function () {
+            _this44.$nextTick().then(function () {
               if (transform) {
-                return _this43.handleTableData();
+                return _this44.handleTableData();
               }
             }).then(function () {
-              return _this43.recalculate();
+              return _this44.recalculate();
             }).then(function () {
               return resolve();
             });
           });
         } else {
-          _this43.$nextTick().then(function () {
-            return _this43.recalculate();
+          _this44.$nextTick().then(function () {
+            return _this44.recalculate();
           }).then(function () {
             return resolve();
           });
@@ -5562,7 +5613,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this44 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -5610,7 +5661,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this44.handleAsyncTreeExpandChilds(row));
+            result.push(_this45.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -5626,7 +5677,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this44.handleTreeExpandReserve(row, expanded);
+        return _this45.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -5640,14 +5691,14 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this45 = this;
+    var _this46 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this45.handleVirtualTreeToList();
+      _this46.handleVirtualTreeToList();
 
-      return _this45.handleTableData();
+      return _this46.handleTableData();
     }).then(function () {
-      return _this45.recalculate();
+      return _this46.recalculate();
     });
   },
 
@@ -5692,7 +5743,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this46 = this;
+    var _this47 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -5704,19 +5755,19 @@ var Methods = {
 
     if (reserve) {
       _xeUtils.default.eachTree(tableFullData, function (row) {
-        return _this46.handleTreeExpandReserve(row, false);
+        return _this47.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
     return this.handleTableData().then(function () {
       if (transform) {
-        _this46.handleVirtualTreeToList();
+        _this47.handleVirtualTreeToList();
 
-        return _this46.handleTableData();
+        return _this47.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this46.recalculate();
+        _this47.recalculate();
       }
     });
   },
@@ -5846,18 +5897,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this47 = this;
+    var _this48 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this47.sYOpts,
-          sXOpts = _this47.sXOpts,
-          scrollXLoad = _this47.scrollXLoad,
-          scrollYLoad = _this47.scrollYLoad,
-          scrollXStore = _this47.scrollXStore,
-          scrollYStore = _this47.scrollYStore; // 计算 X 逻辑
+      var sYOpts = _this48.sYOpts,
+          sXOpts = _this48.sXOpts,
+          scrollXLoad = _this48.scrollXLoad,
+          scrollYLoad = _this48.scrollYLoad,
+          scrollXStore = _this48.scrollXStore,
+          scrollYStore = _this48.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this47),
+        var _computeVirtualX3 = computeVirtualX(_this48),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? _xeUtils.default.toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
@@ -5865,13 +5916,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this47.updateScrollXData();
+        _this48.updateScrollXData();
       } else {
-        _this47.updateScrollXSpace();
+        _this48.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this47),
+      var _computeVirtualY = computeVirtualY(_this48),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -5883,14 +5934,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this47.updateScrollYData();
+        _this48.updateScrollYData();
       } else {
-        _this47.updateScrollYSpace();
+        _this48.updateScrollYSpace();
       }
 
-      _this47.rowHeight = rowHeight;
+      _this48.rowHeight = rowHeight;
 
-      _this47.$nextTick(_this47.updateStyle);
+      _this48.$nextTick(_this48.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -6004,7 +6055,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this48 = this;
+    var _this49 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -6025,7 +6076,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this48.$nextTick());
+          return resolve(_this49.$nextTick());
         }, 50);
       });
     }
@@ -6076,7 +6127,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this49 = this;
+    var _this50 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -6091,15 +6142,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this49.isTreeExpandByRow(row)) {
-            rests.push(_this49.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this50.isTreeExpandByRow(row)) {
+            rests.push(_this50.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return _tools.DomTools.rowToVisible(_this49, row);
+      return _tools.DomTools.rowToVisible(_this50, row);
     });
   },
 
@@ -6163,29 +6214,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this50 = this;
+    var _this51 = this;
 
     var customVal = !_xeUtils.default.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this50.$refs,
-          editRules = _this50.editRules,
-          validStore = _this50.validStore;
+      var $refs = _this51.$refs,
+          editRules = _this51.editRules,
+          validStore = _this51.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this50.hasCellRules(type, row, column)) {
-          var cell = _this50.getCell(row, column);
+        if (_this51.hasCellRules(type, row, column)) {
+          var cell = _this51.getCell(row, column);
 
           if (cell) {
-            return _this50.validCellRules(type, row, column, cellValue).then(function () {
+            return _this51.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
 
-              _this50.clearValidate();
+              _this51.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -6193,7 +6244,7 @@ var Methods = {
                 setCellValue(row, column, cellValue);
               }
 
-              _this50.showValidTooltip({
+              _this51.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -6214,7 +6265,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this51 = this;
+    var _this52 = this;
 
     if (this.spanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6222,7 +6273,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this51.updateCellAreas();
+      return _this52.updateCellAreas();
     });
   },
 
@@ -6231,7 +6282,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this52 = this;
+    var _this53 = this;
 
     if (this.spanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6239,7 +6290,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this52.updateCellAreas();
+      _this53.updateCellAreas();
 
       return rest;
     });
@@ -6263,7 +6314,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this53 = this;
+    var _this54 = this;
 
     if (this.footerSpanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6271,11 +6322,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this53.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this55 = this;
 
     if (this.footerSpanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6283,7 +6334,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this54.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -6426,7 +6477,7 @@ var Methods = {
   }
 }; // Module methods
 
-var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
+var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
     if (process.env.NODE_ENV === 'development') {