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

package/lib/index.umd.js

@@ -11042,7 +11042,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.3", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12229,7 +12229,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.2",
+  version: "3.7.0-beta.3",
   reg: reg,
   use: use,
   setup: setup,
@@ -15890,7 +15890,7 @@ var Methods = {
     this.tableSynchData = datas;
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
-      this.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
+      this.cacheSourceMap(fullData);
     }
     if (false) {}
     if (this.clearCellAreas && this.mouseConfig) {
@@ -16069,11 +16069,9 @@ var Methods = {
       tableFullData = this.tableFullData,
       fullDataRowMap = this.fullDataRowMap,
       fullAllDataRowMap = this.fullAllDataRowMap,
-      tableFullTreeData = this.tableFullTreeData,
-      tableSourceData = this.tableSourceData;
+      tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
-      fullAllDataRowIdData = this.fullAllDataRowIdData,
-      sourceDataRowIdData = this.sourceDataRowIdData;
+      fullAllDataRowIdData = this.fullAllDataRowIdData;
     var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
@@ -16110,15 +16108,23 @@ var Methods = {
       fullDataRowMap.clear();
     }
     fullAllDataRowIdData = this.fullAllDataRowIdData = {};
-    sourceDataRowIdData = this.sourceDataRowIdData = {};
     fullAllDataRowMap.clear();
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, treeOpts);
     } else {
       tableFullData.forEach(handleCache);
     }
+  },
+  cacheSourceMap: function cacheSourceMap(fullData) {
+    var _this11 = this;
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      sourceDataRowIdData = this.sourceDataRowIdData;
+    var sourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
+    var rowkey = getRowkey(this);
+    sourceDataRowIdData = this.sourceDataRowIdData = {};
     var handleSourceRow = function handleSourceRow(row) {
-      var rowid = getRowid(_this10, row);
+      var rowid = getRowid(_this11, row);
       if (eqEmptyValue(rowid)) {
         rowid = getRowUniqueId();
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
@@ -16130,13 +16136,14 @@ var Methods = {
     };
     // 源数据缓存
     if (treeConfig && !treeOpts.transform) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableSourceData, handleSourceRow, treeOpts);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(sourceData, handleSourceRow, treeOpts);
     } else {
-      tableSourceData.forEach(handleSourceRow);
+      sourceData.forEach(handleSourceRow);
     }
+    this.tableSourceData = sourceData;
   },
   loadTreeChildren: function loadTreeChildren(row, childRecords) {
-    var _this11 = this;
+    var _this12 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeOpts = this.treeOpts,
@@ -16151,16 +16158,16 @@ var Methods = {
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = getRowid(_this11, row);
+        var rowid = getRowid(_this12, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this11, item);
+          return rowid === getRowid(_this12, item);
         }, treeOpts);
         if (matchObj) {
           matchObj.item[children] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
         }
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = getRowid(_this11, childRow);
+        var rowid = getRowid(_this12, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -16181,7 +16188,7 @@ var Methods = {
       if (transform) {
         row[mapChildren] = rows;
       }
-      _this11.updateAfterDataIndex();
+      _this12.updateAfterDataIndex();
       return rows;
     });
   },
@@ -16190,7 +16197,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this12 = this;
+    var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
       fullColumnMap = this.fullColumnMap,
@@ -16399,7 +16406,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,
@@ -16410,7 +16417,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 && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().has(record, field)) {
@@ -16450,9 +16457,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);
     });
   },
   /**
@@ -16477,7 +16484,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;
@@ -16495,8 +16502,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) {
             errLog('vxe.error.noTree', ['revertData']);
           }
@@ -16570,39 +16577,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 = getRowid(this, row);
       // 新增的数据不需要检测
       if (!fullDataRowIdData[rowid]) {
         return false;
       }
-      if (treeConfig) {
-        var children = treeOpts.children;
-        var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, function (item) {
-          return rowid === 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;
           }
@@ -19868,7 +19860,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();
   },