vxe-table 3.4.14-beta.2 → 3.5.0-beta.0

package/lib/table/src/methods.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,16 +15,20 @@ var _cell = _interopRequireDefault(require("./cell"));
 
 var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
-var _tools = require("../../tools");
-
 var _util = require("./util");
 
-var _utils = require("../../tools/src/utils");
+var _utils = _interopRequireWildcard(require("../../tools/utils"));
 
-var _dom = require("../../tools/src/dom");
+var _dom = _interopRequireWildcard(require("../../tools/dom"));
 
 var _formats = require("../../v-x-e-table/src/formats");
 
+var _log = require("../../tools/log");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -43,16 +49,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var getRowid = _tools.UtilTools.getRowid,
-    getRowkey = _tools.UtilTools.getRowkey,
-    setCellValue = _tools.UtilTools.setCellValue,
-    hasChildrenList = _tools.UtilTools.hasChildrenList,
-    getColumnList = _tools.UtilTools.getColumnList;
-var calcHeight = _tools.DomTools.calcHeight,
-    hasClass = _tools.DomTools.hasClass,
-    addClass = _tools.DomTools.addClass,
-    removeClass = _tools.DomTools.removeClass,
-    getEventTargetNode = _tools.DomTools.getEventTargetNode;
+var getRowid = _utils.default.getRowid,
+    getRowkey = _utils.default.getRowkey,
+    setCellValue = _utils.default.setCellValue,
+    hasChildrenList = _utils.default.hasChildrenList,
+    getColumnList = _utils.default.getColumnList;
+var calcHeight = _dom.default.calcHeight,
+    hasClass = _dom.default.hasClass,
+    addClass = _dom.default.addClass,
+    removeClass = _dom.default.removeClass,
+    getEventTargetNode = _dom.default.getEventTargetNode,
+    isNodeElement = _dom.default.isNodeElement;
 var isWebkit = _dom.browse['-webkit'] && !_dom.browse.edge;
 var debounceScrollYDuration = _dom.browse.msie ? 80 : 20;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
