vxe-table 3.6.14-beta.1 → 3.6.14-beta.2

package/lib/table/src/methods.js

@@ -787,7 +787,9 @@ var Methods = {
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
       fullColumnMap = this.fullColumnMap,
-      showOverflow = this.showOverflow;
+      showOverflow = this.showOverflow,
+      columnOpts = this.columnOpts,
+      rowOpts = this.rowOpts;
     var fullColumnIdData = this.fullColumnIdData = {};
     var fullColumnFieldData = this.fullColumnFieldData = {};
     var isGroup = collectColumn.some(hasChildrenList);
@@ -796,6 +798,7 @@ var Methods = {
     var treeNodeColumn;
     var checkboxColumn;
     var radioColumn;
+    var htmlColumn;
     var hasFixed;
     var handleFunc = function handleFunc(column, index, items, path, parent) {
       var colid = column.id,
@@ -821,6 +824,9 @@ var Methods = {
       if (!hasFixed && fixed) {
         hasFixed = fixed;
       }
+      if (!htmlColumn && type === 'html') {
+        htmlColumn = column;
+      }
       if (treeNode) {
         if (process.env.NODE_ENV === 'development') {
           if (treeNodeColumn) {
@@ -868,6 +874,16 @@ var Methods = {
           (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
         }
       }
+      if (process.env.NODE_ENV === 'development') {
+        if (htmlColumn) {
+          if (!columnOpts.useKey) {
+            (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
+          }
+          if (!rowOpts.useKey) {
+            (0, _log.errLog)('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
+          }
+        }
+      }
       if (isAllOverflow && column.showOverflow === false) {
         isAllOverflow = false;
       }
@@ -1043,7 +1059,7 @@ var Methods = {
       expandOpts = this.expandOpts;
     var rowkey = (0, _util.getRowkey)(this);
     if (!_xeUtils["default"].isArray(records)) {
-      records = [records];
+      records = [records || {}];
     }
     return records.map(function (record) {
       _this13.tableFullColumn.forEach(function (column) {
@@ -1087,14 +1103,8 @@ var Methods = {
    */
   createData: function createData(records) {
     var _this14 = this;
-    var treeConfig = this.treeConfig,
-      treeOpts = this.treeOpts;
-    var handleRrecord = function handleRrecord(record) {
-      return _this14.defineField(Object.assign({}, record));
-    };
-    var rows = treeConfig ? _xeUtils["default"].mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
     return this.$nextTick().then(function () {
-      return rows;
+      return _this14.defineField(records);
     });
   },
   /**
@@ -1103,15 +1113,12 @@ var Methods = {
    * @param {Array/Object} records 新数据
    */
   createRow: function createRow(records) {
-    var _this15 = this;
     var isArr = _xeUtils["default"].isArray(records);
     if (!isArr) {
       records = [records];
     }
-    return this.$nextTick().then(function () {
-      return _this15.createData(records).then(function (rows) {
-        return isArr ? rows : rows[0];
-      });
+    return this.createData(records).then(function (rows) {
+      return isArr ? rows : rows[0];
     });
   },
   /**
@@ -1122,7 +1129,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this16 = this;
+    var _this15 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeConfig = this.treeConfig;
@@ -1142,8 +1149,8 @@ var Methods = {
     }
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this16.isInsertByRow(row)) {
-          var rowIndex = _this16.getRowIndex(row);
+        if (!_this15.isInsertByRow(row)) {
+          var rowIndex = _this15.getRowIndex(row);
           if (treeConfig && rowIndex === -1) {
             (0, _log.errLog)('vxe.error.noTree', ['revertData']);
           }
@@ -1217,7 +1224,7 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this17 = this;
+    var _this16 = this;
     var visibleColumn = this.visibleColumn,
       keepSource = this.keepSource,
       treeConfig = this.treeConfig,
@@ -1234,7 +1241,7 @@ var Methods = {
       if (treeConfig) {
         var children = treeOpts.children;
         var matchObj = _xeUtils["default"].findTree(tableSourceData, function (item) {
-          return rowid === (0, _util.getRowid)(_this17, item);
+          return rowid === (0, _util.getRowid)(_this16, item);
         }, treeOpts);
         row = Object.assign({}, row, _defineProperty({}, children, null));
         if (matchObj) {
@@ -1305,7 +1312,7 @@ var Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords: function getCheckboxRecords(isFull) {
-    var _this18 = this;
+    var _this17 = this;
     var tableFullData = this.tableFullData,
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
@@ -1335,13 +1342,13 @@ var Methods = {
       var selection = this.selection;
       if (treeConfig) {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
-          return _this18.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selection, row) > -1;
         }, {
           children: transform ? mapChildren : children
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return _this18.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selection, row) > -1;
         });
       }
     }
@@ -1379,7 +1386,7 @@ var Methods = {
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData: function updateAfterFullData() {
-    var _this19 = this;
+    var _this18 = this;
     var tableFullColumn = this.tableFullColumn,
       tableFullData = this.tableFullData,
       filterOpts = this.filterOpts,
@@ -1455,7 +1462,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this19
+                  $table: _this18
                 });
               });
             } else if (compFilterMethod) {
@@ -1466,7 +1473,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this19
+                  $table: _this18
                 });
               });
             } else if (allFilterMethod) {
@@ -1485,7 +1492,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this19
+                  $table: _this18
                 });
               });
             }
@@ -1533,7 +1540,7 @@ var Methods = {
           tableTree = _xeUtils["default"].orderBy(tableTree, orderColumns.map(function (_ref2) {
             var column = _ref2.column,
               order = _ref2.order;
-            return [getOrderField(_this19, column), order];
+            return [getOrderField(_this18, column), order];
           }));
         }
         tableData = tableTree;
@@ -1555,7 +1562,7 @@ var Methods = {
             tableData = _xeUtils["default"].orderBy(tableData, orderColumns.map(function (_ref3) {
               var column = _ref3.column,
                 order = _ref3.order;
-              return [getOrderField(_this19, column), order];
+              return [getOrderField(_this18, column), order];
             }));
           } else {
             // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
@@ -1568,7 +1575,7 @@ var Methods = {
             tableData = _xeUtils["default"].orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
               var column = _ref4.column,
                 order = _ref4.order;
-              return [getOrderField(_this19, column), order];
+              return [getOrderField(_this18, column), order];
             }));
           }
         }
@@ -1584,7 +1591,7 @@ var Methods = {
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex: function updateAfterDataIndex() {
-    var _this20 = this;
+    var _this19 = this;
     var treeConfig = this.treeConfig,
       afterFullData = this.afterFullData,
       fullDataRowIdData = this.fullDataRowIdData,
@@ -1593,7 +1600,7 @@ var Methods = {
       treeOpts = this.treeOpts;
     if (treeConfig) {
       _xeUtils["default"].eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = (0, _util.getRowid)(_this20, row);
+        var rowid = (0, _util.getRowid)(_this19, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -1621,7 +1628,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = (0, _util.getRowid)(_this20, row);
+        var rowid = (0, _util.getRowid)(_this19, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
         if (allrest) {
@@ -1703,7 +1710,7 @@ var Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults: function handleLoadDefaults() {
-    var _this21 = this;
+    var _this20 = this;
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
     }
@@ -1723,7 +1730,7 @@ var Methods = {
       this.handleDefaultMergeFooterItems();
     }
     this.$nextTick(function () {
-      return setTimeout(_this21.recalculate);
+      return setTimeout(_this20.recalculate);
     });
   },
   /**
@@ -1961,11 +1968,11 @@ var Methods = {
    * 刷新列配置
    */
   refreshColumn: function refreshColumn() {
-    var _this22 = this;
+    var _this21 = this;
     return this.parseColumns().then(function () {
-      return _this22.refreshScroll();
+      return _this21.refreshScroll();
     }).then(function () {
-      return _this22.recalculate();
+      return _this21.recalculate();
     });
   },
   /**
@@ -1973,7 +1980,7 @@ var Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns: function parseColumns() {
-    var _this23 = this;
+    var _this22 = this;
     var leftList = [];
     var centerList = [];
     var rightList = [];
@@ -2079,10 +2086,10 @@ var Methods = {
     this.visibleColumn = visibleColumn;
     this.handleTableColumn();
     return this.updateFooter().then(function () {
-      return _this23.recalculate();
+      return _this22.recalculate();
     }).then(function () {
-      _this23.updateCellAreas();
-      return _this23.recalculate();
+      _this22.updateCellAreas();
+      return _this22.recalculate();
     });
   },
   /**
@@ -2134,7 +2141,7 @@ var Methods = {
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
    */
   refreshScroll: function refreshScroll() {
-    var _this24 = this;
+    var _this23 = this;
     var lastScrollLeft = this.lastScrollLeft,
       lastScrollTop = this.lastScrollTop;
     var $refs = this.$refs;
@@ -2149,7 +2156,7 @@ var Methods = {
     return new Promise(function (resolve) {
       // 还原滚动条位置
       if (lastScrollLeft || lastScrollTop) {
-        return (0, _util.restoreScrollLocation)(_this24, lastScrollLeft, lastScrollTop).then(function () {
+        return (0, _util.restoreScrollLocation)(_this23, lastScrollLeft, lastScrollTop).then(function () {
           // 存在滚动行为未结束情况
           setTimeout(resolve, 30);
         });
@@ -2168,7 +2175,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this25 = this;
+    var _this24 = this;
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
       tableHeader = $refs.tableHeader,
@@ -2181,8 +2188,8 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this25.autoCellWidth(headerElem, bodyElem, footerElem);
-          return _this25.computeScrollLoad();
+          _this24.autoCellWidth(headerElem, bodyElem, footerElem);
+          return _this24.computeScrollLoad();
         });
       }
     }
@@ -2316,7 +2323,7 @@ var Methods = {
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this26 = this;
+    var _this25 = this;
     var $refs = this.$refs,
       isGroup = this.isGroup,
       fullColumnIdData = this.fullColumnIdData,
@@ -2404,7 +2411,7 @@ var Methods = {
           var listElem = elemStore["".concat(name, "-").concat(layout, "-list")];
           if (isGroup && listElem) {
             _xeUtils["default"].arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this26.getColumnNode(thElem);
+              var colNode = _this25.getColumnNode(thElem);
               if (colNode) {
                 var column = colNode.item;
                 var showHeaderOverflow = column.showHeaderOverflow;
@@ -2459,7 +2466,7 @@ var Methods = {
           // 如果是使用优化模式
           if (fixedType) {
             // 如果存在展开行使用全量渲染
-            if (!_this26.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
+            if (!_this25.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
               if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                 _renderColumnList = fixedColumn;
               } else {
@@ -2487,7 +2494,7 @@ var Methods = {
           // 如果是使用优化模式
           if (fixedType) {
             // 如果存在展开行使用全量渲染
-            if (!_this26.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
+            if (!_this25.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
               if (!mergeFooterList.length || !footerSpanMethod) {
                 _renderColumnList2 = fixedColumn;
               } else {
@@ -2554,9 +2561,9 @@ var Methods = {
                   var colWidth = column.renderWidth;
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this26.getColumnIndex(column);
+                      var columnIndex = _this25.getColumnIndex(column);
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this26.getColumns(columnIndex + _index);
+                        var nextColumn = _this25.getColumns(columnIndex + _index);
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
                         }
@@ -2598,13 +2605,13 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this27 = this;
+    var _this26 = this;
     var evntList = _vXETable["default"].interceptor.get(type);
     var rest;
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this27.$xegrid,
-        $table: _this27,
+        $grid: _this26.$xegrid,
+        $table: _this26,
         $event: evnt
       }, args)) === false;
     })) {
@@ -2621,7 +2628,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this28 = this;
+    var _this27 = this;
     var $el = this.$el,
       $refs = this.$refs,
       $xegrid = this.$xegrid,
@@ -2677,7 +2684,7 @@ var Methods = {
                   isClearActived = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag;
                 }
                 // 如果固定了高度且点击了行之外的空白处，则清除激活状态
-                if (!isClearActived && _this28.height && !_this28.overflowY) {
+                if (!isClearActived && _this27.height && !_this27.overflowY) {
                   var bodyWrapperElem = evnt.target;
                   if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
                     isClearActived = evnt.offsetY < bodyWrapperElem.clientHeight;
@@ -2687,7 +2694,7 @@ var Methods = {
                 // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this28.clearEdit(evnt);
+                    return _this27.clearEdit(evnt);
                   });
                 }
               });
@@ -2700,8 +2707,8 @@ var Methods = {
         this.clearSelected();
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this28.clearCellAreas();
-            _this28.clearCopyCellArea();
+            _this27.clearCellAreas();
+            _this27.clearCopyCellArea();
           });
         }
       }
@@ -2731,7 +2738,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this29 = this;
+    var _this28 = this;
     var filterStore = this.filterStore,
       ctxMenuStore = this.ctxMenuStore,
       editStore = this.editStore,
@@ -2744,30 +2751,30 @@ var Methods = {
     var isEsc = keyCode === 27;
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        _this29.emitEvent('keydown-start', {}, evnt);
-        if (keyboardConfig && mouseConfig && mouseOpts.area && _this29.handleKeyboardEvent) {
-          _this29.handleKeyboardEvent(evnt);
+        _this28.emitEvent('keydown-start', {}, evnt);
+        if (keyboardConfig && mouseConfig && mouseOpts.area && _this28.handleKeyboardEvent) {
+          _this28.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation();
           // 如果按下了 Esc 键，关闭快捷菜单、筛选
-          _this29.closeFilter();
-          _this29.closeMenu();
+          _this28.closeFilter();
+          _this28.closeMenu();
           if (keyboardConfig && keyboardOpts.isEsc) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               var params = actived.args;
-              _this29.clearEdit(evnt);
+              _this28.clearEdit(evnt);
               // 如果配置了选中功能，则为选中状态
               if (mouseConfig && mouseOpts.selected) {
-                _this29.$nextTick(function () {
-                  return _this29.handleSelected(params, evnt);
+                _this28.$nextTick(function () {
+                  return _this28.handleSelected(params, evnt);
                 });
               }
             }
           }
         }
-        _this29.emitEvent('keydown', {}, evnt);
-        _this29.emitEvent('keydown-end', {}, evnt);
+        _this28.emitEvent('keydown', {}, evnt);
+        _this28.emitEvent('keydown-end', {}, evnt);
       });
     }
   },
@@ -2775,26 +2782,26 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this30 = this;
+    var _this29 = this;
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        var filterStore = _this30.filterStore,
-          isCtxMenu = _this30.isCtxMenu,
-          ctxMenuStore = _this30.ctxMenuStore,
-          editStore = _this30.editStore,
-          editOpts = _this30.editOpts,
-          editConfig = _this30.editConfig,
-          mouseConfig = _this30.mouseConfig,
-          mouseOpts = _this30.mouseOpts,
-          keyboardConfig = _this30.keyboardConfig,
-          keyboardOpts = _this30.keyboardOpts,
-          treeConfig = _this30.treeConfig,
-          treeOpts = _this30.treeOpts,
-          highlightCurrentRow = _this30.highlightCurrentRow,
-          currentRow = _this30.currentRow,
-          bodyCtxMenu = _this30.bodyCtxMenu,
-          rowOpts = _this30.rowOpts;
+        var filterStore = _this29.filterStore,
+          isCtxMenu = _this29.isCtxMenu,
+          ctxMenuStore = _this29.ctxMenuStore,
+          editStore = _this29.editStore,
+          editOpts = _this29.editOpts,
+          editConfig = _this29.editConfig,
+          mouseConfig = _this29.mouseConfig,
+          mouseOpts = _this29.mouseOpts,
+          keyboardConfig = _this29.keyboardConfig,
+          keyboardOpts = _this29.keyboardOpts,
+          treeConfig = _this29.treeConfig,
+          treeOpts = _this29.treeOpts,
+          highlightCurrentRow = _this29.highlightCurrentRow,
+          currentRow = _this29.currentRow,
+          bodyCtxMenu = _this29.bodyCtxMenu,
+          rowOpts = _this29.rowOpts;
         var selected = editStore.selected,
           actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -2820,7 +2827,7 @@ var Methods = {
         var params;
         if (filterStore.visible) {
           if (isEsc) {
-            _this30.closeFilter();
+            _this29.closeFilter();
           }
           return;
         }
@@ -2828,19 +2835,19 @@ var Methods = {
           // 如果配置了右键菜单; 支持方向键操作、回车
           evnt.preventDefault();
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this30.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this29.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this30.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this30.ctxMenuList);
+            _this29.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this29.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this30.handleKeyboardEvent) {
-          _this30.handleKeyboardEvent(evnt);
+        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this29.handleKeyboardEvent) {
+          _this29.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') {
-            _this30.handleToggleCheckRowEvent(evnt, selected.args);
+            _this29.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this30.triggerRadioRowEvent(evnt, selected.args);
+            _this29.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && (0, _utils.isEnableConf)(editConfig)) {
           if (!isEditStatus) {
@@ -2848,15 +2855,15 @@ var Methods = {
             if (selected.row && selected.column) {
               evnt.stopPropagation();
               evnt.preventDefault();
-              _this30.handleActived(selected.args, evnt);
+              _this29.handleActived(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          _this30._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
-          clearTimeout(_this30.keyCtxTimeout);
-          _this30.keyCtxTimeout = setTimeout(function () {
-            _this30._keyCtx = false;
+          _this29._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          clearTimeout(_this29.keyCtxTimeout);
+          _this29.keyCtxTimeout = setTimeout(function () {
+            _this29._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
@@ -2864,11 +2871,11 @@ var Methods = {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               params = actived.args;
-              _this30.clearEdit(evnt);
+              _this29.clearEdit(evnt);
               // 如果配置了选中功能，则为选中状态
               if (mouseConfig && mouseOpts.selected) {
-                _this30.$nextTick(function () {
-                  return _this30.handleSelected(params, evnt);
+                _this29.$nextTick(function () {
+                  return _this29.handleSelected(params, evnt);
                 });
               }
             }
@@ -2878,15 +2885,15 @@ var Methods = {
               var targetArgs = selected.row ? selected.args : actived.args;
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this30.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this29.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this30.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this29.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this30.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this29.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this30.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this29.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -2896,13 +2903,13 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this30,
+                  $table: _this29,
                   row: targetRow
                 };
-                _this30.setTreeExpand(currentRow, true).then(function () {
-                  return _this30.scrollToRow(targetRow);
+                _this29.setTreeExpand(currentRow, true).then(function () {
+                  return _this29.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this30.triggerCurrentRowEvent(evnt, params);
+                  return _this29.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -2911,18 +2918,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this30.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this29.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this30.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this29.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this30.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this29.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this30.moveTabSelected(actived.args, hasShiftKey, evnt);
+            _this29.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
         } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
@@ -2933,10 +2940,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this30.getRowIndex(selected.row),
+                  rowIndex: _this29.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this30.getColumnIndex(selected.column),
-                  $table: _this30
+                  columnIndex: _this29.getColumnIndex(selected.column),
+                  $table: _this29
                 });
               } else {
                 setCellValue(selected.row, selected.column, null);
@@ -2945,34 +2952,34 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this30.getRowIndex(selected.row),
+                    rowIndex: _this29.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this30.getColumnIndex(selected.column),
-                    $table: _this30
+                    columnIndex: _this29.getColumnIndex(selected.column),
+                    $table: _this29
                   });
                 } else {
-                  _this30.handleActived(selected.args, evnt);
+                  _this29.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this30.updateFooter();
+                _this29.updateFooter();
               }
             } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
-              var _XEUtils$findTree = _xeUtils["default"].findTree(_this30.afterFullData, function (item) {
+              var _XEUtils$findTree = _xeUtils["default"].findTree(_this29.afterFullData, function (item) {
                   return item === currentRow;
                 }, treeOpts),
                 parentRow = _XEUtils$findTree.parent;
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this30,
+                  $table: _this29,
                   row: parentRow
                 };
-                _this30.setTreeExpand(parentRow, false).then(function () {
-                  return _this30.scrollToRow(parentRow);
+                _this29.setTreeExpand(parentRow, false).then(function () {
+                  return _this29.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this30.triggerCurrentRowEvent(evnt, params);
+                  return _this29.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -2987,24 +2994,24 @@ var Methods = {
           if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
             var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
             if (!beforeEditMethod || beforeEditMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
-              $table: _this30
+              $table: _this29
             }))) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this30.getRowIndex(selected.row),
+                  rowIndex: _this29.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this30.getColumnIndex(selected.column),
-                  $table: _this30
+                  columnIndex: _this29.getColumnIndex(selected.column),
+                  $table: _this29
                 });
               } else {
                 setCellValue(selected.row, selected.column, null);
-                _this30.handleActived(selected.args, evnt);
+                _this29.handleActived(selected.args, evnt);
               }
             }
           }
         }
-        _this30.emitEvent('keydown', {}, evnt);
+        _this29.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -3079,7 +3086,7 @@ var Methods = {
     }
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this31 = this;
+    var _this30 = this;
     var tooltipOpts = this.tooltipOpts;
     var $tooltip = this.$refs.tooltip;
     if ($tooltip) {
@@ -3087,9 +3094,9 @@ var Methods = {
     }
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        $tooltip = _this31.$refs.tooltip;
+        $tooltip = _this30.$refs.tooltip;
         if ($tooltip && !$tooltip.isActived()) {
-          _this31.closeTooltip();
+          _this30.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -3267,13 +3274,13 @@ var Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords: function getCheckboxIndeterminateRecords(isFull) {
-    var _this32 = this;
+    var _this31 = this;
     var treeConfig = this.treeConfig,
       treeIndeterminates = this.treeIndeterminates,
       fullDataRowIdData = this.fullDataRowIdData;
     if (treeConfig) {
       return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(function (row) {
-        var rowid = (0, _util.getRowid)(_this32, row);
+        var rowid = (0, _util.getRowid)(_this31, row);
         return fullDataRowIdData[rowid];
       });
     }
@@ -3300,12 +3307,12 @@ var Methods = {
     }
   },
   handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
-    var _this33 = this;
+    var _this32 = this;
     if (rows && !_xeUtils["default"].isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(function (row) {
-      return _this33.handleSelectRow({
+      return _this32.handleSelectRow({
         row: row
       }, !!value, isForce);
     });
@@ -3336,7 +3343,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
-    var _this34 = this;
+    var _this33 = this;
     var row = _ref6.row;
     var selection = this.selection,
       afterFullData = this.afterFullData,
@@ -3357,20 +3364,20 @@ var Methods = {
         } else {
           // 更新子节点状态
           _xeUtils["default"].eachTree([row], function (item) {
-            if (_this34.eqRow(item, row) || isForce || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               _xeUtils["default"].set(item, checkField, value);
               _xeUtils["default"].remove(treeIndeterminates, function (half) {
-                return _this34.eqRow(half, item);
+                return _this33.eqRow(half, item);
               });
-              _this34.handleCheckboxReserveRow(row, value);
+              _this33.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         }
         // 如果存在父节点，更新父节点状态
         var matchObj = _xeUtils["default"].findTree(afterFullData, function (item) {
-          return _this34.eqRow(item, row);
+          return _this33.eqRow(item, row);
         }, treeOpts);
         if (matchObj && matchObj.parent) {
           var parentStatus;
@@ -3380,7 +3387,7 @@ var Methods = {
             });
           }) : matchObj.items;
           var indeterminatesItem = _xeUtils["default"].find(matchObj.items, function (item) {
-            return _this34.findRowIndexOf(treeIndeterminates, item) > -1;
+            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
           });
           if (indeterminatesItem) {
             parentStatus = -1;
@@ -3389,7 +3396,7 @@ var Methods = {
               return _xeUtils["default"].get(item, checkField);
             });
             parentStatus = selectItems.filter(function (item) {
-              return _this34.findRowIndexOf(vItems, item) > -1;
+              return _this33.findRowIndexOf(vItems, item) > -1;
             }).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
           }
           return this.handleSelectRow({
@@ -3411,31 +3418,31 @@ var Methods = {
             treeIndeterminates.push(row);
           }
           _xeUtils["default"].remove(selection, function (item) {
-            return _this34.eqRow(item, row);
+            return _this33.eqRow(item, row);
           });
         } else {
           // 更新子节点状态
           _xeUtils["default"].eachTree([row], function (item) {
-            if (_this34.eqRow(item, row) || isForce || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               if (value) {
                 selection.push(item);
               } else {
                 _xeUtils["default"].remove(selection, function (select) {
-                  return _this34.eqRow(select, item);
+                  return _this33.eqRow(select, item);
                 });
               }
               _xeUtils["default"].remove(treeIndeterminates, function (half) {
-                return _this34.eqRow(half, item);
+                return _this33.eqRow(half, item);
               });
-              _this34.handleCheckboxReserveRow(row, value);
+              _this33.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         }
         // 如果存在父节点，更新父节点状态
         var _matchObj = _xeUtils["default"].findTree(afterFullData, function (item) {
-          return _this34.eqRow(item, row);
+          return _this33.eqRow(item, row);
         }, treeOpts);
         if (_matchObj && _matchObj.parent) {
           var _parentStatus;
@@ -3445,16 +3452,16 @@ var Methods = {
             });
           }) : _matchObj.items;
           var _indeterminatesItem = _xeUtils["default"].find(_matchObj.items, function (item) {
-            return _this34.findRowIndexOf(treeIndeterminates, item) > -1;
+            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
           });
           if (_indeterminatesItem) {
             _parentStatus = -1;
           } else {
             var _selectItems = _matchObj.items.filter(function (item) {
-              return _this34.findRowIndexOf(selection, item) > -1;
+              return _this33.findRowIndexOf(selection, item) > -1;
             });
             _parentStatus = _selectItems.filter(function (item) {
-              return _this34.findRowIndexOf(_vItems, item) > -1;
+              return _this33.findRowIndexOf(_vItems, item) > -1;
             }).length === _vItems.length ? true : _selectItems.length || value === -1 ? -1 : false;
           }
           return this.handleSelectRow({
@@ -3471,7 +3478,7 @@ var Methods = {
             }
           } else {
             _xeUtils["default"].remove(selection, function (item) {
-              return _this34.eqRow(item, row);
+              return _this33.eqRow(item, row);
             });
           }
           this.handleCheckboxReserveRow(row, value);
@@ -3520,7 +3527,7 @@ var Methods = {
     return this.$nextTick();
   },
   handleCheckedAllCheckboxRow: function handleCheckedAllCheckboxRow(value, isForce) {
-    var _this35 = this;
+    var _this34 = this;
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -3533,7 +3540,7 @@ var Methods = {
       checkMethod = checkboxOpts.checkMethod;
     var selectRows = [];
     var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
-      return _this35.findRowIndexOf(afterFullData, row) === -1;
+      return _this34.findRowIndexOf(afterFullData, row) === -1;
     });
     if (checkStrictly) {
       this.isAllSelected = value;
@@ -3587,7 +3594,7 @@ var Methods = {
               _xeUtils["default"].eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
-                }) ? 0 : _this35.findRowIndexOf(selection, row) > -1) {
+                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
                   selectRows.push(row);
                 }
               }, treeOpts);
@@ -3602,7 +3609,7 @@ var Methods = {
              */
             if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
-                return _this35.findRowIndexOf(selection, row) > -1 || checkMethod({
+                return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
                   row: row
                 });
               });
@@ -3619,7 +3626,7 @@ var Methods = {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
-                }) ? 0 : _this35.findRowIndexOf(selection, row) > -1;
+                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
               });
             }
           }
@@ -3628,11 +3635,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[(0, _util.getRowid)(_this35, row)] = row;
+            checkboxReserveRowMap[(0, _util.getRowid)(_this34, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this35.handleCheckboxReserveRow(row, false);
+            return _this34.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -3650,7 +3657,7 @@ var Methods = {
     return this.handleCheckedAllCheckboxRow(value, true);
   },
   checkSelectionStatus: function checkSelectionStatus() {
-    var _this36 = this;
+    var _this35 = this;
     var afterFullData = this.afterFullData,
       selection = this.selection,
       treeIndeterminates = this.treeIndeterminates,
@@ -3686,11 +3693,11 @@ var Methods = {
         if (treeConfig) {
           if (halfField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return _xeUtils["default"].get(row, checkField) || _xeUtils["default"].get(row, halfField) || _this36.findRowIndexOf(treeIndeterminates, row) > -1;
+              return _xeUtils["default"].get(row, checkField) || _xeUtils["default"].get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return _xeUtils["default"].get(row, checkField) || _this36.findRowIndexOf(treeIndeterminates, row) > -1;
+              return _xeUtils["default"].get(row, checkField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
             });
           }
         } else {
@@ -3712,22 +3719,22 @@ var Methods = {
             disableRows.push(row);
             return true;
           }
-          if (_this36.findRowIndexOf(selection, row) > -1) {
+          if (_this35.findRowIndexOf(selection, row) > -1) {
             checkRows.push(row);
             return true;
           }
           return false;
         } : function (row) {
-          return _this36.findRowIndexOf(selection, row) > -1;
+          return _this35.findRowIndexOf(selection, row) > -1;
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this36.findRowIndexOf(treeIndeterminates, row) > -1 || _this36.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this36.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(selection, row) > -1;
           });
         }
       }
@@ -3833,7 +3840,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this37 = this;
+    var _this36 = this;
     var fullDataRowIdData = this.fullDataRowIdData,
       afterFullData = this.afterFullData,
       checkboxReserveRowMap = this.checkboxReserveRowMap,
@@ -3845,11 +3852,11 @@ var Methods = {
       var afterFullIdMaps = {};
       if (treeConfig) {
         _xeUtils["default"].eachTree(afterFullData, function (row) {
-          afterFullIdMaps[(0, _util.getRowid)(_this37, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this36, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[(0, _util.getRowid)(_this37, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this36, row)] = 1;
         });
       }
       _xeUtils["default"].each(checkboxReserveRowMap, function (oldRow, oldRowid) {
@@ -3908,7 +3915,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this38 = this;
+    var _this37 = this;
     var tableFullData = this.tableFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -3928,7 +3935,7 @@ var Methods = {
     }
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this38.handleCheckboxReserveRow(row, false);
+        return _this37.handleCheckboxReserveRow(row, false);
       });
     }
     this.isAllSelected = false;
@@ -4180,12 +4187,12 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this39 = this;
+    var _this38 = this;
     this.checkValidate('blur')["catch"](function (e) {
       return e;
     }).then(function () {
-      _this39.handleActived(params, evnt).then(function () {
-        return _this39.checkValidate('change');
+      _this38.handleActived(params, evnt).then(function () {
+        return _this38.checkValidate('change');
       })["catch"](function (e) {
         return e;
       });
@@ -4279,7 +4286,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this40 = this;
+    var _this39 = this;
     var editStore = this.editStore,
       editConfig = this.editConfig,
       editOpts = this.editOpts;
@@ -4292,15 +4299,15 @@ var Methods = {
           this.checkValidate('blur')["catch"](function (e) {
             return e;
           }).then(function () {
-            _this40.handleActived(params, evnt).then(function () {
-              return _this40.checkValidate('change');
+            _this39.handleActived(params, evnt).then(function () {
+              return _this39.checkValidate('change');
             })["catch"](function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this40.checkValidate('change');
+            return _this39.checkValidate('change');
           })["catch"](function (e) {
             return e;
           });
@@ -4310,7 +4317,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this41 = this;
+    var _this40 = this;
     var sortConfig = this.sortConfig,
       sortOpts = this.sortOpts;
     var defaultSort = sortOpts.defaultSort;
@@ -4323,7 +4330,7 @@ var Methods = {
           var field = item.field,
             order = item.order;
           if (field && order) {
-            var column = _this41.getColumnByField(field);
+            var column = _this40.getColumnByField(field);
             if (column && column.sortable) {
               column.order = order;
               column.sortTime = Date.now() + index;
@@ -4364,7 +4371,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this42 = this;
+    var _this41 = this;
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
       remote = sortOpts.remote,
@@ -4390,14 +4397,14 @@ var Methods = {
           order = confs.order;
         var column = field;
         if (_xeUtils["default"].isString(field)) {
-          column = _this42.getColumnByField(field);
+          column = _this41.getColumnByField(field);
         }
         if (column && (column.sortable || column.remoteSort)) {
           if (!firstSortColumn) {
             firstSortColumn = column;
           }
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this42, column);
+            order = getNextSortOrder(_this41, column);
           }
           if (column.order !== order) {
             column.order = order;
@@ -4501,7 +4508,7 @@ var Methods = {
    * 判断指定列是否为筛选状态，如果为空则判断所有列
    * @param {String} fieldOrColumn 字段名
    */
-  isFilter: function isFilter(fieldOrColumn) {
+  isActiveFilterByColumn: function isActiveFilterByColumn(fieldOrColumn) {
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
     if (column) {
       return column.filters && column.filters.some(function (option) {
@@ -4510,6 +4517,10 @@ var Methods = {
     }
     return this.getCheckedFilters().length > 0;
   },
+  // 已废弃
+  isFilter: function isFilter(fieldOrColumn) {
+    return this.isActiveFilterByColumn(fieldOrColumn);
+  },
   /**
    * 判断展开行是否懒加载完成
    * @param {Row} row 行对象
@@ -4519,7 +4530,7 @@ var Methods = {
     return rest && rest.expandLoaded;
   },
   clearRowExpandLoaded: function clearRowExpandLoaded(row) {
-    var _this43 = this;
+    var _this42 = this;
     var expandOpts = this.expandOpts,
       expandLazyLoadeds = this.expandLazyLoadeds,
       fullAllDataRowMap = this.fullAllDataRowMap;
@@ -4528,7 +4539,7 @@ var Methods = {
     if (lazy && rest) {
       rest.expandLoaded = false;
       _xeUtils["default"].remove(expandLazyLoadeds, function (item) {
-        return _this43.eqRow(item, row);
+        return _this42.eqRow(item, row);
       });
     }
     return this.$nextTick();
@@ -4538,13 +4549,13 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this44 = this;
+    var _this43 = this;
     var expandOpts = this.expandOpts,
       expandLazyLoadeds = this.expandLazyLoadeds;
     var lazy = expandOpts.lazy;
     if (lazy && this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this44.handleAsyncRowExpand(row);
+        return _this43.handleAsyncRowExpand(row);
       });
     }
     return this.$nextTick();
@@ -4615,25 +4626,25 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this45 = this;
+    var _this44 = this;
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this45.expandLazyLoadeds.push(row);
-      _this45.expandOpts.loadMethod({
-        $table: _this45,
+      _this44.expandLazyLoadeds.push(row);
+      _this44.expandOpts.loadMethod({
+        $table: _this44,
         row: row,
-        rowIndex: _this45.getRowIndex(row),
-        $rowIndex: _this45.getVMRowIndex(row)
+        rowIndex: _this44.getRowIndex(row),
+        $rowIndex: _this44.getVMRowIndex(row)
       }).then(function () {
         rest.expandLoaded = true;
-        _this45.rowExpandeds.push(row);
+        _this44.rowExpandeds.push(row);
       })["catch"](function () {
         rest.expandLoaded = false;
       })["finally"](function () {
-        _xeUtils["default"].remove(_this45.expandLazyLoadeds, function (item) {
-          return _this45.eqRow(item, row);
+        _xeUtils["default"].remove(_this44.expandLazyLoadeds, function (item) {
+          return _this44.eqRow(item, row);
         });
-        resolve(_this45.$nextTick().then(_this45.recalculate));
+        resolve(_this44.$nextTick().then(_this44.recalculate));
       });
     });
   },
@@ -4645,7 +4656,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this46 = this;
+    var _this45 = this;
     var fullAllDataRowMap = this.fullAllDataRowMap,
       expandLazyLoadeds = this.expandLazyLoadeds,
       expandOpts = this.expandOpts,
@@ -4674,17 +4685,17 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this46.getRowIndex(row),
-          $rowIndex: _this46.getVMRowIndex(row)
+          rowIndex: _this45.getRowIndex(row),
+          $rowIndex: _this45.getVMRowIndex(row)
         });
       }) : rows;
       if (expanded) {
         validRows.forEach(function (row) {
-          if (_this46.findRowIndexOf(rowExpandeds, row) === -1) {
+          if (_this45.findRowIndexOf(rowExpandeds, row) === -1) {
             var rest = fullAllDataRowMap.get(row);
-            var isLoad = lazy && !rest.expandLoaded && _this46.findRowIndexOf(expandLazyLoadeds, row) === -1;
+            var isLoad = lazy && !rest.expandLoaded && _this45.findRowIndexOf(expandLazyLoadeds, row) === -1;
             if (isLoad) {
-              lazyRests.push(_this46.handleAsyncRowExpand(row));
+              lazyRests.push(_this45.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -4692,12 +4703,12 @@ var Methods = {
         });
       } else {
         _xeUtils["default"].remove(rowExpandeds, function (row) {
-          return _this46.findRowIndexOf(validRows, row) > -1;
+          return _this45.findRowIndexOf(validRows, row) > -1;
         });
       }
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this46.handleRowExpandReserve(row, expanded);
+          return _this45.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -4716,7 +4727,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this47 = this;
+    var _this46 = this;
     var expandOpts = this.expandOpts,
       rowExpandeds = this.rowExpandeds,
       tableFullData = this.tableFullData;
@@ -4725,12 +4736,12 @@ var Methods = {
     this.rowExpandeds = [];
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this47.handleRowExpandReserve(row, false);
+        return _this46.handleRowExpandReserve(row, false);
       });
     }
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this47.recalculate();
+        _this46.recalculate();
       }
     });
   },
@@ -4800,7 +4811,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this48 = this;
+    var _this47 = this;
     var treeOpts = this.treeOpts,
       treeLazyLoadeds = this.treeLazyLoadeds;
     var transform = treeOpts.transform,
@@ -4808,14 +4819,14 @@ var Methods = {
       hasChild = treeOpts.hasChild;
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this48.handleAsyncTreeExpandChilds(row);
+        return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this48.handleVirtualTreeToList();
-          return _this48.handleTableData();
+          _this47.handleVirtualTreeToList();
+          return _this47.handleTableData();
         }
       }).then(function () {
-        return _this48.recalculate();
+        return _this47.recalculate();
       });
     }
     return this.$nextTick();
@@ -4884,7 +4895,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this49 = this;
+    var _this48 = this;
     var fullAllDataRowMap = this.fullAllDataRowMap,
       treeExpandeds = this.treeExpandeds,
       treeOpts = this.treeOpts,
@@ -4897,7 +4908,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this49,
+        $table: _this48,
         row: row
       }).then(function (childRecords) {
         // 响应成功后则展开行，并将子节点挂载到该节点下
@@ -4909,17 +4920,17 @@ var Methods = {
           childRecords = [];
         }
         if (childRecords) {
-          return _this49.loadTreeChildren(row, childRecords).then(function (childRows) {
+          return _this48.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             }
             // 如果当前节点已选中，则展开后子节点也被选中
-            if (!checkStrictly && _this49.isCheckedByCheckboxRow(row)) {
-              _this49.handleCheckedCheckboxRow(childRows, true, true);
+            if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
+              _this48.handleCheckedCheckboxRow(childRows, true, true);
             }
-            return _this49.$nextTick().then(function () {
+            return _this48.$nextTick().then(function () {
               if (transform) {
-                return _this49.handleTableData();
+                return _this48.handleTableData();
               }
             });
           });
@@ -4931,8 +4942,8 @@ var Methods = {
           return item === row;
         });
       })["finally"](function () {
-        _this49.$nextTick().then(function () {
-          return _this49.recalculate();
+        _this48.$nextTick().then(function () {
+          return _this48.recalculate();
         }).then(function () {
           return resolve();
         });
@@ -4964,7 +4975,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this50 = this;
+    var _this49 = this;
     var fullAllDataRowMap = this.fullAllDataRowMap,
       tableFullData = this.tableFullData,
       treeExpandeds = this.treeExpandeds,
@@ -5008,7 +5019,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
           // 是否使用懒加载
           if (isLoad) {
-            result.push(_this50.handleAsyncTreeExpandChilds(row));
+            result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -5023,7 +5034,7 @@ var Methods = {
     }
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this50.handleTreeExpandReserve(row, expanded);
+        return _this49.handleTreeExpandReserve(row, expanded);
       });
     }
     return Promise.all(result).then(this.recalculate);
@@ -5035,12 +5046,12 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this51 = this;
+    var _this50 = this;
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this51.handleVirtualTreeToList();
-      return _this51.handleTableData();
+      _this50.handleVirtualTreeToList();
+      return _this50.handleTableData();
     }).then(function () {
-      return _this51.recalculate();
+      return _this50.recalculate();
     });
   },
   /**
@@ -5079,7 +5090,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this52 = this;
+    var _this51 = this;
     var treeOpts = this.treeOpts,
       treeExpandeds = this.treeExpandeds,
       tableFullData = this.tableFullData;
@@ -5089,17 +5100,17 @@ var Methods = {
     this.treeExpandeds = [];
     if (reserve) {
       _xeUtils["default"].eachTree(tableFullData, function (row) {
-        return _this52.handleTreeExpandReserve(row, false);
+        return _this51.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
     return this.handleTableData().then(function () {
       if (transform) {
-        _this52.handleVirtualTreeToList();
-        return _this52.handleTableData();
+        _this51.handleVirtualTreeToList();
+        return _this51.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this52.recalculate();
+        _this51.recalculate();
       }
     });
   },
@@ -5218,28 +5229,28 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this53 = this;
+    var _this52 = this;
     return this.$nextTick().then(function () {
-      var sYOpts = _this53.sYOpts,
-        sXOpts = _this53.sXOpts,
-        scrollXLoad = _this53.scrollXLoad,
-        scrollYLoad = _this53.scrollYLoad,
-        scrollXStore = _this53.scrollXStore,
-        scrollYStore = _this53.scrollYStore;
+      var sYOpts = _this52.sYOpts,
+        sXOpts = _this52.sXOpts,
+        scrollXLoad = _this52.scrollXLoad,
+        scrollYLoad = _this52.scrollYLoad,
+        scrollXStore = _this52.scrollXStore,
+        scrollYStore = _this52.scrollYStore;
       // 计算 X 逻辑
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this53),
+        var _computeVirtualX3 = computeVirtualX(_this52),
           visibleXSize = _computeVirtualX3.visibleSize;
         var offsetXSize = sXOpts.oSize ? _xeUtils["default"].toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-        _this53.updateScrollXData();
+        _this52.updateScrollXData();
       } else {
-        _this53.updateScrollXSpace();
+        _this52.updateScrollXSpace();
       }
       // 计算 Y 逻辑
-      var _computeVirtualY = computeVirtualY(_this53),
+      var _computeVirtualY = computeVirtualY(_this52),
         rowHeight = _computeVirtualY.rowHeight,
         visibleYSize = _computeVirtualY.visibleSize;
       scrollYStore.rowHeight = rowHeight;
@@ -5248,12 +5259,12 @@ var Methods = {
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-        _this53.updateScrollYData();
+        _this52.updateScrollYData();
       } else {
-        _this53.updateScrollYSpace();
+        _this52.updateScrollYSpace();
       }
-      _this53.rowHeight = rowHeight;
-      _this53.$nextTick(_this53.updateStyle);
+      _this52.rowHeight = rowHeight;
+      _this52.$nextTick(_this52.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -5263,11 +5274,11 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    var _this54 = this;
+    var _this53 = this;
     // this.tableColumn = []
     this.$nextTick(function () {
-      _this54.handleTableColumn();
-      _this54.updateScrollXSpace();
+      _this53.handleTableColumn();
+      _this53.updateScrollXSpace();
     });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
@@ -5318,11 +5329,11 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    var _this55 = this;
+    var _this54 = this;
     // this.tableData = []
     this.$nextTick(function () {
-      _this55.handleTableData();
-      _this55.updateScrollYSpace();
+      _this54.handleTableData();
+      _this54.updateScrollYSpace();
     });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
@@ -5363,7 +5374,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this56 = this;
+    var _this55 = this;
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
       rightBody = $refs.rightBody,
@@ -5380,7 +5391,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this56.$nextTick());
+          return resolve(_this55.$nextTick());
         }, 50);
       });
     }
@@ -5422,7 +5433,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this57 = this;
+    var _this56 = this;
     var tableFullData = this.tableFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts;
@@ -5434,14 +5445,14 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this57.isTreeExpandByRow(row)) {
-            rests.push(_this57.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this56.isTreeExpandByRow(row)) {
+            rests.push(_this56.setTreeExpand(row, true));
           }
         });
       }
     }
     return Promise.all(rests).then(function () {
-      return (0, _util.rowToVisible)(_this57, row);
+      return (0, _util.rowToVisible)(_this56, row);
     });
   },
   /**
@@ -5496,30 +5507,30 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this58 = this;
+    var _this57 = this;
     var customVal = !_xeUtils["default"].isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this58.$refs,
-        editRules = _this58.editRules,
-        validStore = _this58.validStore;
+      var $refs = _this57.$refs,
+        editRules = _this57.editRules,
+        validStore = _this57.validStore;
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
           column = scope.column;
         var type = 'change';
-        if (_this58.hasCellRules(type, row, column)) {
-          var cell = _this58.getCell(row, column);
+        if (_this57.hasCellRules(type, row, column)) {
+          var cell = _this57.getCell(row, column);
           if (cell) {
-            return _this58.validCellRules(type, row, column, cellValue).then(function () {
+            return _this57.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
-              _this58.clearValidate();
+              _this57.clearValidate();
             })["catch"](function (_ref8) {
               var rule = _ref8.rule;
               if (customVal) {
                 setCellValue(row, column, cellValue);
               }
-              _this58.showValidTooltip({
+              _this57.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -5539,13 +5550,13 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this59 = this;
+    var _this58 = this;
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this59.updateCellAreas();
+      return _this58.updateCellAreas();
     });
   },
   /**
@@ -5553,13 +5564,13 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this60 = this;
+    var _this59 = this;
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this60.updateCellAreas();
+      _this59.updateCellAreas();
       return rest;
     });
   },
@@ -5580,23 +5591,23 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this61 = this;
+    var _this60 = this;
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this61.updateCellAreas();
+      return _this60.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this62 = this;
+    var _this61 = this;
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this62.updateCellAreas();
+      _this61.updateCellAreas();
       return rest;
     });
   },
@@ -5713,9 +5724,9 @@ var Methods = {
     return cellLabel;
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
-    var _this63 = this;
+    var _this62 = this;
     return row ? _xeUtils["default"].findIndexOf(list, function (item) {
-      return _this63.eqRow(item, row);
+      return _this62.eqRow(item, row);
     }) : -1;
   },
   eqRow: function eqRow(row1, row2) {