vxe-table 3.4.13 → 3.4.14-beta.3

package/lib/index.umd.js

@@ -9280,6 +9280,17 @@ function setScrollLeft(elem, scrollLeft) {
     elem.scrollLeft = scrollLeft;
   }
 }
+function setScrollLeftAndTop(elem, scrollLeft, scrollTop) {
+  if (elem) {
+    elem.scrollLeft = scrollLeft;
+    elem.scrollTop = scrollTop;
+  }
+}
+
+function isNodeElement(elem) {
+  return elem && elem.nodeType === 1;
+}
+
 var DomTools = {
   browse: browse,
   isPx: function isPx(val) {
@@ -9467,7 +9478,8 @@ var DomTools = {
     }
 
     return num;
-  }
+  },
+  isNodeElement: isNodeElement
 };
 /* harmony default export */ var dom = (DomTools);
 // CONCATENATED MODULE: ./packages/tools/src/event.js
@@ -11438,7 +11450,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
 
 var scrollProcessTimeout;
 
-function syncBodyScroll(scrollTop, elem1, elem2) {
+function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
   if (elem1 || elem2) {
     if (elem1) {
       removeScrollListener(elem1);
@@ -11452,8 +11464,34 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
 
     clearTimeout(scrollProcessTimeout);
     scrollProcessTimeout = setTimeout(function () {
+      var _vm$$refs = _vm.$refs,
+          tableBody = _vm$$refs.tableBody,
+          leftBody = _vm$$refs.leftBody,
+          rightBody = _vm$$refs.rightBody;
+      var bodyElem = tableBody.$el;
+      var leftElem = leftBody ? leftBody.$el : null;
+      var rightElem = rightBody ? rightBody.$el : null;
       restoreScrollListener(elem1);
-      restoreScrollListener(elem2);
+      restoreScrollListener(elem2); // 检查滚动条是的同步
+
+      var targetTop = bodyElem.scrollTop;
+      var targetLeft = bodyElem.scrollLeft;
+
+      if (fixedType === 'left') {
+        if (leftElem) {
+          targetTop = leftElem.scrollTop;
+          targetLeft = leftElem.scrollLeft;
+        }
+      } else if (fixedType === 'right') {
+        if (rightElem) {
+          targetTop = rightElem.scrollTop;
+          targetLeft = rightElem.scrollLeft;
+        }
+      }
+
+      setScrollLeftAndTop(bodyElem, targetLeft, targetTop);
+      setScrollLeftAndTop(leftElem, targetLeft, targetTop);
+      setScrollLeftAndTop(rightElem, targetLeft, targetTop);
     }, 300);
   }
 }
@@ -11692,10 +11730,10 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
 
       if (leftElem && fixedType === 'left') {
         scrollTop = leftElem.scrollTop;
-        syncBodyScroll(scrollTop, bodyElem, rightElem);
+        syncBodyScroll($xetable, fixedType, scrollTop, bodyElem, rightElem);
       } else if (rightElem && fixedType === 'right') {
         scrollTop = rightElem.scrollTop;
-        syncBodyScroll(scrollTop, bodyElem, leftElem);
+        syncBodyScroll($xetable, fixedType, scrollTop, bodyElem, leftElem);
       } else {
         if (isRollX) {
           if (headerElem) {
@@ -11711,7 +11749,7 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
           $xetable.checkScrolling();
 
           if (isRollY) {
-            syncBodyScroll(scrollTop, leftElem, rightElem);
+            syncBodyScroll($xetable, fixedType, scrollTop, leftElem, rightElem);
           }
         }
       }
@@ -11783,18 +11821,18 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
           var scrollTop = bodyElem.scrollTop,
               clientHeight = bodyElem.clientHeight,
               scrollHeight = bodyElem.scrollHeight;
-          var targerTop = scrollTop + wheelYInterval * (isTopWheel ? -1 : 1);
-          bodyElem.scrollTop = targerTop;
+          var targetTop = scrollTop + wheelYInterval * (isTopWheel ? -1 : 1);
+          bodyElem.scrollTop = targetTop;
 
           if (leftElem) {
-            leftElem.scrollTop = targerTop;
+            leftElem.scrollTop = targetTop;
           }
 
           if (rightElem) {
-            rightElem.scrollTop = targerTop;
+            rightElem.scrollTop = targetTop;
           }
 
-          if (isTopWheel ? targerTop < scrollHeight - clientHeight : targerTop >= 0) {
+          if (isTopWheel ? targetTop < scrollHeight - clientHeight : targetTop >= 0) {
             _this.wheelTime = setTimeout(handleSmooth, 10);
           }
 
@@ -12372,29 +12410,28 @@ var Cell = {
     var $table = params.$table,
         column = params.column,
         isHidden = params.isHidden;
-    var isAllCheckboxIndeterminate = $table.isIndeterminate,
+    var isAllCheckboxSelected = $table.isAllSelected,
+        isAllCheckboxIndeterminate = $table.isIndeterminate,
         isAllCheckboxDisabled = $table.isAllCheckboxDisabled;
     var slots = column.slots;
     var headerSlot = slots ? slots.header : null;
     var titleSlot = slots ? slots.title : null;
     var checkboxOpts = $table.checkboxOpts;
     var headerTitle = column.getTitle();
-    var isChecked = false;
     var on;
 
     if (!isHidden) {
-      isChecked = isAllCheckboxDisabled ? false : $table.isAllSelected;
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
-            $table.triggerCheckAllEvent(evnt, !isChecked);
+            $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
       };
     }
 
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
-      checked: isChecked,
+      checked: isAllCheckboxSelected,
       disabled: isAllCheckboxDisabled,
       indeterminate: isAllCheckboxIndeterminate
     });
@@ -12411,7 +12448,7 @@ var Cell = {
 
     return renderTitleContent(h, checkboxParams, [h('span', {
       class: ['vxe-cell--checkbox', {
-        'is--checked': isChecked,
+        'is--checked': isAllCheckboxSelected,
         'is--disabled': isAllCheckboxDisabled,
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
@@ -12905,7 +12942,8 @@ var methods_calcHeight = DomTools.calcHeight,
     methods_hasClass = DomTools.hasClass,
     addClass = DomTools.addClass,
     methods_removeClass = DomTools.removeClass,
-    getEventTargetNode = DomTools.getEventTargetNode;
+    getEventTargetNode = DomTools.getEventTargetNode,
+    methods_isNodeElement = DomTools.isNodeElement;
 var isWebkit = browse['-webkit'] && !browse.edge;
 var debounceScrollYDuration = browse.msie ? 80 : 20;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
@@ -13279,14 +13317,43 @@ 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();
+
+      _this2.checkSelectionStatus();
+
+      if (scrollXLoad || scrollYLoad) {
+        if (scrollXLoad) {
+          _this2.updateScrollXSpace();
+        }
+
+        if (scrollYLoad) {
+          _this2.updateScrollYSpace();
+        }
+
+        return _this2.refreshScroll();
+      }
+    }).then(function () {
+      _this2.updateCellAreas();
+
+      return _this2.recalculate(true);
+    }).then(function () {
+      // 存在滚动行为未结束情况
+      setTimeout(function () {
+        return _this2.recalculate();
+      }, 50);
+    });
   },
   handleTableData: function handleTableData(force) {
-    var _this2 = this;
+    var _this3 = this;
 
     var scrollYLoad = this.scrollYLoad,
         scrollYStore = this.scrollYStore,
@@ -13303,7 +13370,7 @@ var Methods = {
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach(function (row, $index) {
-      var rowid = methods_getRowid(_this2, row);
+      var rowid = methods_getRowid(_this3, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -13328,7 +13395,7 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadTableData: function loadTableData(datas) {
-    var _this3 = this;
+    var _this4 = this;
 
     var keepSource = this.keepSource,
         treeConfig = this.treeConfig,
@@ -13391,31 +13458,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) {
-            restoreScrollLocation(_this3, lastScrollLeft, lastScrollTop).then(resolve);
+            restoreScrollLocation(_this4, lastScrollLeft, lastScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return restoreScrollLocation(_this3, lastScrollLeft, lastScrollTop).then(resolve);
+              return restoreScrollLocation(_this4, lastScrollLeft, lastScrollTop).then(resolve);
             });
           }
         });
@@ -13428,23 +13495,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();
     });
   },
 
@@ -13453,21 +13520,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();
     });
   },
 
@@ -13512,10 +13579,10 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   loadColumn: function loadColumn(columns) {
-    var _this6 = this;
+    var _this7 = this;
 
     var collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.mapTree(columns, function (column) {
-      return src_cell.createColumn(_this6, column);
+      return src_cell.createColumn(_this7, column);
     }, {
       children: 'children'
     });
@@ -13528,14 +13595,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 = methods_getColumnList(collectColumn);
@@ -13543,8 +13610,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();
@@ -13554,14 +13621,14 @@ var Methods = {
     if (false) {}
 
     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();
     });
   },
 
