vxe-table 3.4.15 → 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,17 +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,
-    isNodeElement = _tools.DomTools.isNodeElement;
+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';
@@ -230,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)) {
@@ -295,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)) {
@@ -530,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)]);
             }
           });
         }
@@ -591,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']);
         }
       }
     }
@@ -727,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']);
       }
     }
 
@@ -782,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']);
       }
     }
 
@@ -963,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]);
           }
         }
 
@@ -977,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]);
           }
         }
 
@@ -987,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]);
           }
         }
 
@@ -999,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) {
@@ -1007,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) {
@@ -1018,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)]);
         }
       }
 
@@ -1035,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;
@@ -1055,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']);
       }
     }
 
@@ -1150,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);
@@ -1166,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);
@@ -1190,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);
@@ -1206,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);
@@ -1330,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();
@@ -1352,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];
@@ -1687,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) {
@@ -2090,8 +2096,7 @@ var Methods = {
       var customMap = {};
 
       if (!id) {
-        _tools.UtilTools.error('vxe.error.reqProp', ['id']);
-
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
 
@@ -2181,8 +2186,7 @@ var Methods = {
       var colShows = [];
 
       if (!id) {
-        _tools.UtilTools.error('vxe.error.reqProp', ['id']);
-
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
 
@@ -2224,8 +2228,7 @@ var Methods = {
       var columnWidthStorage;
 
       if (!id) {
-        _tools.UtilTools.error('vxe.error.reqProp', ['id']);
-
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
 
@@ -2291,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) {
@@ -2349,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']);
         }
       }
 
@@ -2426,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);
@@ -2985,11 +2988,11 @@ 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');
       }
     }
   },
@@ -3565,9 +3568,7 @@ var Methods = {
       var $refs = this.$refs,
           tooltipStore = this.tooltipStore;
       var $tooltip = $refs.tooltip;
-
-      var content = _tools.UtilTools.getFuncText(titleHelp.content || titleHelp.message);
-
+      var content = (0, _utils.getFuncText)(titleHelp.content || titleHelp.message);
       this.handleTargetEnterEvent(true);
       tooltipStore.visible = true;
 
@@ -3673,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));
       }
     }
 
@@ -3733,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();
   },
 
@@ -5053,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) {
@@ -5176,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']);
     } // 即将废弃
 
 
@@ -5485,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']);
     } // 即将废弃
 
 
@@ -6128,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));
       }
     }
 
@@ -6147,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();
@@ -6182,7 +6182,7 @@ var Methods = {
     }
 
     return Promise.all(rests).then(function () {
-      return _tools.DomTools.rowToVisible(_this51, row);
+      return _dom.default.rowToVisible(_this51, row);
     });
   },
 
@@ -6300,7 +6300,7 @@ var Methods = {
     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);
@@ -6317,7 +6317,7 @@ var Methods = {
     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);
@@ -6349,7 +6349,7 @@ var Methods = {
     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);
@@ -6361,7 +6361,7 @@ var Methods = {
     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);
@@ -6389,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() {
@@ -6422,7 +6422,7 @@ var Methods = {
       });
       this.$toolbar = $toolbar;
     } else {
-      _tools.UtilTools.error('vxe.error.barUnableLink');
+      (0, _log.errLog)('vxe.error.barUnableLink');
     }
 
     return this.$nextTick();
@@ -6445,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;
 
@@ -6515,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']);
         }
       }
     }