vxe-table 3.4.14-beta.2 → 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);
           }
 
@@ -12904,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';
@@ -13289,6 +13328,8 @@ var Methods = {
     return this.handleTableData(true).then(function () {
       _this2.updateFooter();
 
+      _this2.checkSelectionStatus();
+
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
           _this2.updateScrollXSpace();
@@ -13301,7 +13342,14 @@ var Methods = {
         return _this2.refreshScroll();
       }
     }).then(function () {
-      return _this2.recalculate();
+      _this2.updateCellAreas();
+
+      return _this2.recalculate(true);
+    }).then(function () {
+      // 存在滚动行为未结束情况
+      setTimeout(function () {
+        return _this2.recalculate();
+      }, 50);
     });
   },
   handleTableData: function handleTableData(force) {
@@ -15148,6 +15196,8 @@ var Methods = {
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
    */
   refreshScroll: function refreshScroll() {
+    var _this22 = this;
+
     var lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop;
     var $refs = this.$refs;
@@ -15158,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);
+    });
   },
 
   /**
@@ -15176,7 +15233,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this22 = this;
+    var _this23 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -15192,9 +15249,9 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this22.autoCellWidth(headerElem, bodyElem, footerElem);
+          _this23.autoCellWidth(headerElem, bodyElem, footerElem);
 
-          return _this22.computeScrollLoad();
+          return _this23.computeScrollLoad();
         });
       }
     }
@@ -15342,7 +15399,7 @@ var Methods = {
     this.customMaxHeight = methods_calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this23 = this;
+    var _this24 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -15446,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 = _this23.getColumnNode(thElem);
+              var colNode = _this24.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -15476,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 {
@@ -15493,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");
             }
 
@@ -15563,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");
@@ -15627,10 +15684,10 @@ var Methods = {
 
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this23.getColumnIndex(column);
+                      var columnIndex = _this24.getColumnIndex(column);
 
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this23.getColumns(columnIndex + _index);
+                        var nextColumn = _this24.getColumns(columnIndex + _index);
 
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
@@ -15680,15 +15737,15 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this24 = 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: _this24.$xegrid,
-        $table: _this24,
+        $grid: _this25.$xegrid,
+        $table: _this25,
         $event: evnt
       }, args)) === false;
     })) {
@@ -15708,7 +15765,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this25 = this;
+    var _this26 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -15769,7 +15826,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this25.height && !_this25.overflowY) {
+                if (!isClearActived && _this26.height && !_this26.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -15780,7 +15837,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this25.clearActived(evnt);
+                    return _this26.clearActived(evnt);
                   });
                 }
               });
@@ -15794,9 +15851,9 @@ var Methods = {
 
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this25.clearCellAreas();
+            _this26.clearCellAreas();
 
-            _this25.clearCopyCellArea();
+            _this26.clearCopyCellArea();
           });
         }
       }
@@ -15831,7 +15888,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this26 = this;
+    var _this27 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
@@ -15846,33 +15903,33 @@ var Methods = {
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
-          _this26.handleKeyboardEvent(evnt);
+        if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
+          _this27.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation(); // 如果按下了 Esc 键，关闭快捷菜单、筛选
 
-          _this26.closeFilter();
+          _this27.closeFilter();
 
-          _this26.closeMenu();
+          _this27.closeMenu();
 
           if (keyboardConfig && keyboardOpts.isEsc) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               var params = actived.args;
 
-              _this26.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this27.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this26.$nextTick(function () {
-                  return _this26.handleSelected(params, evnt);
+                _this27.$nextTick(function () {
+                  return _this27.handleSelected(params, evnt);
                 });
               }
             }
           }
         }
 
-        _this26.emitEvent('keydown', {}, evnt);
+        _this27.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -15881,27 +15938,27 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this27 = this;
+    var _this28 = this;
 
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        var filterStore = _this27.filterStore,
-            isCtxMenu = _this27.isCtxMenu,
-            ctxMenuStore = _this27.ctxMenuStore,
-            editStore = _this27.editStore,
-            editOpts = _this27.editOpts,
-            editConfig = _this27.editConfig,
-            mouseConfig = _this27.mouseConfig,
-            mouseOpts = _this27.mouseOpts,
-            keyboardConfig = _this27.keyboardConfig,
-            keyboardOpts = _this27.keyboardOpts,
-            treeConfig = _this27.treeConfig,
-            treeOpts = _this27.treeOpts,
-            highlightCurrentRow = _this27.highlightCurrentRow,
-            currentRow = _this27.currentRow,
-            bodyCtxMenu = _this27.bodyCtxMenu,
-            rowOpts = _this27.rowOpts;
+        var 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;
@@ -15928,7 +15985,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this27.closeFilter();
+            _this28.closeFilter();
           }
 
           return;
@@ -15939,20 +15996,20 @@ var Methods = {
           evnt.preventDefault();
 
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this27.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this28.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this27.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this27.ctxMenuList);
+            _this28.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this28.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
-          _this27.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') {
-            _this27.handleToggleCheckRowEvent(evnt, selected.args);
+            _this28.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this27.triggerRadioRowEvent(evnt, selected.args);
+            _this28.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && isEnableConf(editConfig)) {
           if (!isEditStatus) {
@@ -15961,15 +16018,15 @@ var Methods = {
               evnt.stopPropagation();
               evnt.preventDefault();
 
-              _this27.handleActived(selected.args, evnt);
+              _this28.handleActived(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          _this27._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
-          clearTimeout(_this27.keyCtxTimeout);
-          _this27.keyCtxTimeout = setTimeout(function () {
-            _this27._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)) {
           // 退出选中
@@ -15978,12 +16035,12 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this27.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this28.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this27.$nextTick(function () {
-                  return _this27.handleSelected(params, evnt);
+                _this28.$nextTick(function () {
+                  return _this28.handleSelected(params, evnt);
                 });
               }
             }
@@ -15994,15 +16051,15 @@ var Methods = {
 
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this27.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this28.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this27.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this28.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this27.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this28.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this27.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this28.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -16013,14 +16070,14 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this27,
+                  $table: _this28,
                   row: targetRow
                 };
 
-                _this27.setTreeExpand(currentRow, true).then(function () {
-                  return _this27.scrollToRow(targetRow);
+                _this28.setTreeExpand(currentRow, true).then(function () {
+                  return _this28.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this27.triggerCurrentRowEvent(evnt, params);
+                  return _this28.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -16029,18 +16086,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this27.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this28.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this27.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this28.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this27.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this28.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this27.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) {
@@ -16051,10 +16108,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this27.getRowIndex(selected.row),
+                  rowIndex: _this28.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this27.getColumnIndex(selected.column),
-                  $table: _this27
+                  columnIndex: _this28.getColumnIndex(selected.column),
+                  $table: _this28
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
@@ -16064,21 +16121,21 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this27.getRowIndex(selected.row),
+                    rowIndex: _this28.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this27.getColumnIndex(selected.column),
-                    $table: _this27
+                    columnIndex: _this28.getColumnIndex(selected.column),
+                    $table: _this28
                   });
                 } else {
-                  _this27.handleActived(selected.args, evnt);
+                  _this28.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this27.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(_this27.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;
@@ -16086,14 +16143,14 @@ var Methods = {
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this27,
+                  $table: _this28,
                   row: parentRow
                 };
 
-                _this27.setTreeExpand(parentRow, false).then(function () {
-                  return _this27.scrollToRow(parentRow);
+                _this28.setTreeExpand(parentRow, false).then(function () {
+                  return _this28.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this27.triggerCurrentRowEvent(evnt, params);
+                  return _this28.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -16107,26 +16164,26 @@ var Methods = {
 
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
             if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
-              $table: _this27
+              $table: _this28
             }))) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this27.getRowIndex(selected.row),
+                  rowIndex: _this28.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this27.getColumnIndex(selected.column),
-                  $table: _this27
+                  columnIndex: _this28.getColumnIndex(selected.column),
+                  $table: _this28
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
 
-                _this27.handleActived(selected.args, evnt);
+                _this28.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this27.emitEvent('keydown', {}, evnt);
+        _this28.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -16196,12 +16253,12 @@ var Methods = {
     this.recalculate(true);
   },
   handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this28 = this;
+    var _this29 = this;
 
     var tooltipOpts = this.tooltipOpts;
     setTimeout(function () {
-      if (!_this28.tooltipActive) {
-        _this28.closeTooltip();
+      if (!_this29.tooltipActive) {
+        _this29.closeTooltip();
       }
     }, tooltipOpts.leaveDelay);
     return false;
@@ -16212,17 +16269,17 @@ var Methods = {
     this.closeTooltip();
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this29 = this;
+    var _this30 = this;
 
     var tooltipOpts = this.tooltipOpts;
     this.tooltipActive = false;
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        var tooltip = _this29.$refs.tooltip;
+        var tooltip = _this30.$refs.tooltip;
 
         if (tooltip && !tooltip.isHover) {
-          _this29.closeTooltip();
+          _this30.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -16452,14 +16509,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this30 = 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 _this30.handleSelectRow({
+      return _this31.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -16483,7 +16540,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value) {
-    var _this31 = this;
+    var _this32 = this;
 
     var row = _ref6.row;
     var selection = this.selection,
@@ -16515,7 +16572,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this31.handleCheckboxReserveRow(row, value);
+              _this32.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16587,7 +16644,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this31.handleCheckboxReserveRow(row, value);
+              _this32.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16691,7 +16748,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this32 = this;
+    var _this33 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -16804,11 +16861,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[methods_getRowid(_this32, row)] = row;
+            checkboxReserveRowMap[methods_getRowid(_this33, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this32.handleCheckboxReserveRow(row, false);
+            return _this33.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -17028,7 +17085,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this33 = this;
+    var _this34 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -17043,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(_this33, row)] = 1;
+          afterFullIdMaps[methods_getRowid(_this34, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[methods_getRowid(_this33, row)] = 1;
+          afterFullIdMaps[methods_getRowid(_this34, row)] = 1;
         });
       }
 
@@ -17113,7 +17170,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this34 = this;
+    var _this35 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -17136,7 +17193,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this34.handleCheckboxReserveRow(row, false);
+        return _this35.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -17427,13 +17484,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this35 = this;
+    var _this36 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this35.handleActived(params, evnt).then(function () {
-        return _this35.checkValidate('change');
+      _this36.handleActived(params, evnt).then(function () {
+        return _this36.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -17536,7 +17593,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this36 = this;
+    var _this37 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -17551,15 +17608,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this36.handleActived(params, evnt).then(function () {
-              return _this36.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 _this36.checkValidate('change');
+            return _this37.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -17570,7 +17627,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this37 = this;
+    var _this38 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -17587,7 +17644,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this37.getColumnByField(field);
+            var column = _this38.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -17630,7 +17687,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this38 = this;
+    var _this39 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -17663,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 = _this38.getColumnByField(field);
+          column = _this39.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -17672,7 +17729,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this38, column);
+            order = getNextSortOrder(_this39, column);
           }
 
           if (column.order !== order) {
@@ -17822,7 +17879,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this39 = this;
+    var _this40 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -17830,7 +17887,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this39.handleAsyncRowExpand(row);
+        return _this40.handleAsyncRowExpand(row);
       });
     }
 
@@ -17907,28 +17964,28 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this40 = this;
+    var _this41 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this40.expandLazyLoadeds.push(row);
+      _this41.expandLazyLoadeds.push(row);
 
-      _this40.expandOpts.loadMethod({
-        $table: _this40,
+      _this41.expandOpts.loadMethod({
+        $table: _this41,
         row: row,
-        rowIndex: _this40.getRowIndex(row),
-        $rowIndex: _this40.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(_this40.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;
         });
 
-        _this40.rowExpandeds.push(row);
+        _this41.rowExpandeds.push(row);
 
-        resolve(_this40.$nextTick().then(_this40.recalculate));
+        resolve(_this41.$nextTick().then(_this41.recalculate));
       });
     });
   },
@@ -17941,7 +17998,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this41 = this;
+    var _this42 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -17974,8 +18031,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this41.getRowIndex(row),
-          $rowIndex: _this41.getVMRowIndex(row)
+          rowIndex: _this42.getRowIndex(row),
+          $rowIndex: _this42.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -17986,7 +18043,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this41.handleAsyncRowExpand(row));
+              lazyRests.push(_this42.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -18000,7 +18057,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this41.handleRowExpandReserve(row, expanded);
+          return _this42.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -18021,7 +18078,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this42 = this;
+    var _this43 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -18032,13 +18089,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this42.handleRowExpandReserve(row, false);
+        return _this43.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this42.recalculate();
+        _this43.recalculate();
       }
     });
   },
@@ -18117,7 +18174,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this43 = this;
+    var _this44 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -18127,15 +18184,15 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this43.handleAsyncTreeExpandChilds(row);
+        return _this44.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this43.handleVirtualTreeToList();
+          _this44.handleVirtualTreeToList();
 
-          return _this43.handleTableData();
+          return _this44.handleTableData();
         }
       }).then(function () {
-        return _this43.recalculate();
+        return _this44.recalculate();
       });
     }
 
@@ -18211,7 +18268,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this44 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -18225,7 +18282,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this44,
+        $table: _this45,
         row: row
       }).catch(function () {
         return [];
@@ -18240,29 +18297,29 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this44.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 && _this44.isCheckedByCheckboxRow(row)) {
-              _this44.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this45.isCheckedByCheckboxRow(row)) {
+              _this45.setCheckboxRow(childRows, true);
             }
 
-            _this44.$nextTick().then(function () {
+            _this45.$nextTick().then(function () {
               if (transform) {
-                return _this44.handleTableData();
+                return _this45.handleTableData();
               }
             }).then(function () {
-              return _this44.recalculate();
+              return _this45.recalculate();
             }).then(function () {
               return resolve();
             });
           });
         } else {
-          _this44.$nextTick().then(function () {
-            return _this44.recalculate();
+          _this45.$nextTick().then(function () {
+            return _this45.recalculate();
           }).then(function () {
             return resolve();
           });
@@ -18298,7 +18355,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this45 = this;
+    var _this46 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -18346,7 +18403,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this45.handleAsyncTreeExpandChilds(row));
+            result.push(_this46.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -18362,7 +18419,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this45.handleTreeExpandReserve(row, expanded);
+        return _this46.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -18376,14 +18433,14 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this46 = this;
+    var _this47 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this46.handleVirtualTreeToList();
+      _this47.handleVirtualTreeToList();
 
-      return _this46.handleTableData();
+      return _this47.handleTableData();
     }).then(function () {
-      return _this46.recalculate();
+      return _this47.recalculate();
     });
   },
 
@@ -18428,7 +18485,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this47 = this;
+    var _this48 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -18440,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 _this47.handleTreeExpandReserve(row, false);
+        return _this48.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
     return this.handleTableData().then(function () {
       if (transform) {
-        _this47.handleVirtualTreeToList();
+        _this48.handleVirtualTreeToList();
 
-        return _this47.handleTableData();
+        return _this48.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this47.recalculate();
+        _this48.recalculate();
       }
     });
   },
@@ -18582,18 +18639,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this48 = this;
+    var _this49 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this48.sYOpts,
-          sXOpts = _this48.sXOpts,
-          scrollXLoad = _this48.scrollXLoad,
-          scrollYLoad = _this48.scrollYLoad,
-          scrollXStore = _this48.scrollXStore,
-          scrollYStore = _this48.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(_this48),
+        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;
@@ -18601,13 +18658,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this48.updateScrollXData();
+        _this49.updateScrollXData();
       } else {
-        _this48.updateScrollXSpace();
+        _this49.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this48),
+      var _computeVirtualY = computeVirtualY(_this49),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -18619,14 +18676,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this48.updateScrollYData();
+        _this49.updateScrollYData();
       } else {
-        _this48.updateScrollYSpace();
+        _this49.updateScrollYSpace();
       }
 
-      _this48.rowHeight = rowHeight;
+      _this49.rowHeight = rowHeight;
 
-      _this48.$nextTick(_this48.updateStyle);
+      _this49.$nextTick(_this49.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -18740,7 +18797,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this49 = this;
+    var _this50 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -18761,7 +18818,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this49.$nextTick());
+          return resolve(_this50.$nextTick());
         }, 50);
       });
     }
@@ -18812,7 +18869,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this50 = this;
+    var _this51 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -18827,15 +18884,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this50.isTreeExpandByRow(row)) {
-            rests.push(_this50.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(_this50, row);
+      return DomTools.rowToVisible(_this51, row);
     });
   },
 
@@ -18899,29 +18956,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this51 = 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 = _this51.$refs,
-          editRules = _this51.editRules,
-          validStore = _this51.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 (_this51.hasCellRules(type, row, column)) {
-          var cell = _this51.getCell(row, column);
+        if (_this52.hasCellRules(type, row, column)) {
+          var cell = _this52.getCell(row, column);
 
           if (cell) {
-            return _this51.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);
               }
 
-              _this51.clearValidate();
+              _this52.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -18929,7 +18986,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this51.showValidTooltip({
+              _this52.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -18950,7 +19007,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this52 = this;
+    var _this53 = this;
 
     if (this.spanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -18958,7 +19015,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this53.updateCellAreas();
     });
   },
 
@@ -18967,7 +19024,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this53 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -18975,7 +19032,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this54.updateCellAreas();
 
       return rest;
     });
@@ -18999,7 +19056,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this55 = this;
 
     if (this.footerSpanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19007,11 +19064,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this54.updateCellAreas();
+      return _this55.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19019,7 +19076,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this55.updateCellAreas();
+      _this56.updateCellAreas();
 
       return rest;
     });
@@ -20914,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 = [];
@@ -20931,19 +20988,6 @@ var Table = Object.assign(table, {
       if (!filterOpts.remote) {
         this.handleTableData(true);
         this.checkSelectionStatus();
-        this.updateFooter();
-
-        if (scrollXLoad || scrollYLoad) {
-          if (scrollXLoad) {
-            this.updateScrollXSpace();
-          }
-
-          if (scrollYLoad) {
-            this.updateScrollYSpace();
-          }
-
-          this.refreshScroll();
-        }
       }
 
       this.emitEvent('filter-change', {
@@ -20955,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) {