@@ -229,7 +236,7 @@ function setMerges(_vm, merges, mList, rowList) {
         visibleColumn = _vm.visibleColumn;
 
     if (treeConfig) {
-      throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['merge-footer-items']));
+      throw new Error(_utils.default.getLog('vxe.error.noTree', ['merge-footer-items']));
     }
 
     if (!_xeUtils.default.isArray(merges)) {
@@ -294,7 +301,7 @@ function removeMerges(_vm, merges, mList, rowList) {
         visibleColumn = _vm.visibleColumn;
 
     if (treeConfig) {
-      throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['merge-cells']));
+      throw new Error(_utils.default.getLog('vxe.error.noTree', ['merge-cells']));
     }
 
     if (!_xeUtils.default.isArray(merges)) {
@@ -443,6 +450,8 @@ var Methods = {
     return this.handleTableData(true).then(function () {
       _this2.updateFooter();
 
+      _this2.checkSelectionStatus();
+
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
           _this2.updateScrollXSpace();
@@ -455,7 +464,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) {
@@ -520,28 +536,28 @@ var Methods = {
       if (treeOpts.transform) {
         if (process.env.NODE_ENV === 'development') {
           if (!treeOpts.rowField) {
-            _tools.UtilTools.error('vxe.error.reqProp', ['table.tree-config.rowField']);
+            (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.rowField']);
           }
 
           if (!treeOpts.parentField) {
-            _tools.UtilTools.error('vxe.error.reqProp', ['table.tree-config.parentField']);
+            (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
           }
 
           if (!treeOpts.children) {
-            _tools.UtilTools.error('vxe.error.reqProp', ['tree-config.children']);
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.children']);
           }
 
           if (!treeOpts.mapChildren) {
-            _tools.UtilTools.error('vxe.error.reqProp', ['tree-config.mapChildren']);
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildren']);
           }
 
           if (treeOpts.children === treeOpts.mapChildren) {
-            _tools.UtilTools.error('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
           }
 
           fullData.forEach(function (row) {
             if (row[treeOpts.children] && row[treeOpts.children].length) {
-              _tools.UtilTools.warn('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
+              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
             }
           });
         }
@@ -581,15 +597,15 @@ var Methods = {
     if (process.env.NODE_ENV === 'development') {
       if (sYLoad) {
         if (!(this.height || this.maxHeight)) {
-          _tools.UtilTools.error('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+          (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
         }
 
         if (!this.showOverflow) {
-          _tools.UtilTools.warn('vxe.error.reqProp', ['table.show-overflow']);
+          (0, _log.warnLog)('vxe.error.reqProp', ['table.show-overflow']);
         }
 
         if (this.spanMethod) {
-          _tools.UtilTools.warn('vxe.error.scrollErrProp', ['table.span-method']);
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
         }
       }
     }
@@ -717,7 +733,7 @@ var Methods = {
       this.tableData = tableData.slice(0);
     } else {
       if (process.env.NODE_ENV === 'development') {
-        _tools.UtilTools.warn('vxe.error.reqProp', ['keep-source']);
+        (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
       }
     }
 
@@ -772,7 +788,7 @@ var Methods = {
 
     if (process.env.NODE_ENV === 'development') {
       if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
-        _tools.UtilTools.warn('vxe.error.scrollErrProp', ['column.type=expand']);
+        (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
       }
     }
 
@@ -953,7 +969,7 @@ var Methods = {
       if (property) {
         if (process.env.NODE_ENV === 'development') {
           if (fullColumnFieldData[property]) {
-            _tools.UtilTools.warn('vxe.error.colRepet', ['field', property]);
+            (0, _log.warnLog)('vxe.error.colRepet', ['field', property]);
           }
         }
 
@@ -967,7 +983,7 @@ var Methods = {
       if (treeNode) {
         if (process.env.NODE_ENV === 'development') {
           if (treeNodeColumn) {
-            _tools.UtilTools.warn('vxe.error.colRepet', ['tree-node', treeNode]);
+            (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
           }
         }
 
@@ -977,7 +993,7 @@ var Methods = {
       } else if (type === 'expand') {
         if (process.env.NODE_ENV === 'development') {
           if (expandColumn) {
-            _tools.UtilTools.warn('vxe.error.colRepet', ['type', type]);
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
           }
         }
 
@@ -989,7 +1005,7 @@ var Methods = {
       if (process.env.NODE_ENV === 'development') {
         if (type === 'checkbox') {
           if (checkboxColumn) {
-            _tools.UtilTools.warn('vxe.error.colRepet', ['type', type]);
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
           }
 
           if (!checkboxColumn) {
@@ -997,7 +1013,7 @@ var Methods = {
           }
         } else if (type === 'radio') {
           if (radioColumn) {
-            _tools.UtilTools.warn('vxe.error.colRepet', ['type', type]);
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
           }
 
           if (!radioColumn) {
@@ -1008,15 +1024,15 @@ var Methods = {
 
       if (process.env.NODE_ENV === 'development') {
         if (_this12.showOverflow && column.showOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-overflow=".concat(_this12.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-overflow=".concat(_this12.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
         }
 
         if (_this12.showHeaderOverflow && column.showHeaderOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this12.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this12.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
         }
 
         if (_this12.showFooterOverflow && column.showFooterOverflow === false) {
-          _tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
         }
       }
 
@@ -1025,7 +1041,7 @@ var Methods = {
       }
 
       if (fullColumnIdData[colid]) {
-        _tools.UtilTools.error('vxe.error.colRepet', ['colId', colid]);
+        (0, _log.errLog)('vxe.error.colRepet', ['colId', colid]);
       }
 
       fullColumnIdData[colid] = rest;
@@ -1045,7 +1061,7 @@ var Methods = {
 
     if (process.env.NODE_ENV === 'development') {
       if (expandColumn && this.mouseOpts.area) {
-        _tools.UtilTools.error('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+        (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
     }
 
@@ -1140,7 +1156,7 @@ var Methods = {
   // 在 v3 中废弃
   _getRowIndex: function _getRowIndex(row) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
     }
 
     return this.getVTRowIndex(row);
@@ -1156,7 +1172,7 @@ var Methods = {
   // 在 v3 中废弃
   $getRowIndex: function $getRowIndex(row) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex']);
     }
 
     return this.getVMRowIndex(row);
@@ -1180,7 +1196,7 @@ var Methods = {
   // 在 v3 中废弃
   _getColumnIndex: function _getColumnIndex(column) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
     }
 
     return this.getVTColumnIndex(column);
@@ -1196,7 +1212,7 @@ var Methods = {
   // 在 v3 中废弃
   $getColumnIndex: function $getColumnIndex(column) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex']);
     }
 
     return this.getVMColumnIndex(column);
@@ -1320,7 +1336,7 @@ var Methods = {
 
     if (!keepSource) {
       if (process.env.NODE_ENV === 'development') {
-        _tools.UtilTools.warn('vxe.error.reqProp', ['keep-source']);
+        (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
       }
 
       return this.$nextTick();
@@ -1342,7 +1358,7 @@ var Methods = {
           var rowIndex = _this15.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
-            throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['revertData']));
+            throw new Error(_utils.default.getLog('vxe.error.noTree', ['revertData']));
           }
 
           var oRow = tableSourceData[rowIndex];
@@ -1677,7 +1693,7 @@ var Methods = {
             var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
             var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
 
-            var cellValue = _tools.UtilTools.getCellValue(row, column);
+            var cellValue = _utils.default.getCellValue(row, column);
 
             if (filterMethod) {
               return itemList.some(function (item) {
@@ -2080,8 +2096,7 @@ var Methods = {
       var customMap = {};
 
       if (!id) {
-        _tools.UtilTools.error('vxe.error.reqProp', ['id']);
-
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
 
@@ -2171,8 +2186,7 @@ var Methods = {
       var colShows = [];
 
       if (!id) {
-        _tools.UtilTools.error('vxe.error.reqProp', ['id']);
-
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
 
@@ -2214,8 +2228,7 @@ var Methods = {
       var columnWidthStorage;
 
       if (!id) {
-        _tools.UtilTools.error('vxe.error.reqProp', ['id']);
-
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
 
@@ -2281,7 +2294,7 @@ var Methods = {
         }
 
         if (parent && column.fixed !== parent.fixed) {
-          _tools.UtilTools.error('vxe.error.groupFixed');
+          (0, _log.errLog)('vxe.error.groupFixed');
         }
 
         if (isColGroup) {
@@ -2339,26 +2352,26 @@ var Methods = {
       scrollXLoad = false;
 
       if (process.env.NODE_ENV === 'development') {
-        _tools.UtilTools.warn('vxe.error.scrollXNotGroup');
+        (0, _log.warnLog)('vxe.error.scrollXNotGroup');
       }
     }
 
     if (scrollXLoad) {
       if (process.env.NODE_ENV === 'development') {
         if (this.showHeader && !this.showHeaderOverflow) {
-          _tools.UtilTools.warn('vxe.error.reqProp', ['show-header-overflow']);
+          (0, _log.warnLog)('vxe.error.reqProp', ['show-header-overflow']);
         }
 
         if (this.showFooter && !this.showFooterOverflow) {
-          _tools.UtilTools.warn('vxe.error.reqProp', ['show-footer-overflow']);
+          (0, _log.warnLog)('vxe.error.reqProp', ['show-footer-overflow']);
         }
 
         if (this.spanMethod) {
-          _tools.UtilTools.warn('vxe.error.scrollErrProp', ['span-method']);
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
         }
 
         if (this.footerSpanMethod) {
-          _tools.UtilTools.warn('vxe.error.scrollErrProp', ['footer-span-method']);
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
         }
       }
 
@@ -2416,13 +2429,13 @@ var Methods = {
       if (column.visible) {
         if (column.resizeWidth) {
           resizeList.push(column);
-        } else if (_tools.DomTools.isPx(column.width)) {
+        } else if (_dom.default.isPx(column.width)) {
           pxList.push(column);
-        } else if (_tools.DomTools.isScale(column.width)) {
+        } else if (_dom.default.isScale(column.width)) {
           scaleList.push(column);
-        } else if (_tools.DomTools.isPx(column.minWidth)) {
+        } else if (_dom.default.isPx(column.minWidth)) {
           pxMinList.push(column);
-        } else if (_tools.DomTools.isScale(column.minWidth)) {
+        } else if (_dom.default.isScale(column.minWidth)) {
           scaleMinList.push(column);
         } else {
           autoList.push(column);
@@ -2443,6 +2456,8 @@ var Methods = {
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
    */
   refreshScroll: function refreshScroll() {
+    var _this22 = this;
+
     var lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop;
     var $refs = this.$refs;
@@ -2453,17 +2468,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 (0, _util.restoreScrollLocation)(_this22, lastScrollLeft, lastScrollTop).then(function () {
+          // 存在滚动行为未结束情况
+          setTimeout(resolve, 30);
+        });
+      } // 重置
 
-    if (lastScrollLeft || lastScrollTop) {
-      return (0, _util.restoreScrollLocation)(this, lastScrollLeft, lastScrollTop);
-    } // 重置
 
+      (0, _dom.setScrollTop)(tableBodyElem, lastScrollTop);
+      (0, _dom.setScrollTop)(leftBodyElem, lastScrollTop);
+      (0, _dom.setScrollTop)(rightBodyElem, lastScrollTop);
+      (0, _dom.setScrollLeft)(tableFooterElem, lastScrollLeft); // 存在滚动行为未结束情况
 
-    (0, _dom.setScrollTop)(tableBodyElem, lastScrollTop);
-    (0, _dom.setScrollTop)(leftBodyElem, lastScrollTop);
-    (0, _dom.setScrollTop)(rightBodyElem, lastScrollTop);
-    (0, _dom.setScrollLeft)(tableFooterElem, lastScrollLeft);
+      setTimeout(resolve, 30);
+    });
   },
 
   /**
@@ -2471,7 +2493,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,
@@ -2487,9 +2509,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();
         });
       }
     }
@@ -2637,7 +2659,7 @@ var Methods = {
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this23 = this;
+    var _this24 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -2741,7 +2763,7 @@ var Methods = {
 
           if (isGroup && listElem) {
             _xeUtils.default.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this23.getColumnNode(thElem);
+              var colNode = _this24.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -2771,7 +2793,7 @@ var Methods = {
         } else if (layout === 'body') {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
 
-          if (wrapperElem) {
+          if (isNodeElement(wrapperElem)) {
             if (customMaxHeight) {
               wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
             } else {
@@ -2788,7 +2810,7 @@ var Methods = {
             var isRightFixed = fixedType === 'right';
             var _fixedColumn = columnStore["".concat(fixedType, "List")];
 
-            if (wrapperElem) {
+            if (isNodeElement(wrapperElem)) {
               wrapperElem.style.top = "".concat(headerHeight, "px");
             }
 
@@ -2858,7 +2880,7 @@ var Methods = {
             return previous + column.renderWidth;
           }, 0);
 
-          if (wrapperElem) {
+          if (isNodeElement(wrapperElem)) {
             // 如果是固定列
             if (fixedWrapperElem) {
               wrapperElem.style.top = "".concat(customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight, "px");
@@ -2922,10 +2944,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;
@@ -2966,16 +2988,16 @@ var Methods = {
 
     if (bodyElem) {
       if (leftContainer) {
-        _tools.DomTools[bodyElem.scrollLeft > 0 ? 'addClass' : 'removeClass'](leftContainer, 'scrolling--middle');
+        _dom.default[bodyElem.scrollLeft > 0 ? 'addClass' : 'removeClass'](leftContainer, 'scrolling--middle');
       }
 
       if (rightContainer) {
-        _tools.DomTools[bodyElem.clientWidth < bodyElem.scrollWidth - Math.ceil(bodyElem.scrollLeft) ? 'addClass' : 'removeClass'](rightContainer, 'scrolling--middle');
+        _dom.default[bodyElem.clientWidth < bodyElem.scrollWidth - Math.ceil(bodyElem.scrollLeft) ? 'addClass' : 'removeClass'](rightContainer, 'scrolling--middle');
       }
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this24 = this;
+    var _this25 = this;
 
     var evntList = _vXETable.default.interceptor.get(type);
 
@@ -2983,8 +3005,8 @@ var Methods = {
 
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this24.$xegrid,
-        $table: _this24,
+        $grid: _this25.$xegrid,
+        $table: _this25,
         $event: evnt
       }, args)) === false;
     })) {
@@ -3004,7 +3026,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this25 = this;
+    var _this26 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -3065,7 +3087,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this25.height && !_this25.overflowY) {
+                if (!isClearActived && _this26.height && !_this26.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -3076,7 +3098,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this25.clearActived(evnt);
+                    return _this26.clearActived(evnt);
                   });
                 }
               });
@@ -3090,9 +3112,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();
           });
         }
       }
@@ -3127,7 +3149,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this26 = this;
+    var _this27 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
@@ -3142,33 +3164,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);
       });
     }
   },
@@ -3177,27 +3199,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;
@@ -3224,7 +3246,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this27.closeFilter();
+            _this28.closeFilter();
           }
 
           return;
@@ -3235,20 +3257,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 && (0, _utils.isEnableConf)(editConfig)) {
           if (!isEditStatus) {
@@ -3257,15 +3279,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)) {
           // 退出选中
@@ -3274,12 +3296,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);
                 });
               }
             }
@@ -3290,15 +3312,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) {
@@ -3309,14 +3331,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);
                 });
               }
             }
@@ -3325,18 +3347,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) {
@@ -3347,10 +3369,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 {
                 setCellValue(selected.row, selected.column, null);
@@ -3360,21 +3382,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 = _xeUtils.default.findTree(_this27.afterFullData, function (item) {
+              var _XEUtils$findTree = _xeUtils.default.findTree(_this28.afterFullData, function (item) {
                 return item === currentRow;
               }, treeOpts),
                   parentRow = _XEUtils$findTree.parent;
@@ -3382,14 +3404,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);
                 });
               }
             }
@@ -3403,26 +3425,26 @@ var Methods = {
 
           if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
             if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread(_objectSpread({}, 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 {
                 setCellValue(selected.row, selected.column, null);
 
-                _this27.handleActived(selected.args, evnt);
+                _this28.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this27.emitEvent('keydown', {}, evnt);
+        _this28.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -3492,33 +3514,46 @@ 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;
   },
-  handleTargetEnterEvent: function handleTargetEnterEvent() {
+  handleTargetEnterEvent: function handleTargetEnterEvent(isClear) {
+    var $tooltip = this.$refs.tooltip;
     clearTimeout(this.tooltipTimeout);
     this.tooltipActive = true;
-    this.closeTooltip();
+
+    if (isClear) {
+      this.closeTooltip();
+    } else {
+      if ($tooltip) {
+        $tooltip.setActived(true);
+      }
+    }
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this29 = this;
+    var _this30 = this;
 
     var tooltipOpts = this.tooltipOpts;
+    var $tooltip = this.$refs.tooltip;
     this.tooltipActive = false;
 
+    if ($tooltip) {
+      $tooltip.setActived(false);
+    }
+
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        var tooltip = _this29.$refs.tooltip;
+        $tooltip = _this30.$refs.tooltip;
 
-        if (tooltip && !tooltip.isHover) {
-          _this29.closeTooltip();
+        if ($tooltip && !$tooltip.isActived()) {
+          _this30.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -3532,15 +3567,13 @@ var Methods = {
     if (titleHelp.content || titleHelp.message) {
       var $refs = this.$refs,
           tooltipStore = this.tooltipStore;
-      var tooltip = $refs.tooltip;
-
-      var content = _tools.UtilTools.getFuncText(titleHelp.content || titleHelp.message);
-
-      this.handleTargetEnterEvent();
+      var $tooltip = $refs.tooltip;
+      var content = (0, _utils.getFuncText)(titleHelp.content || titleHelp.message);
+      this.handleTargetEnterEvent(true);
       tooltipStore.visible = true;
 
-      if (tooltip) {
-        tooltip.open(evnt.currentTarget, content);
+      if ($tooltip) {
+        $tooltip.open(evnt.currentTarget, content);
       }
     }
   },
@@ -3552,7 +3585,7 @@ var Methods = {
     var tooltipStore = this.tooltipStore;
     var column = params.column;
     var titleElem = evnt.currentTarget;
-    this.handleTargetEnterEvent();
+    this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
 
     if (tooltipStore.column !== column || !tooltipStore.visible) {
       this.handleTooltip(evnt, titleElem, titleElem, null, params);
@@ -3571,7 +3604,7 @@ var Methods = {
     var row = params.row,
         column = params.column;
     var cell = evnt.currentTarget;
-    this.handleTargetEnterEvent();
+    this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
 
     if ((0, _utils.isEnableConf)(editConfig)) {
       if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
@@ -3604,7 +3637,7 @@ var Methods = {
     var column = params.column;
     var tooltipStore = this.tooltipStore;
     var cell = evnt.currentTarget;
-    this.handleTargetEnterEvent();
+    this.handleTargetEnterEvent(true);
 
     if (tooltipStore.column !== column || !tooltipStore.visible) {
       this.handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
@@ -3641,7 +3674,7 @@ var Methods = {
       });
 
       if (tooltip) {
-        tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, _tools.UtilTools.formatText(content));
+        tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, _utils.default.formatText(content));
       }
     }
 
@@ -3701,8 +3734,7 @@ var Methods = {
     return !this.isAllSelected && this.isIndeterminate;
   },
   isCheckboxIndeterminate: function isCheckboxIndeterminate() {
-    _tools.UtilTools.warn('vxe.error.delFunc', ['isCheckboxIndeterminate', 'isAllCheckboxIndeterminate']);
-
+    (0, _log.warnLog)('vxe.error.delFunc', ['isCheckboxIndeterminate', 'isAllCheckboxIndeterminate']);
     return this.isAllCheckboxIndeterminate();
   },
 
@@ -3751,14 +3783,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this30 = this;
+    var _this31 = this;
 
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this30.handleSelectRow({
+      return _this31.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -3782,7 +3814,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,
@@ -3815,7 +3847,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this31.handleCheckboxReserveRow(row, value);
+              _this32.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3889,7 +3921,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this31.handleCheckboxReserveRow(row, value);
+              _this32.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3993,7 +4025,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this32 = this;
+    var _this33 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -4106,11 +4138,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this32, row)] = row;
+            checkboxReserveRowMap[getRowid(_this33, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this32.handleCheckboxReserveRow(row, false);
+            return _this33.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -4330,7 +4362,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this33 = this;
+    var _this34 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -4345,11 +4377,11 @@ var Methods = {
 
       if (treeConfig) {
         _xeUtils.default.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[getRowid(_this33, row)] = 1;
+          afterFullIdMaps[getRowid(_this34, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[getRowid(_this33, row)] = 1;
+          afterFullIdMaps[getRowid(_this34, row)] = 1;
         });
       }
 
@@ -4415,7 +4447,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this34 = this;
+    var _this35 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -4438,7 +4470,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this34.handleCheckboxReserveRow(row, false);
+        return _this35.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -4730,13 +4762,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;
       });
@@ -4839,7 +4871,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this36 = this;
+    var _this37 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -4854,15 +4886,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;
           });
@@ -4873,7 +4905,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;
@@ -4890,7 +4922,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;
@@ -4933,7 +4965,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this38 = this;
+    var _this39 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -4966,7 +4998,7 @@ var Methods = {
         var column = field;
 
         if (_xeUtils.default.isString(field)) {
-          column = _this38.getColumnByField(field);
+          column = _this39.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -4975,7 +5007,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this38, column);
+            order = getNextSortOrder(_this39, column);
           }
 
           if (column.order !== order) {
@@ -5021,7 +5053,7 @@ var Methods = {
   // 在 v3 中废弃
   getSortColumn: function getSortColumn() {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['getSortColumn', 'getSortColumns']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['getSortColumn', 'getSortColumns']);
     }
 
     return _xeUtils.default.find(this.tableFullColumn, function (column) {
@@ -5128,7 +5160,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this39 = this;
+    var _this40 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -5136,7 +5168,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this39.handleAsyncRowExpand(row);
+        return _this40.handleAsyncRowExpand(row);
       });
     }
 
@@ -5144,7 +5176,7 @@ var Methods = {
   },
   reloadExpandContent: function reloadExpandContent(row) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
     } // 即将废弃
 
 
@@ -5215,29 +5247,29 @@ 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;
 
-        _xeUtils.default.remove(_this40.expandLazyLoadeds, function (item) {
+        _xeUtils.default.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));
       });
     });
   },
@@ -5250,7 +5282,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this41 = this;
+    var _this42 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -5283,8 +5315,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;
 
@@ -5295,7 +5327,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);
             }
@@ -5309,7 +5341,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this41.handleRowExpandReserve(row, expanded);
+          return _this42.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -5330,7 +5362,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this42 = this;
+    var _this43 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -5341,13 +5373,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();
       }
     });
   },
@@ -5427,7 +5459,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this43 = this;
+    var _this44 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -5437,15 +5469,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();
       });
     }
 
@@ -5453,7 +5485,7 @@ var Methods = {
   },
   reloadTreeChilds: function reloadTreeChilds(row) {
     if (process.env.NODE_ENV === 'development') {
-      _tools.UtilTools.warn('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+      (0, _log.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
     } // 即将废弃
 
 
@@ -5523,7 +5555,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this44 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -5537,7 +5569,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this44,
+        $table: _this45,
         row: row
       }).catch(function () {
         return [];
@@ -5553,29 +5585,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();
           });
@@ -5613,7 +5645,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this45 = this;
+    var _this46 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -5661,7 +5693,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);
@@ -5677,7 +5709,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this45.handleTreeExpandReserve(row, expanded);
+        return _this46.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -5691,14 +5723,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();
     });
   },
 
@@ -5743,7 +5775,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this47 = this;
+    var _this48 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -5755,19 +5787,19 @@ var Methods = {
 
     if (reserve) {
       _xeUtils.default.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();
       }
     });
   },
@@ -5897,18 +5929,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 ? _xeUtils.default.toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
@@ -5916,13 +5948,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;
 
@@ -5934,14 +5966,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() {
@@ -6055,7 +6087,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,
@@ -6076,7 +6108,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);
       });
     }
@@ -6096,7 +6128,7 @@ var Methods = {
       if (this.treeConfig) {
         rest.push(this.scrollToTreeRow(row));
       } else {
-        rest.push(_tools.DomTools.rowToVisible(this, row));
+        rest.push(_dom.default.rowToVisible(this, row));
       }
     }
 
@@ -6115,7 +6147,7 @@ var Methods = {
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
 
     if (column && this.fullColumnMap.has(column)) {
-      return _tools.DomTools.colToVisible(this, column);
+      return _dom.default.colToVisible(this, column);
     }
 
     return this.$nextTick();
@@ -6127,7 +6159,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this50 = this;
+    var _this51 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -6142,15 +6174,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 _tools.DomTools.rowToVisible(_this50, row);
+      return _dom.default.rowToVisible(_this51, row);
     });
   },
 
@@ -6214,29 +6246,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this51 = this;
+    var _this52 = this;
 
     var customVal = !_xeUtils.default.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) {
                 setCellValue(row, column, cellValue);
               }
 
-              _this51.clearValidate();
+              _this52.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -6244,7 +6276,7 @@ var Methods = {
                 setCellValue(row, column, cellValue);
               }
 
-              _this51.showValidTooltip({
+              _this52.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -6265,15 +6297,15 @@ 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) {
-      _tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+      (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this53.updateCellAreas();
     });
   },
 
@@ -6282,15 +6314,15 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this53 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
-      _tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+      (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this54.updateCellAreas();
 
       return rest;
     });
@@ -6314,27 +6346,27 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this55 = this;
 
     if (this.footerSpanMethod) {
-      _tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+      (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
 
     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) {
-      _tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+      (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 () {
-      _this55.updateCellAreas();
+      _this56.updateCellAreas();
 
       return rest;
     });
@@ -6357,8 +6389,8 @@ var Methods = {
   updateZindex: function updateZindex() {
     if (this.zIndex) {
       this.tZindex = this.zIndex;
-    } else if (this.tZindex < _tools.UtilTools.getLastZIndex()) {
-      this.tZindex = _tools.UtilTools.nextZIndex();
+    } else if (this.tZindex < _utils.default.getLastZIndex()) {
+      this.tZindex = _utils.default.nextZIndex();
     }
   },
   updateCellAreas: function updateCellAreas() {
@@ -6390,7 +6422,7 @@ var Methods = {
       });
       this.$toolbar = $toolbar;
     } else {
-      _tools.UtilTools.error('vxe.error.barUnableLink');
+      (0, _log.errLog)('vxe.error.barUnableLink');
     }
 
     return this.$nextTick();
@@ -6413,7 +6445,7 @@ var Methods = {
   getCellLabel: function getCellLabel(row, column) {
     var formatter = column.formatter;
 
-    var cellValue = _tools.UtilTools.getCellValue(row, column);
+    var cellValue = _utils.default.getCellValue(row, column);
 
     var cellLabel = cellValue;
 
@@ -6483,9 +6515,9 @@ funcs.forEach(function (name) {
     if (process.env.NODE_ENV === 'development') {
       if (!this["_".concat(name)]) {
         if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-          _tools.UtilTools.error('vxe.error.reqModule', ['Export']);
+          (0, _log.errLog)('vxe.error.reqModule', ['Export']);
         } else if ('clearValidate,fullValidate,validate'.split(',').includes(name)) {
-          _tools.UtilTools.error('vxe.error.reqModule', ['Validator']);
+          (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
         }
       }
     }