vxe-table 3.5.0-beta.1 → 3.5.0-beta.4

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,
@@ -82,8 +80,7 @@ function eqCellValue(row1, row2, field) {
   }
 
   if (_xeUtils.default.isString(val1) || _xeUtils.default.isNumber(val1)) {
-    /* eslint-disable eqeqeq */
-    return val1 == val2;
+    return '' + val1 === '' + val2;
   }
 
   return _xeUtils.default.isEqual(val1, val2);
@@ -492,7 +489,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 +816,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 +882,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 +898,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 +1124,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 +1233,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 +1447,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 +1457,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 +1851,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 +1880,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 +1919,7 @@ var Methods = {
       if (_xeUtils.default.isString(rowOrRowid)) {
         rowid = rowOrRowid;
       } else {
-        rowid = getRowid(this, rowOrRowid);
+        rowid = (0, _util.getRowid)(this, rowOrRowid);
       }
 
       if (rowid) {
@@ -4124,7 +4121,7 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this32, row)] = row;
+            checkboxReserveRowMap[(0, _util.getRowid)(_this32, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
@@ -4256,7 +4253,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);
@@ -4303,14 +4300,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) {
@@ -4363,11 +4360,11 @@ var Methods = {
 
       if (treeConfig) {
         _xeUtils.default.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[getRowid(_this33, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this33, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[getRowid(_this33, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this33, row)] = 1;
         });
       }
 
@@ -4397,7 +4394,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;
@@ -4482,7 +4479,7 @@ var Methods = {
       }
 
       if (reserve) {
-        var rowkey = getRowkey(this);
+        var rowkey = (0, _util.getRowkey)(this);
         this.radioReserveRow = _defineProperty({}, rowkey, rowid);
       }
     }
@@ -4543,7 +4540,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');
         });
       }
@@ -4616,7 +4613,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]) {
@@ -4624,7 +4621,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);
@@ -4653,7 +4650,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) {
@@ -5378,7 +5375,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;
@@ -5526,7 +5523,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);
@@ -5798,7 +5795,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;
@@ -5969,8 +5966,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() {
@@ -6026,8 +6029,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() {
@@ -6073,7 +6082,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this49 = this;
+    var _this51 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -6094,7 +6103,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this49.$nextTick());
+          return resolve(_this51.$nextTick());
         }, 50);
       });
     }
@@ -6145,7 +6154,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this50 = this;
+    var _this52 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -6160,15 +6169,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 && !_this52.isTreeExpandByRow(row)) {
+            rests.push(_this52.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return _dom.default.rowToVisible(_this50, row);
+      return _dom.default.rowToVisible(_this52, row);
     });
   },
 
@@ -6232,29 +6241,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this51 = this;
+    var _this53 = this;
 
     var customVal = !_xeUtils.default.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this51.$refs,
-          editRules = _this51.editRules,
-          validStore = _this51.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 (_this51.hasCellRules(type, row, column)) {
-          var cell = _this51.getCell(row, column);
+        if (_this53.hasCellRules(type, row, column)) {
+          var cell = _this53.getCell(row, column);
 
           if (cell) {
-            return _this51.validCellRules(type, row, column, cellValue).then(function () {
+            return _this53.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
 
-              _this51.clearValidate();
+              _this53.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -6262,7 +6271,7 @@ var Methods = {
                 setCellValue(row, column, cellValue);
               }
 
-              _this51.showValidTooltip({
+              _this53.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -6283,7 +6292,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this52 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6291,7 +6300,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
 
@@ -6300,7 +6309,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this53 = this;
+    var _this55 = this;
 
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6308,7 +6317,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -6332,7 +6341,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6340,11 +6349,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this54.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this57 = this;
 
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6352,7 +6361,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this55.updateCellAreas();
+      _this57.updateCellAreas();
 
       return rest;
     });
@@ -6419,7 +6428,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) {