vxe-table 3.13.4 → 3.13.5

package/lib/table/src/methods.js

@@ -2462,15 +2462,11 @@ const Methods = {
     internalData.tableFullData = fullData;
     internalData.tableFullTreeData = treeData;
     // 缓存数据
-    $xeTable.cacheRowMap(true, isReset);
+    $xeTable.cacheRowMap(true);
     // 原始数据
     internalData.tableSynchData = datas;
     if (isReset) {
       internalData.isResizeCellHeight = false;
-      reactData.rowExpandedMaps = {};
-      reactData.rowExpandLazyLoadedMaps = {};
-      reactData.treeExpandedMaps = {};
-      reactData.treeExpandLazyLoadedMaps = {};
     }
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
@@ -2653,22 +2649,27 @@ const Methods = {
   /**
    * 更新数据行的 Map
    */
-  cacheRowMap(isReset, isSource) {
+  cacheRowMap() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
-      treeConfig,
-      treeOpts,
-      tableFullData,
       fullAllDataRowIdData,
+      tableFullData,
       tableFullTreeData
-    } = this;
+    } = internalData;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-    const rowkey = (0, _util.getRowkey)(this);
+    const rowkey = (0, _util.getRowkey)($xeTable);
     const isLazy = treeConfig && treeOpts.lazy;
     const fullAllDataRowIdMaps = {};
     const fullDataRowIdMaps = {};
-    const handleCache = (row, index, items, path, parentRow, nodes) => {
-      let rowid = (0, _util.getRowid)(this, row);
+    const handleRow = (row, index, items, path, parentRow, nodes) => {
+      let rowid = (0, _util.getRowid)($xeTable, row);
       const seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
       const level = nodes ? nodes.length - 1 : 0;
       if ((0, _utils.eqEmptyValue)(rowid)) {
@@ -2678,9 +2679,9 @@ const Methods = {
       if (isLazy && row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
         row[childrenField] = null;
       }
-      let cacheItem = fullAllDataRowIdData[rowid];
-      if (isReset || !cacheItem) {
-        cacheItem = {
+      let rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
+        rowRest = {
           row,
           rowid,
           seq,
@@ -2697,26 +2698,22 @@ const Methods = {
           expandHeight: 0
         };
       }
-      cacheItem.row = row;
-      cacheItem.items = items;
-      cacheItem.parent = parentRow;
-      cacheItem.level = level;
-      cacheItem.index = treeConfig && parentRow ? -1 : index;
-      if (isSource) {
-        fullDataRowIdMaps[rowid] = cacheItem;
-      }
-      fullAllDataRowIdMaps[rowid] = cacheItem;
+      rowRest.row = row;
+      rowRest.items = items;
+      rowRest.parent = parentRow;
+      rowRest.level = level;
+      rowRest.index = treeConfig && parentRow ? -1 : index;
+      fullDataRowIdMaps[rowid] = rowRest;
+      fullAllDataRowIdMaps[rowid] = rowRest;
     };
-    if (isSource) {
-      this.fullDataRowIdData = fullDataRowIdMaps;
-    }
-    this.fullAllDataRowIdData = fullAllDataRowIdMaps;
+    internalData.fullDataRowIdData = fullDataRowIdMaps;
+    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
     if (treeConfig) {
-      _xeUtils.default.eachTree(tableFullTreeData, handleCache, {
+      _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
         children: childrenField
       });
     } else {
-      tableFullData.forEach(handleCache);
+      tableFullData.forEach(handleRow);
     }
   },
   cacheSourceMap(fullData) {
@@ -3721,7 +3718,7 @@ const Methods = {
       treeConfig
     } = props;
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
@@ -3737,7 +3734,7 @@ const Methods = {
         rowid = (0, _util.getRowid)($xeTable, rowOrRowid);
       }
       if (rowid) {
-        const rest = fullDataRowIdData[rowid];
+        const rest = fullAllDataRowIdData[rowid];
         const row = rest ? rest.row : null;
         if (row) {
           return row[transform ? mapChildrenField : childrenField] || [];
@@ -3757,7 +3754,7 @@ const Methods = {
       treeConfig
     } = props;
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = internalData;
     if (rowOrRowid && treeConfig) {
       let rowid;
@@ -3767,7 +3764,7 @@ const Methods = {
         rowid = (0, _util.getRowid)($xeTable, rowOrRowid);
       }
       if (rowid) {
-        const rest = fullDataRowIdData[rowid];
+        const rest = fullAllDataRowIdData[rowid];
         return rest ? rest.parent : null;
       }
     }
@@ -3786,10 +3783,10 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = internalData;
     const rowid = _xeUtils.default.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
-    return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+    return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
   },
   /**
    * 根据行获取行的唯一主键
@@ -8752,7 +8749,6 @@ const Methods = {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
     const {
       fullAllDataRowIdData
     } = internalData;
@@ -8760,7 +8756,9 @@ const Methods = {
     const {
       transform
     } = treeOpts;
+    let tExpandedMaps = {};
     if (rows) {
+      tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       if (!_xeUtils.default.isArray(rows)) {
         rows = [rows];
       }
@@ -8774,8 +8772,12 @@ const Methods = {
           }
         }
       });
+    } else {
+      _xeUtils.default.each(fullAllDataRowIdData, rowRest => {
+        rowRest.treeLoaded = false;
+      });
     }
-    reactData.treeExpandedMaps = tExpandedMaps;
+    reactData.treeExpandedMaps = {};
     if (transform) {
       handleVirtualTreeToList($xeTable);
       return $xeTable.handleTableData();