@@ -13570,7 +13637,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap: function cacheRowMap(source) {
-    var _this9 = this;
+    var _this10 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
@@ -13584,7 +13651,7 @@ var Methods = {
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = methods_getRowid(_this9, row);
+      var rowid = methods_getRowid(_this10, row);
       var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -13633,7 +13700,7 @@ var Methods = {
     }
   },
   loadTreeChildren: function loadTreeChildren(row, childRecords) {
-    var _this10 = this;
+    var _this11 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -13649,9 +13716,9 @@ var Methods = {
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = methods_getRowid(_this10, row);
+        var rowid = methods_getRowid(_this11, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this10, item);
+          return rowid === methods_getRowid(_this11, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -13660,7 +13727,7 @@ var Methods = {
       }
 
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = methods_getRowid(_this10, childRow);
+        var rowid = methods_getRowid(_this11, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -13683,7 +13750,7 @@ var Methods = {
         row[mapChildren] = rows;
       }
 
-      _this10.updateAfterDataIndex();
+      _this11.updateAfterDataIndex();
 
       return rows;
     });
@@ -13694,7 +13761,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this11 = this;
+    var _this12 = this;
 
     var tableFullColumn = this.tableFullColumn,
         collectColumn = this.collectColumn,
@@ -13988,13 +14055,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 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
@@ -14009,7 +14076,7 @@ var Methods = {
    * @param {Array/Object} records 新数据
    */
   createRow: function createRow(records) {
-    var _this13 = this;
+    var _this14 = this;
 
     var isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(records);
 
@@ -14018,7 +14085,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];
       });
     });
