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

package/lib/table/src/methods.js

@@ -491,7 +491,7 @@ var Methods = {
     this.tableSynchData = datas;
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
-      this.tableSourceData = _xeUtils["default"].clone(fullData, true);
+      this.cacheSourceMap(fullData);
     }
     if (process.env.NODE_ENV === 'development') {
       if (sYLoad) {
@@ -734,8 +734,35 @@ var Methods = {
       tableFullData.forEach(handleCache);
     }
   },
-  loadTreeChildren: function loadTreeChildren(row, childRecords) {
+  cacheSourceMap: function cacheSourceMap(fullData) {
     var _this11 = this;
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      sourceDataRowIdData = this.sourceDataRowIdData;
+    var sourceData = _xeUtils["default"].clone(fullData, true);
+    var rowkey = (0, _util.getRowkey)(this);
+    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    var handleSourceRow = function handleSourceRow(row) {
+      var rowid = (0, _util.getRowid)(_this11, row);
+      if ((0, _utils.eqEmptyValue)(rowid)) {
+        rowid = getRowUniqueId();
+        _xeUtils["default"].set(row, rowkey, rowid);
+      }
+      sourceDataRowIdData[rowid] = {
+        row: row,
+        rowid: rowid
+      };
+    };
+    // 源数据缓存
+    if (treeConfig && !treeOpts.transform) {
+      _xeUtils["default"].eachTree(sourceData, handleSourceRow, treeOpts);
+    } else {
+      sourceData.forEach(handleSourceRow);
+    }
+    this.tableSourceData = sourceData;
+  },
+  loadTreeChildren: function loadTreeChildren(row, childRecords) {
+    var _this12 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeOpts = this.treeOpts,
@@ -750,16 +777,16 @@ var Methods = {
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = (0, _util.getRowid)(_this11, row);
+        var rowid = (0, _util.getRowid)(_this12, row);
         var matchObj = _xeUtils["default"].findTree(tableSourceData, function (item) {
-          return rowid === (0, _util.getRowid)(_this11, item);
+          return rowid === (0, _util.getRowid)(_this12, item);
         }, treeOpts);
         if (matchObj) {
           matchObj.item[children] = _xeUtils["default"].clone(rows, true);
         }
       }
       _xeUtils["default"].eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = (0, _util.getRowid)(_this11, childRow);
+        var rowid = (0, _util.getRowid)(_this12, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -780,7 +807,7 @@ var Methods = {
       if (transform) {
         row[mapChildren] = rows;
       }
-      _this11.updateAfterDataIndex();
+      _this12.updateAfterDataIndex();
       return rows;
     });
   },
@@ -789,7 +816,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this12 = this;
+    var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
       fullColumnMap = this.fullColumnMap,
@@ -870,14 +897,14 @@ var Methods = {
         }
       }
       if (process.env.NODE_ENV === 'development') {
-        if (_this12.showOverflow && column.showOverflow === false) {
-          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-overflow=".concat(_this12.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
+        if (_this13.showOverflow && column.showOverflow === false) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-overflow=".concat(_this13.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
         }
-        if (_this12.showHeaderOverflow && column.showHeaderOverflow === false) {
-          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this12.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
+        if (_this13.showHeaderOverflow && column.showHeaderOverflow === false) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this13.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
         }
-        if (_this12.showFooterOverflow && column.showFooterOverflow === false) {
-          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
+        if (_this13.showFooterOverflow && column.showFooterOverflow === false) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this13.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
         }
       }
       if (process.env.NODE_ENV === 'development') {
@@ -1057,7 +1084,7 @@ var Methods = {
    * @param {Row} records 行数据
    */
   defineField: function defineField(records) {
-    var _this13 = this;
+    var _this14 = this;
     var radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig,
@@ -1068,7 +1095,7 @@ var Methods = {
       records = [records || {}];
     }
     return records.map(function (record) {
-      _this13.tableFullColumn.forEach(function (column) {
+      _this14.tableFullColumn.forEach(function (column) {
         var field = column.field,
           editRender = column.editRender;
         if (field && !_xeUtils["default"].has(record, field)) {
@@ -1108,9 +1135,9 @@ var Methods = {
    * @param {Array} records 新数据
    */
   createData: function createData(records) {
-    var _this14 = this;
+    var _this15 = this;
     return this.$nextTick().then(function () {
-      return _this14.defineField(records);
+      return _this15.defineField(records);
     });
   },
   /**
@@ -1135,7 +1162,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this15 = this;
+    var _this16 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeConfig = this.treeConfig;
@@ -1155,8 +1182,8 @@ var Methods = {
     }
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this15.isInsertByRow(row)) {
-          var rowIndex = _this15.getRowIndex(row);
+        if (!_this16.isInsertByRow(row)) {
+          var rowIndex = _this16.getRowIndex(row);
           if (treeConfig && rowIndex === -1) {
             (0, _log.errLog)('vxe.error.noTree', ['revertData']);
           }
@@ -1230,39 +1257,24 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this16 = this;
     var tableFullColumn = this.tableFullColumn,
       keepSource = this.keepSource,
-      treeConfig = this.treeConfig,
-      treeOpts = this.treeOpts,
-      tableSourceData = this.tableSourceData,
+      sourceDataRowIdData = this.sourceDataRowIdData,
       fullDataRowIdData = this.fullDataRowIdData;
     if (keepSource) {
-      var oRow, property;
       var rowid = (0, _util.getRowid)(this, row);
       // 新增的数据不需要检测
       if (!fullDataRowIdData[rowid]) {
         return false;
       }
-      if (treeConfig) {
-        var children = treeOpts.children;
-        var matchObj = _xeUtils["default"].findTree(tableSourceData, function (item) {
-          return rowid === (0, _util.getRowid)(_this16, item);
-        }, treeOpts);
-        row = Object.assign({}, row, _defineProperty({}, children, null));
-        if (matchObj) {
-          oRow = Object.assign({}, matchObj.item, _defineProperty({}, children, null));
-        }
-      } else {
-        var oRowIndex = fullDataRowIdData[rowid].index;
-        oRow = tableSourceData[oRowIndex];
-      }
-      if (oRow) {
+      var oldRest = sourceDataRowIdData[rowid];
+      if (oldRest) {
+        var oRow = oldRest.row;
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
         for (var index = 0, len = tableFullColumn.length; index < len; index++) {
-          property = tableFullColumn[index].field;
+          var property = tableFullColumn[index].field;
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
           }
@@ -1795,7 +1807,7 @@ var Methods = {
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true;
       return this.handleCustom();
     }
@@ -4541,7 +4553,10 @@ var Methods = {
       if (!remote || firstSortColumn && firstSortColumn.remoteSort) {
         this.handleTableData(true);
       }
-      return this.$nextTick().then(this.updateStyle);
+      return this.$nextTick().then(function () {
+        _this41.updateCellAreas();
+        return _this41.updateStyle();
+      });
     }
     return this.$nextTick();
   },