vxe-table 3.5.0-beta.0 → 3.5.0-beta.3

package/lib/table/src/methods.js

@@ -49,9 +49,7 @@ 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 = _utils.default.getRowid,
-    getRowkey = _utils.default.getRowkey,
-    setCellValue = _utils.default.setCellValue,
+var setCellValue = _utils.default.setCellValue,
     hasChildrenList = _utils.default.hasChildrenList,
     getColumnList = _utils.default.getColumnList;
 var calcHeight = _dom.default.calcHeight,
@@ -492,7 +490,7 @@ var Methods = {
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach(function (row, $index) {
-      var rowid = getRowid(_this3, row);
+      var rowid = (0, _util.getRowid)(_this3, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -819,11 +817,11 @@ var Methods = {
         tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
         fullAllDataRowIdData = this.fullAllDataRowIdData;
-    var rowkey = getRowkey(this);
+    var rowkey = (0, _util.getRowkey)(this);
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = getRowid(_this10, row);
+      var rowid = (0, _util.getRowid)(_this10, row);
       var seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -885,14 +883,14 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var rest = fullAllDataRowIdData[getRowid(this, row)];
+    var rest = fullAllDataRowIdData[(0, _util.getRowid)(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = getRowid(_this11, row);
+        var rowid = (0, _util.getRowid)(_this11, row);
 
         var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this11, item);
+          return rowid === (0, _util.getRowid)(_this11, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -901,7 +899,7 @@ var Methods = {
       }
 
       _xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = getRowid(_this11, childRow);
+        var rowid = (0, _util.getRowid)(_this11, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -1127,7 +1125,7 @@ var Methods = {
     var fullDataRowIdData = this.fullDataRowIdData;
 
     if (row) {
-      var rowid = getRowid(this, row);
+      var rowid = (0, _util.getRowid)(this, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -1236,7 +1234,7 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         expandOpts = this.expandOpts;
-    var rowkey = getRowkey(this);
+    var rowkey = (0, _util.getRowkey)(this);
     this.tableFullColumn.forEach(function (column) {
       var property = column.property,
           editRender = column.editRender;
@@ -1450,7 +1448,7 @@ var Methods = {
 
     if (keepSource) {
       var oRow, property;
-      var rowid = getRowid(this, row); // 新增的数据不需要检测
+      var rowid = (0, _util.getRowid)(this, row); // 新增的数据不需要检测
 
       if (!fullDataRowIdData[rowid]) {
         return false;
@@ -1460,7 +1458,7 @@ var Methods = {
         var children = treeOpts.children;
 
         var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this16, item);
+          return rowid === (0, _util.getRowid)(_this16, item);
         }, treeOpts);
 
         row = Object.assign({}, row, _defineProperty({}, children, null));
@@ -1854,7 +1852,7 @@ var Methods = {
 
     if (treeConfig) {
       _xeUtils.default.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = getRowid(_this18, row);
+        var rowid = (0, _util.getRowid)(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -1883,7 +1881,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = getRowid(_this18, row);
+        var rowid = (0, _util.getRowid)(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -1922,7 +1920,7 @@ var Methods = {
       if (_xeUtils.default.isString(rowOrRowid)) {
         rowid = rowOrRowid;
       } else {
-        rowid = getRowid(this, rowOrRowid);
+        rowid = (0, _util.getRowid)(this, rowOrRowid);
       }
 
       if (rowid) {
@@ -2827,14 +2825,7 @@ var Methods = {
               if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                 tableColumn = fixedColumn;
               } else {
-                tableColumn = visibleColumn; // 检查固定列是否被合并，合并范围是否超出固定列
-                // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
-                //   tableColumn = fixedColumn
-                // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
-                //   tableColumn = fixedColumn
-                // } else {
-                //   tableColumn = visibleColumn
-                // }
+                tableColumn = visibleColumn;
               }
             } else {
               tableColumn = visibleColumn;
@@ -2862,14 +2853,7 @@ var Methods = {
               if (!mergeFooterList.length || !footerSpanMethod) {
                 tableColumn = fixedColumn;
               } else {
-                tableColumn = visibleColumn; // 检查固定列是否被合并，合并范围是否超出固定列
-                // if (mergeFooterList.length && !isMergeFooterLeftFixedExceeded && fixedType === 'left') {
-                //   tableColumn = fixedColumn
-                // } else if (mergeFooterList.length && !isMergeFooterRightFixedExceeded && fixedType === 'right') {
-                //   tableColumn = fixedColumn
-                // } else {
-                //   tableColumn = visibleColumn
-                // }
+                tableColumn = visibleColumn;
               }
             } else {
               tableColumn = visibleColumn;
@@ -3164,6 +3148,8 @@ var Methods = {
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
+        _this27.emitEvent('keydown-start', {}, evnt);
+
         if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
           _this27.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
@@ -3191,6 +3177,8 @@ var Methods = {
         }
 
         _this27.emitEvent('keydown', {}, evnt);
+
+        _this27.emitEvent('keydown-end', {}, evnt);
       });
     }
   },
@@ -3513,21 +3501,9 @@ var Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
-  handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this29 = this;
-
-    var tooltipOpts = this.tooltipOpts;
-    setTimeout(function () {
-      if (!_this29.tooltipActive) {
-        _this29.closeTooltip();
-      }
-    }, tooltipOpts.leaveDelay);
-    return false;
-  },
   handleTargetEnterEvent: function handleTargetEnterEvent(isClear) {
     var $tooltip = this.$refs.tooltip;
     clearTimeout(this.tooltipTimeout);
-    this.tooltipActive = true;
 
     if (isClear) {
       this.closeTooltip();
@@ -3538,11 +3514,10 @@ var Methods = {
     }
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this30 = this;
+    var _this29 = this;
 
     var tooltipOpts = this.tooltipOpts;
     var $tooltip = this.$refs.tooltip;
-    this.tooltipActive = false;
 
     if ($tooltip) {
       $tooltip.setActived(false);
@@ -3550,10 +3525,10 @@ var Methods = {
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        $tooltip = _this30.$refs.tooltip;
+        $tooltip = _this29.$refs.tooltip;
 
         if ($tooltip && !$tooltip.isActived()) {
-          _this30.closeTooltip();
+          _this29.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -3562,19 +3537,24 @@ var Methods = {
   },
   triggerHeaderHelpEvent: function triggerHeaderHelpEvent(evnt, params) {
     var column = params.column;
-    var titleHelp = column.titleHelp;
+    var titlePrefix = column.titlePrefix || column.titleHelp;
 
-    if (titleHelp.content || titleHelp.message) {
+    if (titlePrefix.content || titlePrefix.message) {
       var $refs = this.$refs,
           tooltipStore = this.tooltipStore;
-      var $tooltip = $refs.tooltip;
-      var content = (0, _utils.getFuncText)(titleHelp.content || titleHelp.message);
+      var content = (0, _utils.getFuncText)(titlePrefix.content || titlePrefix.message);
       this.handleTargetEnterEvent(true);
       tooltipStore.visible = true;
+      tooltipStore.currOpts = _objectSpread(_objectSpread({}, titlePrefix), {}, {
+        content: null
+      });
+      this.$nextTick(function () {
+        var $tooltip = $refs.tooltip;
 
-      if ($tooltip) {
-        $tooltip.open(evnt.currentTarget, content);
-      }
+        if ($tooltip) {
+          $tooltip.open(evnt.currentTarget, content);
+        }
+      });
     }
   },
 
@@ -3660,7 +3640,6 @@ var Methods = {
     var showAll = tooltipOpts.showAll,
         enabled = tooltipOpts.enabled,
         contentMethod = tooltipOpts.contentMethod;
-    var tooltip = $refs.tooltip;
     var customContent = contentMethod ? contentMethod(params) : null;
     var useCustom = contentMethod && !_xeUtils.default.eqNull(customContent);
     var content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
@@ -3670,12 +3649,16 @@ var Methods = {
       Object.assign(tooltipStore, {
         row: row,
         column: column,
-        visible: true
+        visible: true,
+        currOpts: null
       });
+      this.$nextTick(function () {
+        var $tooltip = $refs.tooltip;
 
-      if (tooltip) {
-        tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, _utils.default.formatText(content));
-      }
+        if ($tooltip) {
+          $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, _utils.default.formatText(content));
+        }
+      });
     }
 
     return this.$nextTick();
@@ -3705,7 +3688,8 @@ var Methods = {
         row: null,
         column: null,
         content: null,
-        visible: false
+        visible: false,
+        currOpts: null
       });
 
       if (tooltip) {
@@ -3783,14 +3767,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this31 = this;
+    var _this30 = this;
 
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this31.handleSelectRow({
+      return _this30.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -3814,7 +3798,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value) {
-    var _this32 = this;
+    var _this31 = this;
 
     var row = _ref6.row;
     var selection = this.selection,
@@ -3847,7 +3831,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this32.handleCheckboxReserveRow(row, value);
+              _this31.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -3921,7 +3905,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this32.handleCheckboxReserveRow(row, value);
+              _this31.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -4025,7 +4009,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this33 = this;
+    var _this32 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -4138,11 +4122,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this33, row)] = row;
+            checkboxReserveRowMap[(0, _util.getRowid)(_this32, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this33.handleCheckboxReserveRow(row, false);
+            return _this32.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -4270,7 +4254,7 @@ var Methods = {
 
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = getRowid(this, radioReserveRow);
+      var rowid = (0, _util.getRowid)(this, radioReserveRow);
 
       if (fullDataRowIdData[rowid]) {
         this.setRadioRow(fullDataRowIdData[rowid].row);
@@ -4317,14 +4301,14 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = getRowid(this, radioReserveRow);
+      var rowid = (0, _util.getRowid)(this, radioReserveRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
           return radioReserveRow;
         }
       } else {
-        var rowkey = getRowkey(this);
+        var rowkey = (0, _util.getRowkey)(this);
 
         if (treeConfig) {
           var matchObj = _xeUtils.default.findTree(afterFullData, function (row) {
@@ -4362,7 +4346,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this34 = this;
+    var _this33 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -4377,11 +4361,11 @@ var Methods = {
 
       if (treeConfig) {
         _xeUtils.default.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[getRowid(_this34, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this33, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[getRowid(_this34, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this33, row)] = 1;
         });
       }
 
@@ -4411,7 +4395,7 @@ var Methods = {
         checkboxOpts = this.checkboxOpts;
 
     if (checkboxOpts.reserve) {
-      var rowid = getRowid(this, row);
+      var rowid = (0, _util.getRowid)(this, row);
 
       if (checked) {
         checkboxReserveRowMap[rowid] = row;
@@ -4447,7 +4431,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this35 = this;
+    var _this34 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -4470,7 +4454,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this35.handleCheckboxReserveRow(row, false);
+        return _this34.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -4496,7 +4480,7 @@ var Methods = {
       }
 
       if (reserve) {
-        var rowkey = getRowkey(this);
+        var rowkey = (0, _util.getRowkey)(this);
         this.radioReserveRow = _defineProperty({}, rowkey, rowid);
       }
     }
@@ -4557,7 +4541,7 @@ var Methods = {
 
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
-        _xeUtils.default.arrayEach($el.querySelectorAll("[rowid=\"".concat(getRowid(this, row), "\"]")), function (elem) {
+        _xeUtils.default.arrayEach($el.querySelectorAll("[rowid=\"".concat((0, _util.getRowid)(this, row), "\"]")), function (elem) {
           return addClass(elem, 'row--current');
         });
       }
@@ -4630,7 +4614,7 @@ var Methods = {
         afterFullData = this.afterFullData;
 
     if (selectRow) {
-      var rowid = getRowid(this, selectRow);
+      var rowid = (0, _util.getRowid)(this, selectRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
@@ -4638,7 +4622,7 @@ var Methods = {
         }
       } else {
         if (treeConfig) {
-          var rowkey = getRowkey(this);
+          var rowkey = (0, _util.getRowkey)(this);
 
           var matchObj = _xeUtils.default.findTree(afterFullData, function (row) {
             return rowid === _xeUtils.default.get(row, rowkey);
@@ -4667,7 +4651,7 @@ var Methods = {
   },
   setHoverRow: function setHoverRow(row) {
     var $el = this.$el;
-    var rowid = getRowid(this, row);
+    var rowid = (0, _util.getRowid)(this, row);
     this.clearHoverRow();
 
     if ($el) {
@@ -4762,13 +4746,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this36 = this;
+    var _this35 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this36.handleActived(params, evnt).then(function () {
-        return _this36.checkValidate('change');
+      _this35.handleActived(params, evnt).then(function () {
+        return _this35.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -4871,7 +4855,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this37 = this;
+    var _this36 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -4886,15 +4870,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this37.handleActived(params, evnt).then(function () {
-              return _this37.checkValidate('change');
+            _this36.handleActived(params, evnt).then(function () {
+              return _this36.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this37.checkValidate('change');
+            return _this36.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -4905,7 +4889,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this38 = this;
+    var _this37 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -4922,7 +4906,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this38.getColumnByField(field);
+            var column = _this37.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -4965,7 +4949,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this39 = this;
+    var _this38 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -4998,7 +4982,7 @@ var Methods = {
         var column = field;
 
         if (_xeUtils.default.isString(field)) {
-          column = _this39.getColumnByField(field);
+          column = _this38.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -5007,7 +4991,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this39, column);
+            order = getNextSortOrder(_this38, column);
           }
 
           if (column.order !== order) {
@@ -5160,7 +5144,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this40 = this;
+    var _this39 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -5168,7 +5152,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this40.handleAsyncRowExpand(row);
+        return _this39.handleAsyncRowExpand(row);
       });
     }
 
@@ -5247,29 +5231,29 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this41 = this;
+    var _this40 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this41.expandLazyLoadeds.push(row);
+      _this40.expandLazyLoadeds.push(row);
 
-      _this41.expandOpts.loadMethod({
-        $table: _this41,
+      _this40.expandOpts.loadMethod({
+        $table: _this40,
         row: row,
-        rowIndex: _this41.getRowIndex(row),
-        $rowIndex: _this41.getVMRowIndex(row)
+        rowIndex: _this40.getRowIndex(row),
+        $rowIndex: _this40.getVMRowIndex(row)
       }).catch(function (e) {
         return e;
       }).then(function () {
         rest.expandLoaded = true;
 
-        _xeUtils.default.remove(_this41.expandLazyLoadeds, function (item) {
+        _xeUtils.default.remove(_this40.expandLazyLoadeds, function (item) {
           return item === row;
         });
 
-        _this41.rowExpandeds.push(row);
+        _this40.rowExpandeds.push(row);
 
-        resolve(_this41.$nextTick().then(_this41.recalculate));
+        resolve(_this40.$nextTick().then(_this40.recalculate));
       });
     });
   },
@@ -5282,7 +5266,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this42 = this;
+    var _this41 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -5315,8 +5299,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this42.getRowIndex(row),
-          $rowIndex: _this42.getVMRowIndex(row)
+          rowIndex: _this41.getRowIndex(row),
+          $rowIndex: _this41.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -5327,7 +5311,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this42.handleAsyncRowExpand(row));
+              lazyRests.push(_this41.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -5341,7 +5325,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this42.handleRowExpandReserve(row, expanded);
+          return _this41.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -5362,7 +5346,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this43 = this;
+    var _this42 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -5373,13 +5357,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this43.handleRowExpandReserve(row, false);
+        return _this42.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this43.recalculate();
+        _this42.recalculate();
       }
     });
   },
@@ -5392,7 +5376,7 @@ var Methods = {
         expandOpts = this.expandOpts;
 
     if (expandOpts.reserve) {
-      var rowid = getRowid(this, row);
+      var rowid = (0, _util.getRowid)(this, row);
 
       if (expanded) {
         rowExpandedReserveRowMap[rowid] = row;
@@ -5459,7 +5443,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this44 = this;
+    var _this43 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -5469,15 +5453,15 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this44.handleAsyncTreeExpandChilds(row);
+        return _this43.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this44.handleVirtualTreeToList();
+          _this43.handleVirtualTreeToList();
 
-          return _this44.handleTableData();
+          return _this43.handleTableData();
         }
       }).then(function () {
-        return _this44.recalculate();
+        return _this43.recalculate();
       });
     }
 
@@ -5540,7 +5524,7 @@ var Methods = {
         this.setAllTreeExpand(true);
       } else if (expandRowKeys) {
         var defExpandeds = [];
-        var rowkey = getRowkey(this);
+        var rowkey = (0, _util.getRowkey)(this);
         expandRowKeys.forEach(function (rowid) {
           var matchObj = _xeUtils.default.findTree(tableFullData, function (item) {
             return rowid === _xeUtils.default.get(item, rowkey);
@@ -5555,7 +5539,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this45 = this;
+    var _this44 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -5569,7 +5553,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this45,
+        $table: _this44,
         row: row
       }).catch(function () {
         return [];
@@ -5585,29 +5569,29 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this45.loadTreeChildren(row, childRecords).then(function (childRows) {
+          _this44.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
 
 
-            if (!checkStrictly && _this45.isCheckedByCheckboxRow(row)) {
-              _this45.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this44.isCheckedByCheckboxRow(row)) {
+              _this44.setCheckboxRow(childRows, true);
             }
 
-            _this45.$nextTick().then(function () {
+            _this44.$nextTick().then(function () {
               if (transform) {
-                return _this45.handleTableData();
+                return _this44.handleTableData();
               }
             }).then(function () {
-              return _this45.recalculate();
+              return _this44.recalculate();
             }).then(function () {
               return resolve();
             });
           });
         } else {
-          _this45.$nextTick().then(function () {
-            return _this45.recalculate();
+          _this44.$nextTick().then(function () {
+            return _this44.recalculate();
           }).then(function () {
             return resolve();
           });
@@ -5645,7 +5629,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this46 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -5693,7 +5677,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this46.handleAsyncTreeExpandChilds(row));
+            result.push(_this45.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -5709,7 +5693,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this46.handleTreeExpandReserve(row, expanded);
+        return _this45.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -5723,14 +5707,14 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this47 = this;
+    var _this46 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this47.handleVirtualTreeToList();
+      _this46.handleVirtualTreeToList();
 
-      return _this47.handleTableData();
+      return _this46.handleTableData();
     }).then(function () {
-      return _this47.recalculate();
+      return _this46.recalculate();
     });
   },
 
@@ -5775,7 +5759,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this48 = this;
+    var _this47 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -5787,19 +5771,19 @@ var Methods = {
 
     if (reserve) {
       _xeUtils.default.eachTree(tableFullData, function (row) {
-        return _this48.handleTreeExpandReserve(row, false);
+        return _this47.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
     return this.handleTableData().then(function () {
       if (transform) {
-        _this48.handleVirtualTreeToList();
+        _this47.handleVirtualTreeToList();
 
-        return _this48.handleTableData();
+        return _this47.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this48.recalculate();
+        _this47.recalculate();
       }
     });
   },
@@ -5812,7 +5796,7 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (treeOpts.reserve) {
-      var rowid = getRowid(this, row);
+      var rowid = (0, _util.getRowid)(this, row);
 
       if (expanded) {
         treeExpandedReserveRowMap[rowid] = row;
@@ -5929,18 +5913,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this49 = this;
+    var _this48 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this49.sYOpts,
-          sXOpts = _this49.sXOpts,
-          scrollXLoad = _this49.scrollXLoad,
-          scrollYLoad = _this49.scrollYLoad,
-          scrollXStore = _this49.scrollXStore,
-          scrollYStore = _this49.scrollYStore; // 计算 X 逻辑
+      var sYOpts = _this48.sYOpts,
+          sXOpts = _this48.sXOpts,
+          scrollXLoad = _this48.scrollXLoad,
+          scrollYLoad = _this48.scrollYLoad,
+          scrollXStore = _this48.scrollXStore,
+          scrollYStore = _this48.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this49),
+        var _computeVirtualX3 = computeVirtualX(_this48),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? _xeUtils.default.toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
@@ -5948,13 +5932,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this49.updateScrollXData();
+        _this48.updateScrollXData();
       } else {
-        _this49.updateScrollXSpace();
+        _this48.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this49),
+      var _computeVirtualY = computeVirtualY(_this48),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -5966,14 +5950,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this49.updateScrollYData();
+        _this48.updateScrollYData();
       } else {
-        _this49.updateScrollYSpace();
+        _this48.updateScrollYSpace();
       }
 
-      _this49.rowHeight = rowHeight;
+      _this48.rowHeight = rowHeight;
 
-      _this49.$nextTick(_this49.updateStyle);
+      _this48.$nextTick(_this48.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -5983,8 +5967,14 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    this.handleTableColumn();
-    this.updateScrollXSpace();
+    var _this49 = this;
+
+    this.tableColumn = [];
+    this.$nextTick(function () {
+      _this49.handleTableColumn();
+
+      _this49.updateScrollXSpace();
+    });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace: function updateScrollXSpace() {
@@ -6040,8 +6030,14 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    this.handleTableData();
-    this.updateScrollYSpace();
+    var _this50 = this;
+
+    this.tableData = [];
+    this.$nextTick(function () {
+      _this50.handleTableData();
+
+      _this50.updateScrollYSpace();
+    });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace: function updateScrollYSpace() {
@@ -6087,7 +6083,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this50 = this;
+    var _this51 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -6108,7 +6104,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this50.$nextTick());
+          return resolve(_this51.$nextTick());
         }, 50);
       });
     }
@@ -6159,7 +6155,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this51 = this;
+    var _this52 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -6174,15 +6170,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this51.isTreeExpandByRow(row)) {
-            rests.push(_this51.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this52.isTreeExpandByRow(row)) {
+            rests.push(_this52.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return _dom.default.rowToVisible(_this51, row);
+      return _dom.default.rowToVisible(_this52, row);
     });
   },
 
@@ -6246,29 +6242,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this52 = this;
+    var _this53 = this;
 
     var customVal = !_xeUtils.default.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this52.$refs,
-          editRules = _this52.editRules,
-          validStore = _this52.validStore;
+      var $refs = _this53.$refs,
+          editRules = _this53.editRules,
+          validStore = _this53.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this52.hasCellRules(type, row, column)) {
-          var cell = _this52.getCell(row, column);
+        if (_this53.hasCellRules(type, row, column)) {
+          var cell = _this53.getCell(row, column);
 
           if (cell) {
-            return _this52.validCellRules(type, row, column, cellValue).then(function () {
+            return _this53.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
 
-              _this52.clearValidate();
+              _this53.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -6276,7 +6272,7 @@ var Methods = {
                 setCellValue(row, column, cellValue);
               }
 
-              _this52.showValidTooltip({
+              _this53.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -6297,7 +6293,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this53 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6305,7 +6301,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this53.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
 
@@ -6314,7 +6310,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this54 = this;
+    var _this55 = this;
 
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6322,7 +6318,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this54.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -6346,7 +6342,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6354,11 +6350,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this55.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this56 = this;
+    var _this57 = this;
 
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6366,7 +6362,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this56.updateCellAreas();
+      _this57.updateCellAreas();
 
       return rest;
     });
@@ -6433,7 +6429,7 @@ var Methods = {
    *************************/
   getCell: function getCell(row, column) {
     var $refs = this.$refs;
-    var rowid = getRowid(this, row);
+    var rowid = (0, _util.getRowid)(this, row);
     var bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
 
     if (bodyElem && bodyElem.$el) {