@@ -14032,7 +14099,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this14 = this;
+    var _this15 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -14056,8 +14123,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(UtilTools.getLog('vxe.error.noTree', ['revertData']));
@@ -14141,7 +14208,7 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this15 = this;
+    var _this16 = this;
 
     var visibleColumn = this.visibleColumn,
         keepSource = this.keepSource,
@@ -14161,7 +14228,7 @@ var Methods = {
       if (treeConfig) {
         var children = treeOpts.children;
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this15, item);
+          return rowid === methods_getRowid(_this16, item);
         }, treeOpts);
         row = Object.assign({}, row, _defineProperty({}, children, null));
 
@@ -14323,7 +14390,7 @@ var Methods = {
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData: function updateAfterFullData() {
-    var _this16 = this;
+    var _this17 = this;
 
     var tableFullColumn = this.tableFullColumn,
         tableFullData = this.tableFullData,
@@ -14400,7 +14467,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this16
+                  $table: _this17
                 });
               });
             } else if (compFilterMethod) {
@@ -14411,7 +14478,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this16
+                  $table: _this17
                 });
               });
             } else if (allFilterMethod) {
@@ -14430,7 +14497,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this16
+                  $table: _this17
                 });
               });
             }
@@ -14483,7 +14550,7 @@ var Methods = {
           tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableTree, orderColumns.map(function (_ref2) {
             var column = _ref2.column,
                 order = _ref2.order;
-            return [getOrderField(_this16, column), order];
+            return [getOrderField(_this17, column), order];
           }));
         }
 
@@ -14506,7 +14573,7 @@ var Methods = {
             tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.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 不能为数组
@@ -14521,7 +14588,7 @@ var Methods = {
             tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
               var column = _ref4.column,
                   order = _ref4.order;
-              return [getOrderField(_this16, column), order];
+              return [getOrderField(_this17, column), order];
             }));
           }
         }
@@ -14540,7 +14607,7 @@ var Methods = {
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex: function updateAfterDataIndex() {
-    var _this17 = this;
+    var _this18 = this;
 
     var treeConfig = this.treeConfig,
         afterFullData = this.afterFullData,
@@ -14551,7 +14618,7 @@ var Methods = {
 
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = methods_getRowid(_this17, row);
+        var rowid = methods_getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -14580,7 +14647,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = methods_getRowid(_this17, row);
+        var rowid = methods_getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -14671,7 +14738,7 @@ var Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults: function handleLoadDefaults() {
-    var _this18 = this;
+    var _this19 = this;
 
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
@@ -14698,7 +14765,7 @@ var Methods = {
     }
 
     this.$nextTick(function () {
-      return setTimeout(_this18.recalculate);
+      return setTimeout(_this19.recalculate);
     });
   },
 
@@ -14948,12 +15015,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();
     });
   },
 
@@ -14962,7 +15029,7 @@ var Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns: function parseColumns() {
-    var _this20 = this;
+    var _this21 = this;
 
     var leftList = [];
     var centerList = [];
@@ -15069,11 +15136,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();
     });
   },
 
