vxe-table 3.4.4 → 3.4.7-beta.1

package/lib/table/src/methods.js

@@ -439,10 +439,46 @@ var Methods = {
     return this.handleTableData(true).then(this.updateFooter).then(this.recalculate);
   },
   handleTableData: function handleTableData(force) {
-    var scrollYLoad = this.scrollYLoad,
-        scrollYStore = this.scrollYStore;
-    var fullData = force ? this.updateAfterFullData() : this.afterFullData;
-    this.tableData = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+    var _this2 = this;
+
+    var treeConfig = this.treeConfig,
+        scrollYLoad = this.scrollYLoad,
+        scrollYStore = this.scrollYStore,
+        fullDataRowIdData = this.fullDataRowIdData,
+        treeExpandeds = this.treeExpandeds,
+        treeOpts = this.treeOpts;
+    var fullList = []; // 是否进行数据处理
+
+    if (force) {
+      this.updateAfterFullData();
+    } // 如果为虚拟树，将树结构拍平
+
+
+    if (treeConfig && treeOpts.transform) {
+      var expandMaps = new Map();
+
+      _xeUtils.default.eachTree(this.afterTreeFullData, function (row, index, items, path, parent) {
+        if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
+          expandMaps.set(row, 1);
+          fullList.push(row);
+        }
+      }, {
+        children: treeOpts.mapChildren
+      });
+    } else {
+      fullList = this.afterFullData;
+    }
+
+    var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+    tableData.forEach(function (row, $index) {
+      var rowid = getRowid(_this2, row);
+      var rest = fullDataRowIdData[rowid];
+
+      if (rest) {
+        rest.$index = $index;
+      }
+    });
+    this.tableData = tableData;
     return this.$nextTick();
   },
   updateScrollYStatus: function updateScrollYStatus(fullData) {
@@ -460,7 +496,7 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadTableData: function loadTableData(datas) {
-    var _this2 = this;
+    var _this3 = this;
 
     var keepSource = this.keepSource,
         treeConfig = this.treeConfig,
@@ -490,6 +526,14 @@ var Methods = {
             _tools.UtilTools.error('vxe.error.reqProp', ['tree-config.children']);
           }
 
+          if (!treeOpts.mapChildren) {
+            _tools.UtilTools.error('vxe.error.reqProp', ['tree-config.mapChildren']);
+          }
+
+          if (treeOpts.children === treeOpts.mapChildren) {
+            _tools.UtilTools.error('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+          }
+
           fullData.forEach(function (row) {
             if (row[treeOpts.children] && row[treeOpts.children].length) {
               _tools.UtilTools.warn('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
@@ -500,7 +544,8 @@ var Methods = {
         treeData = _xeUtils.default.toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children
+          children: treeOpts.children,
+          mapChildren: treeOpts.mapChildren
         });
         fullData = treeData.slice(0);
       } else {
@@ -518,7 +563,7 @@ var Methods = {
     this.scrollYLoad = sYLoad; // 全量数据
 
     this.tableFullData = fullData;
-    this.treeFullData = treeData; // 缓存数据
+    this.tableFullTreeData = treeData; // 缓存数据
 
     this.cacheRowMap(true); // 原始数据
 
@@ -554,31 +599,31 @@ var Methods = {
     this.handleTableData(true);
     this.updateFooter();
     return this.$nextTick().then(function () {
-      _this2.updateHeight();
+      _this3.updateHeight();
 
-      _this2.updateStyle();
+      _this3.updateStyle();
     }).then(function () {
-      _this2.computeScrollLoad();
+      _this3.computeScrollLoad();
     }).then(function () {
       // 是否启用了虚拟滚动
       if (sYLoad) {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
 
-      _this2.handleReserveStatus();
+      _this3.handleReserveStatus();
 
-      _this2.checkSelectionStatus();
+      _this3.checkSelectionStatus();
 
       return new Promise(function (resolve) {
-        _this2.$nextTick().then(function () {
-          return _this2.recalculate();
+        _this3.$nextTick().then(function () {
+          return _this3.recalculate();
         }).then(function () {
           // 是否变更虚拟滚动
           if (oldScrollYLoad === sYLoad) {
-            (0, _util.restoreScrollLocation)(_this2, lastScrollLeft, lastScrollTop).then(resolve);
+            (0, _util.restoreScrollLocation)(_this3, lastScrollLeft, lastScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return (0, _util.restoreScrollLocation)(_this2, lastScrollLeft, lastScrollTop).then(resolve);
+              return (0, _util.restoreScrollLocation)(_this3, lastScrollLeft, lastScrollTop).then(resolve);
             });
           }
         });
@@ -591,23 +636,23 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadData: function loadData(datas) {
-    var _this3 = this;
+    var _this4 = this;
 
     var inited = this.inited,
         initStatus = this.initStatus;
     return this.loadTableData(datas).then(function () {
-      _this3.inited = true;
-      _this3.initStatus = true;
+      _this4.inited = true;
+      _this4.initStatus = true;
 
       if (!initStatus) {
-        _this3.handleLoadDefaults();
+        _this4.handleLoadDefaults();
       }
 
       if (!inited) {
-        _this3.handleInitDefaults();
+        _this4.handleInitDefaults();
       }
 
-      return _this3.recalculate();
+      return _this4.recalculate();
     });
   },
 
@@ -616,21 +661,21 @@ var Methods = {
    * @param {Array} datas 数据
    */
   reloadData: function reloadData(datas) {
-    var _this4 = this;
+    var _this5 = this;
 
     var inited = this.inited;
     return this.clearAll().then(function () {
-      _this4.inited = true;
-      _this4.initStatus = true;
-      return _this4.loadTableData(datas);
+      _this5.inited = true;
+      _this5.initStatus = true;
+      return _this5.loadTableData(datas);
     }).then(function () {
-      _this4.handleLoadDefaults();
+      _this5.handleLoadDefaults();
 
       if (!inited) {
-        _this4.handleInitDefaults();
+        _this5.handleInitDefaults();
       }
 
-      return _this4.recalculate();
+      return _this5.recalculate();
     });
   },
 
@@ -680,10 +725,10 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   loadColumn: function loadColumn(columns) {
-    var _this5 = this;
+    var _this6 = this;
 
     var collectColumn = _xeUtils.default.mapTree(columns, function (column) {
-      return _cell.default.createColumn(_this5, column);
+      return _cell.default.createColumn(_this6, column);
     }, {
       children: 'children'
     });
@@ -697,14 +742,14 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   reloadColumn: function reloadColumn(columns) {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.clearAll().then(function () {
-      return _this6.loadColumn(columns);
+      return _this7.loadColumn(columns);
     });
   },
   handleColumn: function handleColumn(collectColumn) {
-    var _this7 = this;
+    var _this8 = this;
 
     this.collectColumn = collectColumn;
     var tableFullColumn = getColumnList(collectColumn);
@@ -712,8 +757,8 @@ var Methods = {
     this.cacheColumnMap();
     this.restoreCustomStorage();
     this.parseColumns().then(function () {
-      if (_this7.scrollXLoad) {
-        _this7.loadScrollXData(true);
+      if (_this8.scrollXLoad) {
+        _this8.loadScrollXData(true);
       }
     });
     this.clearMergeCells();
@@ -727,14 +772,14 @@ var Methods = {
     }
 
     return this.$nextTick().then(function () {
-      if (_this7.$toolbar) {
-        _this7.$toolbar.syncUpdate({
+      if (_this8.$toolbar) {
+        _this8.$toolbar.syncUpdate({
           collectColumn: collectColumn,
-          $table: _this7
+          $table: _this8
         });
       }
 
-      return _this7.recalculate();
+      return _this8.recalculate();
     });
   },
 
@@ -743,20 +788,23 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap: function cacheRowMap(source) {
-    var _this8 = this;
+    var _this9 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         tableFullData = this.tableFullData,
         fullDataRowMap = this.fullDataRowMap,
-        fullAllDataRowMap = this.fullAllDataRowMap;
+        fullAllDataRowMap = this.fullAllDataRowMap,
+        tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
         fullAllDataRowIdData = this.fullAllDataRowIdData;
     var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = getRowid(_this8, row);
+      var rowid = getRowid(_this9, row);
+      var seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
+      var level = nodes ? nodes.length - 1 : 0;
 
       if ((0, _utils.eqEmptyValue)(rowid)) {
         rowid = getRowUniqueId();
@@ -771,10 +819,13 @@ var Methods = {
       var rest = {
         row: row,
         rowid: rowid,
+        seq: seq,
         index: treeConfig && parent ? -1 : index,
+        _index: -1,
+        $index: -1,
         items: items,
         parent: parent,
-        level: nodes ? nodes.length - 1 : 0
+        level: level
       };
 
       if (source) {
@@ -795,13 +846,13 @@ var Methods = {
     fullAllDataRowMap.clear();
 
     if (treeConfig) {
-      _xeUtils.default.eachTree(tableFullData, handleCache, treeOpts);
+      _xeUtils.default.eachTree(tableFullTreeData, handleCache, treeOpts);
     } else {
       tableFullData.forEach(handleCache);
     }
   },
   loadTreeChildren: function loadTreeChildren(row, childRecords) {
-    var _this9 = this;
+    var _this10 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -815,10 +866,10 @@ var Methods = {
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = getRowid(_this9, row);
+        var rowid = getRowid(_this10, row);
 
         var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this9, item);
+          return rowid === getRowid(_this10, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -827,11 +878,14 @@ var Methods = {
       }
 
       _xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = getRowid(_this9, childRow);
+        var rowid = getRowid(_this10, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
+          seq: -1,
           index: -1,
+          _index: -1,
+          $index: -1,
           items: items,
           parent: parent,
           level: parentLevel + nodes.length
@@ -852,7 +906,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this10 = this;
+    var _this11 = this;
 
     var tableFullColumn = this.tableFullColumn,
         collectColumn = this.collectColumn,
@@ -939,16 +993,16 @@ var Methods = {
       }
 
       if (process.env.NODE_ENV === 'development') {
-        if (_this10.showOverflow && column.showOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-overflow=".concat(_this10.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
+        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 (_this10.showHeaderOverflow && column.showHeaderOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this10.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
+        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 (_this10.showFooterOverflow && column.showFooterOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this10.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
+        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)]);
         }
       }
 
@@ -1035,6 +1089,25 @@ var Methods = {
     return null;
   },
 
+  /**
+   * 根据 row 获取序号
+   * @param {Row} row 行对象
+   */
+  getRowSeq: function getRowSeq(row) {
+    var fullDataRowIdData = this.fullDataRowIdData;
+
+    if (row) {
+      var rowid = getRowid(this, row);
+      var rest = fullDataRowIdData[rowid];
+
+      if (rest) {
+        return rest.seq;
+      }
+    }
+
+    return -1;
+  },
+
   /**
    * 根据 row 获取相对于 data 中的索引
    * @param {Row} row 行对象
@@ -1181,13 +1254,13 @@ var Methods = {
    * @param {Array} records 新数据
    */
   createData: function createData(records) {
-    var _this11 = this;
+    var _this12 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
 
     var handleRrecord = function handleRrecord(record) {
-      return _this11.defineField(Object.assign({}, record));
+      return _this12.defineField(Object.assign({}, record));
     };
 
     var rows = treeConfig ? _xeUtils.default.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
@@ -1202,7 +1275,7 @@ var Methods = {
    * @param {Array/Object} records 新数据
    */
   createRow: function createRow(records) {
-    var _this12 = this;
+    var _this13 = this;
 
     var isArr = _xeUtils.default.isArray(records);
 
@@ -1211,7 +1284,7 @@ var Methods = {
     }
 
     return this.$nextTick().then(function () {
-      return _this12.createData(records).then(function (rows) {
+      return _this13.createData(records).then(function (rows) {
         return isArr ? rows : rows[0];
       });
     });
@@ -1225,7 +1298,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this13 = this;
+    var _this14 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -1251,8 +1324,8 @@ var Methods = {
 
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this13.isInsertByRow(row)) {
-          var rowIndex = _this13.getRowIndex(row);
+        if (!_this14.isInsertByRow(row)) {
+          var rowIndex = _this14.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
             throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['revertData']));
@@ -1336,7 +1409,7 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this14 = this;
+    var _this15 = this;
 
     var visibleColumn = this.visibleColumn,
         keepSource = this.keepSource,
@@ -1357,7 +1430,7 @@ var Methods = {
         var children = treeOpts.children;
 
         var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this14, item);
+          return rowid === getRowid(_this15, item);
         }, treeOpts);
 
         row = Object.assign({}, row, _defineProperty({}, children, null));
@@ -1481,18 +1554,23 @@ var Methods = {
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData: function updateAfterFullData() {
-    var _this15 = this;
+    var _this16 = this;
 
     var tableFullColumn = this.tableFullColumn,
         tableFullData = this.tableFullData,
         filterOpts = this.filterOpts,
-        sortOpts = this.sortOpts;
+        sortOpts = this.sortOpts,
+        treeConfig = this.treeConfig,
+        treeOpts = this.treeOpts,
+        tableFullTreeData = this.tableFullTreeData;
     var allRemoteFilter = filterOpts.remote,
         allFilterMethod = filterOpts.filterMethod;
     var allRemoteSort = sortOpts.remote,
         allSortMethod = sortOpts.sortMethod,
         sortMultiple = sortOpts.multiple;
-    var tableData = tableFullData.slice(0);
+    var transform = treeOpts.transform;
+    var tableData = [];
+    var tableTree = [];
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
@@ -1529,7 +1607,7 @@ var Methods = {
     });
 
     if (filterColumns.length) {
-      tableData = tableData.filter(function (row) {
+      var handleFilter = function handleFilter(row) {
         return filterColumns.every(function (_ref) {
           var column = _ref.column,
               valueList = _ref.valueList,
@@ -1552,7 +1630,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this15
+                  $table: _this16
                 });
               });
             } else if (compFilterMethod) {
@@ -1563,7 +1641,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this15
+                  $table: _this16
                 });
               });
             } else if (allFilterMethod) {
@@ -1582,7 +1660,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this15
+                  $table: _this16
                 });
               });
             }
@@ -1592,7 +1670,19 @@ var Methods = {
 
           return true;
         });
-      });
+      };
+
+      if (treeConfig && transform) {
+        tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, _objectSpread(_objectSpread({}, treeOpts), {}, {
+          original: true
+        }));
+      } else {
+        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+        tableTree = tableData;
+      }
+    } else {
+      tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+      tableTree = tableData;
     }
 
     var firstOrderColumn = orderColumns[0];
@@ -1614,7 +1704,7 @@ var Methods = {
           tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(function (_ref2) {
             var column = _ref2.column,
                 order = _ref2.order;
-            return [getOrderField(_this15, column), order];
+            return [getOrderField(_this16, column), order];
           }));
         } else {
           // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
@@ -1629,14 +1719,113 @@ var Methods = {
           tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref3) {
             var column = _ref3.column,
                 order = _ref3.order;
-            return [getOrderField(_this15, column), order];
+            return [getOrderField(_this16, column), order];
           }));
         }
       }
+
+      tableTree = tableData;
     }
 
     this.afterFullData = tableData;
-    return tableData;
+    this.afterTreeFullData = tableTree;
+    this.updateAfterDataIndex();
+  },
+
+  /**
+   * 预编译
+   * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
+   */
+  updateAfterDataIndex: function updateAfterDataIndex() {
+    var _this17 = this;
+
+    var treeConfig = this.treeConfig,
+        afterFullData = this.afterFullData,
+        fullDataRowIdData = this.fullDataRowIdData,
+        fullAllDataRowIdData = this.fullAllDataRowIdData,
+        afterTreeFullData = this.afterTreeFullData,
+        treeOpts = this.treeOpts;
+
+    if (treeConfig) {
+      _xeUtils.default.eachTree(afterTreeFullData, function (row, index, items, path) {
+        var rowid = getRowid(_this17, row);
+        var allrest = fullAllDataRowIdData[rowid];
+        var fullrest = fullDataRowIdData[rowid];
+        var seq = path.map(function (num, i) {
+          return i % 2 === 0 ? Number(num) + 1 : '.';
+        }).join('');
+
+        if (allrest) {
+          allrest.seq = seq;
+        }
+
+        if (fullrest) {
+          fullrest.seq = seq;
+        } else {
+          fullAllDataRowIdData[rowid] = {
+            row: row,
+            rowid: rowid,
+            seq: seq,
+            index: -1,
+            $index: -1,
+            _index: index,
+            items: [],
+            parent: null,
+            level: 0
+          };
+          fullDataRowIdData[rowid] = {
+            row: row,
+            rowid: rowid,
+            seq: seq,
+            index: -1,
+            $index: -1,
+            _index: index,
+            items: [],
+            parent: null,
+            level: 0
+          };
+        }
+      }, treeOpts);
+    } else {
+      afterFullData.forEach(function (row, index) {
+        var rowid = getRowid(_this17, row);
+        var allrest = fullAllDataRowIdData[rowid];
+        var fullrest = fullDataRowIdData[rowid];
+        var seq = index + 1;
+
+        if (allrest) {
+          allrest.seq = seq;
+        }
+
+        if (fullrest) {
+          fullrest.seq = seq;
+          fullrest._index = index;
+        } else {
+          fullAllDataRowIdData[rowid] = {
+            row: row,
+            rowid: rowid,
+            seq: seq,
+            index: -1,
+            $index: -1,
+            _index: index,
+            items: [],
+            parent: null,
+            level: 0
+          };
+          fullDataRowIdData[rowid] = {
+            row: row,
+            rowid: rowid,
+            seq: seq,
+            index: -1,
+            $index: -1,
+            _index: index,
+            items: [],
+            parent: null,
+            level: 0
+          };
+        }
+      });
+    }
   },
 
   /**
@@ -1680,7 +1869,7 @@ var Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults: function handleLoadDefaults() {
-    var _this16 = this;
+    var _this18 = this;
 
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
@@ -1707,7 +1896,7 @@ var Methods = {
     }
 
     this.$nextTick(function () {
-      return setTimeout(_this16.recalculate);
+      return setTimeout(_this18.recalculate);
     });
   },
 
@@ -1964,12 +2153,12 @@ var Methods = {
    * 刷新列配置
    */
   refreshColumn: function refreshColumn() {
-    var _this17 = this;
+    var _this19 = this;
 
     return this.parseColumns().then(function () {
-      return _this17.refreshScroll();
+      return _this19.refreshScroll();
     }).then(function () {
-      return _this17.recalculate();
+      return _this19.recalculate();
     });
   },
 
@@ -1978,7 +2167,7 @@ var Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns: function parseColumns() {
-    var _this18 = this;
+    var _this20 = this;
 
     var leftList = [];
     var centerList = [];
@@ -2105,11 +2294,11 @@ var Methods = {
     this.visibleColumn = visibleColumn;
     this.handleTableColumn();
     return this.updateFooter().then(function () {
-      return _this18.recalculate();
+      return _this20.recalculate();
     }).then(function () {
-      _this18.updateCellAreas();
+      _this20.updateCellAreas();
 
-      return _this18.recalculate();
+      return _this20.recalculate();
     });
   },
 
@@ -2193,7 +2382,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this19 = this;
+    var _this21 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -2209,9 +2398,9 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this19.autoCellWidth(headerElem, bodyElem, footerElem);
+          _this21.autoCellWidth(headerElem, bodyElem, footerElem);
 
-          return _this19.computeScrollLoad();
+          return _this21.computeScrollLoad();
         });
       }
     }
@@ -2359,7 +2548,7 @@ var Methods = {
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this20 = this;
+    var _this22 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -2463,7 +2652,7 @@ var Methods = {
 
           if (isGroup && listElem) {
             _xeUtils.default.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this20.getColumnNode(thElem);
+              var colNode = _this22.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -2644,10 +2833,10 @@ var Methods = {
 
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this20.getColumnIndex(column);
+                      var columnIndex = _this22.getColumnIndex(column);
 
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this20.getColumns(columnIndex + _index);
+                        var nextColumn = _this22.getColumns(columnIndex + _index);
 
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
@@ -2697,7 +2886,7 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this21 = this;
+    var _this23 = this;
 
     var evntList = _vXETable.default.interceptor.get(type);
 
@@ -2705,8 +2894,8 @@ var Methods = {
 
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this21.$xegrid,
-        $table: _this21,
+        $grid: _this23.$xegrid,
+        $table: _this23,
         $event: evnt
       }, args)) === false;
     })) {
@@ -2726,7 +2915,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this22 = this;
+    var _this24 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -2787,7 +2976,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this22.height && !_this22.overflowY) {
+                if (!isClearActived && _this24.height && !_this24.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -2798,7 +2987,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this22.clearActived(evnt);
+                    return _this24.clearActived(evnt);
                   });
                 }
               });
@@ -2812,9 +3001,9 @@ var Methods = {
 
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this22.clearCellAreas();
+            _this24.clearCellAreas();
 
-            _this22.clearCopyCellArea();
+            _this24.clearCopyCellArea();
           });
         }
       }
@@ -2849,45 +3038,48 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this23 = this;
+    var _this25 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
         editStore = this.editStore,
         keyboardConfig = this.keyboardConfig,
         mouseConfig = this.mouseConfig,
-        mouseOpts = this.mouseOpts;
+        mouseOpts = this.mouseOpts,
+        keyboardOpts = this.keyboardOpts;
     var actived = editStore.actived;
     var keyCode = evnt.keyCode;
     var isEsc = keyCode === 27;
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        if (keyboardConfig && mouseConfig && mouseOpts.area && _this23.handleKeyboardEvent) {
-          _this23.handleKeyboardEvent(evnt);
+        if (keyboardConfig && mouseConfig && mouseOpts.area && _this25.handleKeyboardEvent) {
+          _this25.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation(); // 如果按下了 Esc 键，关闭快捷菜单、筛选
 
-          _this23.closeFilter();
-
-          _this23.closeMenu(); // 如果是激活编辑状态，则取消编辑
+          _this25.closeFilter();
 
+          _this25.closeMenu();
 
-          if (actived.row) {
-            var params = actived.args;
+          if (keyboardConfig && keyboardOpts.isEsc) {
+            // 如果是激活编辑状态，则取消编辑
+            if (actived.row) {
+              var params = actived.args;
 
-            _this23.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this25.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
-            if (mouseConfig && mouseOpts.selected) {
-              _this23.$nextTick(function () {
-                return _this23.handleSelected(params, evnt);
-              });
+              if (mouseConfig && mouseOpts.selected) {
+                _this25.$nextTick(function () {
+                  return _this25.handleSelected(params, evnt);
+                });
+              }
             }
           }
         }
 
-        _this23.emitEvent('keydown', {}, evnt);
+        _this25.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -2896,27 +3088,27 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this24 = this;
+    var _this26 = this;
 
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        var filterStore = _this24.filterStore,
-            isCtxMenu = _this24.isCtxMenu,
-            ctxMenuStore = _this24.ctxMenuStore,
-            editStore = _this24.editStore,
-            editOpts = _this24.editOpts,
-            editConfig = _this24.editConfig,
-            mouseConfig = _this24.mouseConfig,
-            mouseOpts = _this24.mouseOpts,
-            keyboardConfig = _this24.keyboardConfig,
-            keyboardOpts = _this24.keyboardOpts,
-            treeConfig = _this24.treeConfig,
-            treeOpts = _this24.treeOpts,
-            highlightCurrentRow = _this24.highlightCurrentRow,
-            currentRow = _this24.currentRow,
-            bodyCtxMenu = _this24.bodyCtxMenu,
-            rowOpts = _this24.rowOpts;
+        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 selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -2943,7 +3135,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this24.closeFilter();
+            _this26.closeFilter();
           }
 
           return;
@@ -2954,20 +3146,20 @@ var Methods = {
           evnt.preventDefault();
 
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this24.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this24.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this24.ctxMenuList);
+            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this26.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this24.handleKeyboardEvent) {
-          _this24.handleKeyboardEvent(evnt);
+        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
+          _this26.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') {
-            _this24.handleToggleCheckRowEvent(evnt, selected.args);
+            _this26.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this24.triggerRadioRowEvent(evnt, selected.args);
+            _this26.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && (0, _utils.isEnableConf)(editConfig)) {
           if (!isEditStatus) {
@@ -2976,15 +3168,15 @@ var Methods = {
               evnt.stopPropagation();
               evnt.preventDefault();
 
-              _this24.handleActived(selected.args, evnt);
+              _this26.handleActived(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          _this24._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
-          clearTimeout(_this24.keyCtxTimeout);
-          _this24.keyCtxTimeout = setTimeout(function () {
-            _this24._keyCtx = false;
+          _this26._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          clearTimeout(_this26.keyCtxTimeout);
+          _this26.keyCtxTimeout = setTimeout(function () {
+            _this26._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
@@ -2993,12 +3185,12 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this24.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this26.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this24.$nextTick(function () {
-                  return _this24.handleSelected(params, evnt);
+                _this26.$nextTick(function () {
+                  return _this26.handleSelected(params, evnt);
                 });
               }
             }
@@ -3009,15 +3201,15 @@ var Methods = {
 
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this24.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this24.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this26.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this24.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this24.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this26.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -3028,14 +3220,14 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this24,
+                  $table: _this26,
                   row: targetRow
                 };
 
-                _this24.setTreeExpand(currentRow, true).then(function () {
-                  return _this24.scrollToRow(targetRow);
+                _this26.setTreeExpand(currentRow, true).then(function () {
+                  return _this26.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this24.triggerCurrentRowEvent(evnt, params);
+                  return _this26.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -3044,18 +3236,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this24.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this26.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this24.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this26.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this24.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this26.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this24.moveTabSelected(actived.args, hasShiftKey, evnt);
+            _this26.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
         } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
@@ -3066,10 +3258,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this24.getRowIndex(selected.row),
+                  rowIndex: _this26.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this24.getColumnIndex(selected.column),
-                  $table: _this24
+                  columnIndex: _this26.getColumnIndex(selected.column),
+                  $table: _this26
                 });
               } else {
                 setCellValue(selected.row, selected.column, null);
@@ -3079,21 +3271,21 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this24.getRowIndex(selected.row),
+                    rowIndex: _this26.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this24.getColumnIndex(selected.column),
-                    $table: _this24
+                    columnIndex: _this26.getColumnIndex(selected.column),
+                    $table: _this26
                   });
                 } else {
-                  _this24.handleActived(selected.args, evnt);
+                  _this26.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this24.updateFooter();
+                _this26.updateFooter();
               }
             } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
-              var _XEUtils$findTree = _xeUtils.default.findTree(_this24.afterFullData, function (item) {
+              var _XEUtils$findTree = _xeUtils.default.findTree(_this26.afterFullData, function (item) {
                 return item === currentRow;
               }, treeOpts),
                   parentRow = _XEUtils$findTree.parent;
@@ -3101,14 +3293,14 @@ var Methods = {
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this24,
+                  $table: _this26,
                   row: parentRow
                 };
 
-                _this24.setTreeExpand(parentRow, false).then(function () {
-                  return _this24.scrollToRow(parentRow);
+                _this26.setTreeExpand(parentRow, false).then(function () {
+                  return _this26.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this24.triggerCurrentRowEvent(evnt, params);
+                  return _this26.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -3125,21 +3317,21 @@ var Methods = {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this24.getRowIndex(selected.row),
+                  rowIndex: _this26.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this24.getColumnIndex(selected.column),
-                  $table: _this24
+                  columnIndex: _this26.getColumnIndex(selected.column),
+                  $table: _this26
                 });
               } else {
                 setCellValue(selected.row, selected.column, null);
 
-                _this24.handleActived(selected.args, evnt);
+                _this26.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this24.emitEvent('keydown', {}, evnt);
+        _this26.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -3209,12 +3401,12 @@ var Methods = {
     this.recalculate(true);
   },
   handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this25 = this;
+    var _this27 = this;
 
     var tooltipOpts = this.tooltipOpts;
     setTimeout(function () {
-      if (!_this25.tooltipActive) {
-        _this25.closeTooltip();
+      if (!_this27.tooltipActive) {
+        _this27.closeTooltip();
       }
     }, tooltipOpts.leaveDelay);
     return false;
@@ -3225,17 +3417,17 @@ var Methods = {
     this.closeTooltip();
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this26 = this;
+    var _this28 = this;
 
     var tooltipOpts = this.tooltipOpts;
     this.tooltipActive = false;
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        var tooltip = _this26.$refs.tooltip;
+        var tooltip = _this28.$refs.tooltip;
 
         if (tooltip && !tooltip.isHover) {
-          _this26.closeTooltip();
+          _this28.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -3468,14 +3660,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this27 = this;
+    var _this29 = this;
 
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this27.handleSelectRow({
+      return _this29.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -3499,7 +3691,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref5, value) {
-    var _this28 = this;
+    var _this30 = this;
 
     var row = _ref5.row;
     var selection = this.selection,
@@ -3532,7 +3724,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this28.handleCheckboxReserveRow(row, value);
+              _this30.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3606,7 +3798,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this28.handleCheckboxReserveRow(row, value);
+              _this30.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3710,7 +3902,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this29 = this;
+    var _this31 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -3823,11 +4015,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this29, row)] = row;
+            checkboxReserveRowMap[getRowid(_this31, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this29.handleCheckboxReserveRow(row, false);
+            return _this31.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -4022,7 +4214,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this30 = this;
+    var _this32 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -4033,6 +4225,18 @@ var Methods = {
     var reserveSelection = [];
 
     if (checkboxOpts.reserve) {
+      var afterFullIdMaps = {};
+
+      if (treeConfig) {
+        _xeUtils.default.eachTree(afterFullData, function (row) {
+          afterFullIdMaps[getRowid(_this32, row)] = 1;
+        }, treeOpts);
+      } else {
+        afterFullData.forEach(function (row) {
+          afterFullIdMaps[getRowid(_this32, row)] = 1;
+        });
+      }
+
       _xeUtils.default.each(checkboxReserveRowMap, function (oldRow, oldRowid) {
         if (oldRow) {
           if (isFull) {
@@ -4040,18 +4244,8 @@ var Methods = {
               reserveSelection.push(oldRow);
             }
           } else {
-            if (treeConfig) {
-              if (!_xeUtils.default.findTree(afterFullData, function (row) {
-                return getRowid(_this30, row) === oldRowid;
-              }, treeOpts)) {
-                reserveSelection.push(oldRow);
-              }
-            } else {
-              if (!afterFullData.some(function (row) {
-                return getRowid(_this30, row) === oldRowid;
-              })) {
-                reserveSelection.push(oldRow);
-              }
+            if (!afterFullIdMaps[oldRowid]) {
+              reserveSelection.push(oldRow);
             }
           }
         }
@@ -4105,7 +4299,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this31 = this;
+    var _this33 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -4128,7 +4322,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this31.handleCheckboxReserveRow(row, false);
+        return _this33.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -4420,13 +4614,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this32 = this;
+    var _this34 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this32.handleActived(params, evnt).then(function () {
-        return _this32.checkValidate('change');
+      _this34.handleActived(params, evnt).then(function () {
+        return _this34.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -4529,7 +4723,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this33 = this;
+    var _this35 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -4544,15 +4738,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this33.handleActived(params, evnt).then(function () {
-              return _this33.checkValidate('change');
+            _this35.handleActived(params, evnt).then(function () {
+              return _this35.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this33.checkValidate('change');
+            return _this35.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -4563,7 +4757,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this34 = this;
+    var _this36 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -4580,7 +4774,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this34.getColumnByField(field);
+            var column = _this36.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -4623,7 +4817,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this35 = this;
+    var _this37 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -4656,7 +4850,7 @@ var Methods = {
         var column = field;
 
         if (_xeUtils.default.isString(field)) {
-          column = _this35.getColumnByField(field);
+          column = _this37.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -4665,7 +4859,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this35, column);
+            order = getNextSortOrder(_this37, column);
           }
 
           if (column.order !== order) {
@@ -4816,7 +5010,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this36 = this;
+    var _this38 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -4824,7 +5018,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this36.handleAsyncRowExpand(row);
+        return _this38.handleAsyncRowExpand(row);
       });
     }
 
@@ -4903,29 +5097,29 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this37 = this;
+    var _this39 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this37.expandLazyLoadeds.push(row);
+      _this39.expandLazyLoadeds.push(row);
 
-      _this37.expandOpts.loadMethod({
-        $table: _this37,
+      _this39.expandOpts.loadMethod({
+        $table: _this39,
         row: row,
-        rowIndex: _this37.getRowIndex(row),
-        $rowIndex: _this37.getVMRowIndex(row)
+        rowIndex: _this39.getRowIndex(row),
+        $rowIndex: _this39.getVMRowIndex(row)
       }).catch(function (e) {
         return e;
       }).then(function () {
         rest.expandLoaded = true;
 
-        _xeUtils.default.remove(_this37.expandLazyLoadeds, function (item) {
+        _xeUtils.default.remove(_this39.expandLazyLoadeds, function (item) {
           return item === row;
         });
 
-        _this37.rowExpandeds.push(row);
+        _this39.rowExpandeds.push(row);
 
-        resolve(_this37.$nextTick().then(_this37.recalculate));
+        resolve(_this39.$nextTick().then(_this39.recalculate));
       });
     });
   },
@@ -4938,7 +5132,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this38 = this;
+    var _this40 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -4971,8 +5165,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this38.getRowIndex(row),
-          $rowIndex: _this38.getVMRowIndex(row)
+          rowIndex: _this40.getRowIndex(row),
+          $rowIndex: _this40.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -4983,7 +5177,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this38.handleAsyncRowExpand(row));
+              lazyRests.push(_this40.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -4997,7 +5191,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this38.handleRowExpandReserve(row, expanded);
+          return _this40.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -5018,7 +5212,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this39 = this;
+    var _this41 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -5029,13 +5223,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this39.handleRowExpandReserve(row, false);
+        return _this41.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this39.recalculate();
+        _this41.recalculate();
       }
     });
   },
@@ -5109,7 +5303,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this40 = this;
+    var _this42 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -5119,13 +5313,13 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this40.handleAsyncTreeExpandChilds(row);
+        return _this42.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          return _this40.updateVirtualTreeData();
+          return _this42.handleTableData();
         }
       }).then(function () {
-        return _this40.recalculate();
+        return _this42.recalculate();
       });
     }
 
@@ -5203,7 +5397,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this41 = this;
+    var _this43 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -5216,7 +5410,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this41,
+        $table: _this43,
         row: row
       }).catch(function () {
         return [];
@@ -5232,19 +5426,19 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this41.loadTreeChildren(row, childRecords).then(function (childRows) {
+          _this43.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
 
 
-            if (!checkStrictly && _this41.isCheckedByCheckboxRow(row)) {
-              _this41.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this43.isCheckedByCheckboxRow(row)) {
+              _this43.setCheckboxRow(childRows, true);
             }
           });
         }
 
-        resolve(_this41.$nextTick().then(_this41.recalculate));
+        resolve(_this43.$nextTick().then(_this43.recalculate));
       });
     });
   },
@@ -5278,7 +5472,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this42 = this;
+    var _this44 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -5326,7 +5520,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this42.handleAsyncTreeExpandChilds(row));
+            result.push(_this44.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -5342,40 +5536,12 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this42.handleTreeExpandReserve(row, expanded);
+        return _this44.handleTreeExpandReserve(row, expanded);
       });
     }
 
     return Promise.all(result).then(this.recalculate);
   },
-  updateVirtualTreeData: function updateVirtualTreeData() {
-    var _this43 = this;
-
-    var oldScrollYLoad = this.scrollYLoad,
-        treeExpandeds = this.treeExpandeds,
-        treeOpts = this.treeOpts,
-        treeFullData = this.treeFullData;
-    var fullData = [];
-    var expandMaps = new Map();
-
-    _xeUtils.default.eachTree(treeFullData, function (row, index, items, path, parent) {
-      if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
-        expandMaps.set(row, 1);
-        fullData.push(row);
-      }
-    }, treeOpts);
-
-    var scrollYLoad = this.updateScrollYStatus(fullData);
-    this.tableFullData = scrollYLoad ? fullData : treeFullData;
-
-    if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
-      return this.handleTableData(true).then(function () {
-        return _this43.recalculate();
-      });
-    }
-
-    return this.$nextTick();
-  },
 
   /**
    * 虚拟树的展开与收起
@@ -5384,12 +5550,12 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this44 = this;
+    var _this45 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      return _this44.updateVirtualTreeData();
+      return _this45.handleTableData();
     }).then(function () {
-      return _this44.recalculate();
+      return _this45.recalculate();
     });
   },
 
@@ -5434,7 +5600,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this45 = this;
+    var _this46 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -5445,13 +5611,13 @@ var Methods = {
 
     if (reserve) {
       _xeUtils.default.eachTree(tableFullData, function (row) {
-        return _this45.handleTreeExpandReserve(row, false);
+        return _this46.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
-    return this.updateVirtualTreeData().then(function () {
+    return this.handleTableData().then(function () {
       if (isExists) {
-        _this45.recalculate();
+        _this46.recalculate();
       }
     });
   },
@@ -5581,18 +5747,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this46 = this;
+    var _this47 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this46.sYOpts,
-          sXOpts = _this46.sXOpts,
-          scrollXLoad = _this46.scrollXLoad,
-          scrollYLoad = _this46.scrollYLoad,
-          scrollXStore = _this46.scrollXStore,
-          scrollYStore = _this46.scrollYStore; // 计算 X 逻辑
+      var sYOpts = _this47.sYOpts,
+          sXOpts = _this47.sXOpts,
+          scrollXLoad = _this47.scrollXLoad,
+          scrollYLoad = _this47.scrollYLoad,
+          scrollXStore = _this47.scrollXStore,
+          scrollYStore = _this47.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this46),
+        var _computeVirtualX3 = computeVirtualX(_this47),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? _xeUtils.default.toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
@@ -5600,13 +5766,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this46.updateScrollXData();
+        _this47.updateScrollXData();
       } else {
-        _this46.updateScrollXSpace();
+        _this47.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this46),
+      var _computeVirtualY = computeVirtualY(_this47),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -5618,14 +5784,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this46.updateScrollYData();
+        _this47.updateScrollYData();
       } else {
-        _this46.updateScrollYSpace();
+        _this47.updateScrollYSpace();
       }
 
-      _this46.rowHeight = rowHeight;
+      _this47.rowHeight = rowHeight;
 
-      _this46.$nextTick(_this46.updateStyle);
+      _this47.$nextTick(_this47.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -5739,7 +5905,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this47 = this;
+    var _this48 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -5760,7 +5926,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this47.$nextTick());
+          return resolve(_this48.$nextTick());
         }, 50);
       });
     }
@@ -5811,7 +5977,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this48 = this;
+    var _this49 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -5826,15 +5992,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this48.isTreeExpandByRow(row)) {
-            rests.push(_this48.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this49.isTreeExpandByRow(row)) {
+            rests.push(_this49.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return _tools.DomTools.rowToVisible(_this48, row);
+      return _tools.DomTools.rowToVisible(_this49, row);
     });
   },
 
@@ -5898,29 +6064,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this49 = this;
+    var _this50 = this;
 
     var customVal = !_xeUtils.default.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this49.$refs,
-          editRules = _this49.editRules,
-          validStore = _this49.validStore;
+      var $refs = _this50.$refs,
+          editRules = _this50.editRules,
+          validStore = _this50.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this49.hasCellRules(type, row, column)) {
-          var cell = _this49.getCell(row, column);
+        if (_this50.hasCellRules(type, row, column)) {
+          var cell = _this50.getCell(row, column);
 
           if (cell) {
-            return _this49.validCellRules(type, row, column, cellValue).then(function () {
+            return _this50.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
 
-              _this49.clearValidate();
+              _this50.clearValidate();
             }).catch(function (_ref7) {
               var rule = _ref7.rule;
 
@@ -5928,7 +6094,7 @@ var Methods = {
                 setCellValue(row, column, cellValue);
               }
 
-              _this49.showValidTooltip({
+              _this50.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -5949,7 +6115,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this50 = this;
+    var _this51 = this;
 
     if (this.spanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -5957,7 +6123,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this50.updateCellAreas();
+      return _this51.updateCellAreas();
     });
   },
 
@@ -5966,7 +6132,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this51 = this;
+    var _this52 = this;
 
     if (this.spanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -5974,7 +6140,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this51.updateCellAreas();
+      _this52.updateCellAreas();
 
       return rest;
     });
@@ -5998,7 +6164,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this52 = this;
+    var _this53 = this;
 
     if (this.footerSpanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6006,11 +6172,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this53.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this53 = this;
+    var _this54 = this;
 
     if (this.footerSpanMethod) {
       _tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6018,7 +6184,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this54.updateCellAreas();
 
       return rest;
     });
@@ -6158,7 +6324,7 @@ var Methods = {
 
 }; // Module methods
 
-var funcs = 'setFilter,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,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') {