@@ -15129,6 +15196,8 @@ var Methods = {
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
    */
   refreshScroll: function refreshScroll() {
+    var _this22 = this;
+
     var lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop;
     var $refs = this.$refs;
@@ -15139,17 +15208,24 @@ var Methods = {
     var tableBodyElem = tableBody ? tableBody.$el : null;
     var leftBodyElem = leftBody ? leftBody.$el : null;
     var rightBodyElem = rightBody ? rightBody.$el : null;
-    var tableFooterElem = tableFooter ? tableFooter.$el : null; // 还原滚动条位置
+    var tableFooterElem = tableFooter ? tableFooter.$el : null;
+    return new Promise(function (resolve) {
+      // 还原滚动条位置
+      if (lastScrollLeft || lastScrollTop) {
+        return restoreScrollLocation(_this22, lastScrollLeft, lastScrollTop).then(function () {
+          // 存在滚动行为未结束情况
+          setTimeout(resolve, 30);
+        });
+      } // 重置
 
-    if (lastScrollLeft || lastScrollTop) {
-      return restoreScrollLocation(this, lastScrollLeft, lastScrollTop);
-    } // 重置
 
+      setScrollTop(tableBodyElem, lastScrollTop);
+      setScrollTop(leftBodyElem, lastScrollTop);
+      setScrollTop(rightBodyElem, lastScrollTop);
+      setScrollLeft(tableFooterElem, lastScrollLeft); // 存在滚动行为未结束情况
 
-    setScrollTop(tableBodyElem, lastScrollTop);
-    setScrollTop(leftBodyElem, lastScrollTop);
-    setScrollTop(rightBodyElem, lastScrollTop);
-    setScrollLeft(tableFooterElem, lastScrollLeft);
+      setTimeout(resolve, 30);
+    });
   },
 
   /**
@@ -15157,7 +15233,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this21 = this;
+    var _this23 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -15173,9 +15249,9 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this21.autoCellWidth(headerElem, bodyElem, footerElem);
+          _this23.autoCellWidth(headerElem, bodyElem, footerElem);
 
-          return _this21.computeScrollLoad();
+          return _this23.computeScrollLoad();
         });
       }
     }
@@ -15323,7 +15399,7 @@ var Methods = {
     this.customMaxHeight = methods_calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this22 = this;
+    var _this24 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -15427,7 +15503,7 @@ var Methods = {
 
           if (isGroup && listElem) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this22.getColumnNode(thElem);
+              var colNode = _this24.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -15457,7 +15533,7 @@ var Methods = {
         } else if (layout === 'body') {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
 
-          if (wrapperElem) {
+          if (methods_isNodeElement(wrapperElem)) {
             if (customMaxHeight) {
               wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
             } else {
@@ -15474,7 +15550,7 @@ var Methods = {
             var isRightFixed = fixedType === 'right';
             var _fixedColumn = columnStore["".concat(fixedType, "List")];
 
-            if (wrapperElem) {
+            if (methods_isNodeElement(wrapperElem)) {
               wrapperElem.style.top = "".concat(headerHeight, "px");
             }
 
@@ -15544,7 +15620,7 @@ var Methods = {
             return previous + column.renderWidth;
           }, 0);
 
-          if (wrapperElem) {
+          if (methods_isNodeElement(wrapperElem)) {
             // 如果是固定列
             if (fixedWrapperElem) {
               wrapperElem.style.top = "".concat(customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight, "px");
@@ -15608,10 +15684,10 @@ var Methods = {
 
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this22.getColumnIndex(column);
+                      var columnIndex = _this24.getColumnIndex(column);
 
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this22.getColumns(columnIndex + _index);
+                        var nextColumn = _this24.getColumns(columnIndex + _index);
 
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
@@ -15661,15 +15737,15 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this23 = this;
+    var _this25 = this;
 
     var evntList = v_x_e_table.interceptor.get(type);
     var rest;
 
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this23.$xegrid,
-        $table: _this23,
+        $grid: _this25.$xegrid,
+        $table: _this25,
         $event: evnt
       }, args)) === false;
     })) {
@@ -15689,7 +15765,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this24 = this;
+    var _this26 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -15750,7 +15826,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this24.height && !_this24.overflowY) {
+                if (!isClearActived && _this26.height && !_this26.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -15761,7 +15837,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this24.clearActived(evnt);
+                    return _this26.clearActived(evnt);
                   });
                 }
               });
@@ -15775,9 +15851,9 @@ var Methods = {
 
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this24.clearCellAreas();
+            _this26.clearCellAreas();
 
-            _this24.clearCopyCellArea();
+            _this26.clearCopyCellArea();
           });
         }
       }
@@ -15812,7 +15888,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this25 = this;
+    var _this27 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
@@ -15827,33 +15903,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 && _this27.handleKeyboardEvent) {
+          _this27.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation(); // 如果按下了 Esc 键，关闭快捷菜单、筛选
 
-          _this25.closeFilter();
+          _this27.closeFilter();
 
-          _this25.closeMenu();
+          _this27.closeMenu();
 
           if (keyboardConfig && keyboardOpts.isEsc) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               var params = actived.args;
 
-              _this25.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this27.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this25.$nextTick(function () {
-                  return _this25.handleSelected(params, evnt);
+                _this27.$nextTick(function () {
+                  return _this27.handleSelected(params, evnt);
                 });
               }
             }
           }
         }
 
-        _this25.emitEvent('keydown', {}, evnt);
+        _this27.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -15862,27 +15938,27 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this26 = this;
+    var _this28 = 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 = _this28.filterStore,
+            isCtxMenu = _this28.isCtxMenu,
+            ctxMenuStore = _this28.ctxMenuStore,
+            editStore = _this28.editStore,
+            editOpts = _this28.editOpts,
+            editConfig = _this28.editConfig,
+            mouseConfig = _this28.mouseConfig,
+            mouseOpts = _this28.mouseOpts,
+            keyboardConfig = _this28.keyboardConfig,
+            keyboardOpts = _this28.keyboardOpts,
+            treeConfig = _this28.treeConfig,
+            treeOpts = _this28.treeOpts,
+            highlightCurrentRow = _this28.highlightCurrentRow,
+            currentRow = _this28.currentRow,
+            bodyCtxMenu = _this28.bodyCtxMenu,
+            rowOpts = _this28.rowOpts;
         var selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -15909,7 +15985,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this26.closeFilter();
+            _this28.closeFilter();
           }
 
           return;
@@ -15920,20 +15996,20 @@ var Methods = {
           evnt.preventDefault();
 
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this28.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this26.ctxMenuList);
+            _this28.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this28.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
-          _this26.handleKeyboardEvent(evnt);
+        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this28.handleKeyboardEvent) {
+          _this28.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);
+            _this28.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this26.triggerRadioRowEvent(evnt, selected.args);
+            _this28.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && isEnableConf(editConfig)) {
           if (!isEditStatus) {
@@ -15942,15 +16018,15 @@ var Methods = {
               evnt.stopPropagation();
               evnt.preventDefault();
 
-              _this26.handleActived(selected.args, evnt);
+              _this28.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;
+          _this28._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          clearTimeout(_this28.keyCtxTimeout);
+          _this28.keyCtxTimeout = setTimeout(function () {
+            _this28._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
@@ -15959,12 +16035,12 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this26.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this28.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this26.$nextTick(function () {
-                  return _this26.handleSelected(params, evnt);
+                _this28.$nextTick(function () {
+                  return _this28.handleSelected(params, evnt);
                 });
               }
             }
@@ -15975,15 +16051,15 @@ var Methods = {
 
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this28.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this26.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this28.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this28.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this26.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this28.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -15994,14 +16070,14 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this26,
+                  $table: _this28,
                   row: targetRow
                 };
 
-                _this26.setTreeExpand(currentRow, true).then(function () {
-                  return _this26.scrollToRow(targetRow);
+                _this28.setTreeExpand(currentRow, true).then(function () {
+                  return _this28.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this26.triggerCurrentRowEvent(evnt, params);
+                  return _this28.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -16010,18 +16086,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this26.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this28.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this26.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this28.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this26.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this28.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this26.moveTabSelected(actived.args, hasShiftKey, evnt);
+            _this28.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
         } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
@@ -16032,10 +16108,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this26.getRowIndex(selected.row),
+                  rowIndex: _this28.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this26.getColumnIndex(selected.column),
-                  $table: _this26
+                  columnIndex: _this28.getColumnIndex(selected.column),
+                  $table: _this28
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
@@ -16045,21 +16121,21 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this26.getRowIndex(selected.row),
+                    rowIndex: _this28.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this26.getColumnIndex(selected.column),
-                    $table: _this26
+                    columnIndex: _this28.getColumnIndex(selected.column),
+                    $table: _this28
                   });
                 } else {
-                  _this26.handleActived(selected.args, evnt);
+                  _this28.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this26.updateFooter();
+                _this28.updateFooter();
               }
             } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
-              var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(_this26.afterFullData, function (item) {
+              var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(_this28.afterFullData, function (item) {
                 return item === currentRow;
               }, treeOpts),
                   parentRow = _XEUtils$findTree.parent;
@@ -16067,14 +16143,14 @@ var Methods = {
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this26,
+                  $table: _this28,
                   row: parentRow
                 };
 
-                _this26.setTreeExpand(parentRow, false).then(function () {
-                  return _this26.scrollToRow(parentRow);
+                _this28.setTreeExpand(parentRow, false).then(function () {
+                  return _this28.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this26.triggerCurrentRowEvent(evnt, params);
+                  return _this28.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -16088,26 +16164,26 @@ var Methods = {
 
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
             if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
-              $table: _this26
+              $table: _this28
             }))) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this26.getRowIndex(selected.row),
+                  rowIndex: _this28.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this26.getColumnIndex(selected.column),
-                  $table: _this26
+                  columnIndex: _this28.getColumnIndex(selected.column),
+                  $table: _this28
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
 
-                _this26.handleActived(selected.args, evnt);
+                _this28.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this26.emitEvent('keydown', {}, evnt);
+        _this28.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -16177,12 +16253,12 @@ var Methods = {
     this.recalculate(true);
   },
   handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this27 = this;
+    var _this29 = this;
 
     var tooltipOpts = this.tooltipOpts;
     setTimeout(function () {
-      if (!_this27.tooltipActive) {
-        _this27.closeTooltip();
+      if (!_this29.tooltipActive) {
+        _this29.closeTooltip();
       }
     }, tooltipOpts.leaveDelay);
     return false;
@@ -16193,17 +16269,17 @@ var Methods = {
     this.closeTooltip();
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this28 = this;
+    var _this30 = this;
 
     var tooltipOpts = this.tooltipOpts;
     this.tooltipActive = false;
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        var tooltip = _this28.$refs.tooltip;
+        var tooltip = _this30.$refs.tooltip;
 
         if (tooltip && !tooltip.isHover) {
-          _this28.closeTooltip();
+          _this30.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -16433,14 +16509,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this29 = this;
+    var _this31 = this;
 
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this29.handleSelectRow({
+      return _this31.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -16464,7 +16540,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value) {
-    var _this30 = this;
+    var _this32 = this;
 
     var row = _ref6.row;
     var selection = this.selection,
@@ -16496,7 +16572,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this30.handleCheckboxReserveRow(row, value);
+              _this32.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16568,7 +16644,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this30.handleCheckboxReserveRow(row, value);
+              _this32.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16672,7 +16748,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this31 = this;
+    var _this33 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -16785,11 +16861,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[methods_getRowid(_this31, row)] = row;
+            checkboxReserveRowMap[methods_getRowid(_this33, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this31.handleCheckboxReserveRow(row, false);
+            return _this33.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -16812,17 +16888,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
-          }) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
+          })) {
+            disableRows.push(row);
+            return true;
+          }
+
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField)) {
+            checkRows.push(row);
+            return true;
+          }
+
+          return false;
         } : function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
         });
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
 
         if (treeConfig) {
           if (halfField) {
@@ -16846,13 +16936,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) {
@@ -16984,7 +17085,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this32 = this;
+    var _this34 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -16999,11 +17100,11 @@ var Methods = {
 
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[methods_getRowid(_this32, row)] = 1;
+          afterFullIdMaps[methods_getRowid(_this34, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[methods_getRowid(_this32, row)] = 1;
+          afterFullIdMaps[methods_getRowid(_this34, row)] = 1;
         });
       }
 
@@ -17069,7 +17170,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this33 = this;
+    var _this35 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -17092,7 +17193,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this33.handleCheckboxReserveRow(row, false);
+        return _this35.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -17383,13 +17484,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this34 = this;
+    var _this36 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this34.handleActived(params, evnt).then(function () {
-        return _this34.checkValidate('change');
+      _this36.handleActived(params, evnt).then(function () {
+        return _this36.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -17492,7 +17593,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this35 = this;
+    var _this37 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -17507,15 +17608,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this35.handleActived(params, evnt).then(function () {
-              return _this35.checkValidate('change');
+            _this37.handleActived(params, evnt).then(function () {
+              return _this37.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this35.checkValidate('change');
+            return _this37.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -17526,7 +17627,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this36 = this;
+    var _this38 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -17543,7 +17644,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this36.getColumnByField(field);
+            var column = _this38.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -17586,7 +17687,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this37 = this;
+    var _this39 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -17619,7 +17720,7 @@ var Methods = {
         var column = field;
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(field)) {
-          column = _this37.getColumnByField(field);
+          column = _this39.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -17628,7 +17729,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this37, column);
+            order = getNextSortOrder(_this39, column);
           }
 
           if (column.order !== order) {
@@ -17778,7 +17879,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this38 = this;
+    var _this40 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -17786,7 +17887,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this38.handleAsyncRowExpand(row);
+        return _this40.handleAsyncRowExpand(row);
       });
     }
 
@@ -17863,28 +17964,28 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this39 = this;
+    var _this41 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this39.expandLazyLoadeds.push(row);
+      _this41.expandLazyLoadeds.push(row);
 
-      _this39.expandOpts.loadMethod({
-        $table: _this39,
+      _this41.expandOpts.loadMethod({
+        $table: _this41,
         row: row,
-        rowIndex: _this39.getRowIndex(row),
-        $rowIndex: _this39.getVMRowIndex(row)
+        rowIndex: _this41.getRowIndex(row),
+        $rowIndex: _this41.getVMRowIndex(row)
       }).catch(function (e) {
         return e;
       }).then(function () {
         rest.expandLoaded = true;
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this39.expandLazyLoadeds, function (item) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this41.expandLazyLoadeds, function (item) {
           return item === row;
         });
 
-        _this39.rowExpandeds.push(row);
+        _this41.rowExpandeds.push(row);
 
-        resolve(_this39.$nextTick().then(_this39.recalculate));
+        resolve(_this41.$nextTick().then(_this41.recalculate));
       });
     });
   },
@@ -17897,7 +17998,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this40 = this;
+    var _this42 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -17930,8 +18031,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this40.getRowIndex(row),
-          $rowIndex: _this40.getVMRowIndex(row)
+          rowIndex: _this42.getRowIndex(row),
+          $rowIndex: _this42.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -17942,7 +18043,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this40.handleAsyncRowExpand(row));
+              lazyRests.push(_this42.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -17956,7 +18057,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this40.handleRowExpandReserve(row, expanded);
+          return _this42.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -17977,7 +18078,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this41 = this;
+    var _this43 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -17988,13 +18089,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this41.handleRowExpandReserve(row, false);
+        return _this43.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this41.recalculate();
+        _this43.recalculate();
       }
     });
   },
@@ -18073,7 +18174,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this42 = this;
+    var _this44 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -18083,15 +18184,15 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this42.handleAsyncTreeExpandChilds(row);
+        return _this44.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this42.handleVirtualTreeToList();
+          _this44.handleVirtualTreeToList();
 
-          return _this42.handleTableData();
+          return _this44.handleTableData();
         }
       }).then(function () {
-        return _this42.recalculate();
+        return _this44.recalculate();
       });
     }
 
@@ -18167,7 +18268,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this43 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -18181,7 +18282,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this43,
+        $table: _this45,
         row: row
       }).catch(function () {
         return [];
@@ -18196,29 +18297,29 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this43.loadTreeChildren(row, childRecords).then(function (childRows) {
+          _this45.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 && _this45.isCheckedByCheckboxRow(row)) {
+              _this45.setCheckboxRow(childRows, true);
             }
 
-            _this43.$nextTick().then(function () {
+            _this45.$nextTick().then(function () {
               if (transform) {
-                return _this43.handleTableData();
+                return _this45.handleTableData();
               }
             }).then(function () {
-              return _this43.recalculate();
+              return _this45.recalculate();
             }).then(function () {
               return resolve();
             });
           });
         } else {
-          _this43.$nextTick().then(function () {
-            return _this43.recalculate();
+          _this45.$nextTick().then(function () {
+            return _this45.recalculate();
           }).then(function () {
             return resolve();
           });
@@ -18254,7 +18355,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this44 = this;
+    var _this46 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -18302,7 +18403,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this44.handleAsyncTreeExpandChilds(row));
+            result.push(_this46.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -18318,7 +18419,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this44.handleTreeExpandReserve(row, expanded);
+        return _this46.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -18332,14 +18433,14 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this45 = this;
+    var _this47 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this45.handleVirtualTreeToList();
+      _this47.handleVirtualTreeToList();
 
-      return _this45.handleTableData();
+      return _this47.handleTableData();
     }).then(function () {
-      return _this45.recalculate();
+      return _this47.recalculate();
     });
   },
 
@@ -18384,7 +18485,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this46 = this;
+    var _this48 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -18396,19 +18497,19 @@ var Methods = {
 
     if (reserve) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (row) {
-        return _this46.handleTreeExpandReserve(row, false);
+        return _this48.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
     return this.handleTableData().then(function () {
       if (transform) {
-        _this46.handleVirtualTreeToList();
+        _this48.handleVirtualTreeToList();
 
-        return _this46.handleTableData();
+        return _this48.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this46.recalculate();
+        _this48.recalculate();
       }
     });
   },
@@ -18538,18 +18639,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this47 = this;
+    var _this49 = 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 = _this49.sYOpts,
+          sXOpts = _this49.sXOpts,
+          scrollXLoad = _this49.scrollXLoad,
+          scrollYLoad = _this49.scrollYLoad,
+          scrollXStore = _this49.scrollXStore,
+          scrollYStore = _this49.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this47),
+        var _computeVirtualX3 = computeVirtualX(_this49),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
@@ -18557,13 +18658,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this47.updateScrollXData();
+        _this49.updateScrollXData();
       } else {
-        _this47.updateScrollXSpace();
+        _this49.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this47),
+      var _computeVirtualY = computeVirtualY(_this49),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -18575,14 +18676,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this47.updateScrollYData();
+        _this49.updateScrollYData();
       } else {
-        _this47.updateScrollYSpace();
+        _this49.updateScrollYSpace();
       }
 
-      _this47.rowHeight = rowHeight;
+      _this49.rowHeight = rowHeight;
 
-      _this47.$nextTick(_this47.updateStyle);
+      _this49.$nextTick(_this49.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -18696,7 +18797,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this48 = this;
+    var _this50 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -18717,7 +18818,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this48.$nextTick());
+          return resolve(_this50.$nextTick());
         }, 50);
       });
     }
@@ -18768,7 +18869,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this49 = this;
+    var _this51 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -18783,15 +18884,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 && !_this51.isTreeExpandByRow(row)) {
+            rests.push(_this51.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return DomTools.rowToVisible(_this49, row);
+      return DomTools.rowToVisible(_this51, row);
     });
   },
 
@@ -18855,29 +18956,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this50 = this;
+    var _this52 = this;
 
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this50.$refs,
-          editRules = _this50.editRules,
-          validStore = _this50.validStore;
+      var $refs = _this52.$refs,
+          editRules = _this52.editRules,
+          validStore = _this52.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 (_this52.hasCellRules(type, row, column)) {
+          var cell = _this52.getCell(row, column);
 
           if (cell) {
-            return _this50.validCellRules(type, row, column, cellValue).then(function () {
+            return _this52.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this50.clearValidate();
+              _this52.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -18885,7 +18986,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this50.showValidTooltip({
+              _this52.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -18906,7 +19007,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this51 = this;
+    var _this53 = this;
 
     if (this.spanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -18914,7 +19015,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this51.updateCellAreas();
+      return _this53.updateCellAreas();
     });
   },
 
@@ -18923,7 +19024,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this52 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -18931,7 +19032,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this52.updateCellAreas();
+      _this54.updateCellAreas();
 
       return rest;
     });
@@ -18955,7 +19056,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this53 = this;
+    var _this55 = this;
 
     if (this.footerSpanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -18963,11 +19064,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this53.updateCellAreas();
+      return _this55.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -18975,7 +19076,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this54.updateCellAreas();
+      _this56.updateCellAreas();
 
       return rest;
     });
@@ -19115,7 +19216,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 (false) {}
@@ -20870,8 +20971,8 @@ var Table = Object.assign(table, {
 
       var filterStore = this.filterStore,
           filterOpts = this.filterOpts,
-          scrollXLoad = this.scrollXLoad,
-          scrollYLoad = this.scrollYLoad;
+          oldScrollXLoad = this.scrollXLoad,
+          oldScrollYLoad = this.scrollYLoad;
       var column = filterStore.column;
       var property = column.property;
       var values = [];
@@ -20887,15 +20988,6 @@ var Table = Object.assign(table, {
       if (!filterOpts.remote) {
         this.handleTableData(true);
         this.checkSelectionStatus();
-        this.updateFooter();
-
-        if (scrollXLoad || scrollYLoad) {
-          this.refreshScroll();
-
-          if (scrollYLoad) {
-            this.updateScrollYSpace();
-          }
-        }
       }
 
       this.emitEvent('filter-change', {
@@ -20907,10 +20999,30 @@ var Table = Object.assign(table, {
         filterList: filterList
       }, evnt);
       this.closeFilter();
-      this.$nextTick(function () {
-        _this2.recalculate();
+      this.updateFooter().then(function () {
+        var scrollXLoad = _this2.scrollXLoad,
+            scrollYLoad = _this2.scrollYLoad;
+
+        if (oldScrollXLoad || scrollXLoad || oldScrollYLoad || scrollYLoad) {
+          if (oldScrollXLoad || scrollXLoad) {
+            _this2.updateScrollXSpace();
+          }
+
+          if (oldScrollYLoad || scrollYLoad) {
+            _this2.updateScrollYSpace();
+          }
 
+          return _this2.refreshScroll();
+        }
+      }).then(function () {
         _this2.updateCellAreas();
+
+        return _this2.recalculate(true);
+      }).then(function () {
+        // 存在滚动行为未结束情况
+        setTimeout(function () {
+          return _this2.recalculate();
+        }, 50);
       });
     },
     handleClearFilter: function handleClearFilter(column) {
@@ -23692,29 +23804,10 @@ var msgQueue = [];
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.pad-start.js
 var es_string_pad_start = __webpack_require__("4d90");
 
-// CONCATENATED MODULE: ./packages/input/src/input.js
-
-
-
-
-
-
-
-
-
+// CONCATENATED MODULE: ./packages/input/src/date.js
 
 
 
-
-
-
-
-
-
-var yearSize = 20;
-var monthSize = 20;
-var quarterSize = 8;
-
 function toStringTimeDate(str) {
   if (str) {
     var rest = new Date();
@@ -23743,7 +23836,6 @@ function toStringTimeDate(str) {
 
   return new Date('');
 }
-
 function getDateQuarter(date) {
   var month = date.getMonth();
 
@@ -23757,7 +23849,14 @@ function getDateQuarter(date) {
 
   return 4;
 }
+// CONCATENATED MODULE: ./packages/input/src/number.js
+
 
+
+
+function handleNumber(val) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(val) ? val.replace(/,/g, '') : val;
+}
 function toFloatValueFixed(inputValue, digitsValue) {
   if (/^-/.test('' + inputValue)) {
     return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.ceil(inputValue, digitsValue), digitsValue);
@@ -23765,6 +23864,28 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.floor(inputValue, digitsValue), digitsValue);
 }
+// CONCATENATED MODULE: ./packages/input/src/input.js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var yearSize = 20;
+var monthSize = 20;
+var quarterSize = 8;
 
 function getNumberValue(_vm, val) {
   var type = _vm.type,
@@ -25273,7 +25394,7 @@ function renderExtraSuffixIcon(h, _vm) {
       if (!inpReadonly) {
         if (isNumType) {
           if (inputValue) {
-            var inpNumVal = type === 'integer' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toInteger(inputValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(inputValue);
+            var inpNumVal = type === 'integer' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toInteger(handleNumber(inputValue)) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(handleNumber(inputValue));
 
             if (!this.vaildMinNum(inpNumVal)) {
               inpNumVal = min;
@@ -25465,7 +25586,7 @@ function renderExtraSuffixIcon(h, _vm) {
           type = this.type,
           inputValue = this.inputValue,
           stepValue = this.stepValue;
-      var numValue = type === 'integer' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toInteger(inputValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(inputValue);
+      var numValue = type === 'integer' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toInteger(handleNumber(inputValue)) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(handleNumber(inputValue));
       var newValue = isPlus ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.add(numValue, stepValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.subtract(numValue, stepValue);
       var restNum;
 
@@ -30632,6 +30753,7 @@ function validErrorRuleValue(rule, val) {
                     row: row,
                     columnIndex: _this2.getColumnIndex(column),
                     column: column,
+                    field: column.property,
                     $table: _this2
                   };
 
@@ -30779,6 +30901,7 @@ function validErrorRuleValue(rule, val) {
                   rowIndex: _this3.getRowIndex(row),
                   column: column,
                   columnIndex: _this3.getColumnIndex(column),
+                  field: column.property,
                   $table: _this3
                 });
 
@@ -34087,6 +34210,11 @@ var Toolbar = Object.assign(src_toolbar, {
       default: null
     }
   },
+  data: function data() {
+    return {
+      inpCurrPage: this.currentPage
+    };
+  },
   computed: {
     isSizes: function isSizes() {
       return this.layouts.some(function (name) {
@@ -34125,6 +34253,11 @@ var Toolbar = Object.assign(src_toolbar, {
       });
     }
   },
+  watch: {
+    currentPage: function currentPage(value) {
+      this.inpCurrPage = value;
+    }
+  },
   render: function render(h) {
     var _this = this,
         _ref;
@@ -34285,13 +34418,14 @@ var Toolbar = Object.assign(src_toolbar, {
       }, conf.i18n('vxe.pager.goto')) : null, h('input', {
         class: 'vxe-pager--goto',
         domProps: {
-          value: this.currentPage
+          value: this.inpCurrPage
         },
         attrs: {
           type: 'text',
           autocomplete: 'off'
         },
         on: {
+          input: this.jumpInputEvent,
           keydown: this.jumpKeydownEvent,
           blur: this.triggerJumpEvent
         }
@@ -34435,6 +34569,9 @@ var Toolbar = Object.assign(src_toolbar, {
         });
       }
     },
+    jumpInputEvent: function jumpInputEvent(evnt) {
+      this.inpCurrPage = evnt.target.value;
+    },
     jumpKeydownEvent: function jumpKeydownEvent(evnt) {
       if (evnt.keyCode === 13) {
         this.triggerJumpEvent(evnt);
@@ -36210,6 +36347,7 @@ function renderItems(h, _vm, itemList) {
     var hasEllipsis = showTitle || showTooltip || showEllipsis;
     var params = {
       data: data,
+      field: field,
       property: field,
       item: item,
       $form: _vm
@@ -36578,6 +36716,7 @@ function renderItems(h, _vm, itemList) {
             if (compConf && compConf.itemResetMethod) {
               compConf.itemResetMethod({
                 data: data,
+                field: field,
                 property: field,
                 item: item,
                 $form: _this4
@@ -36721,6 +36860,7 @@ function renderItems(h, _vm, itemList) {
                 rule: rule,
                 rules: rules,
                 data: data,
+                field: field,
                 property: field,
                 $form: _this7
               };
@@ -36812,6 +36952,7 @@ function renderItems(h, _vm, itemList) {
                   rule: rule,
                   rules: rules,
                   data: data,
+                  field: property,
                   property: property,
                   $form: _this8
                 });