vxe-table 4.11.5 → 4.11.6

package/lib/table/src/table.js

@@ -3124,15 +3124,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       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) {
@@ -4637,7 +4633,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
@@ -4653,7 +4649,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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] || [];
@@ -4670,7 +4666,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         if (rowOrRowid && treeConfig) {
           let rowid;
@@ -4680,7 +4676,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             rowid = (0, _util.getRowid)($xeTable, rowOrRowid);
           }
           if (rowid) {
-            const rest = fullDataRowIdData[rowid];
+            const rest = fullAllDataRowIdData[rowid];
             return rest ? rest.parent : null;
           }
         }
@@ -4696,10 +4692,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       getRowById(cellValue) {
         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;
       },
       /**
        * 根据行获取行的唯一主键
@@ -6061,7 +6057,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return rowRest && !!rowRest.treeLoaded;
       },
       clearTreeExpandLoaded(rows) {
-        const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
         const {
           fullAllDataRowIdData
         } = internalData;
@@ -6069,7 +6064,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           transform
         } = treeOpts;
+        let tExpandedMaps = {};
         if (rows) {
+          tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
           if (!_xeUtils.default.isArray(rows)) {
             rows = [rows];
           }
@@ -6083,11 +6080,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
               }
             }
           });
+        } else {
+          _xeUtils.default.each(fullAllDataRowIdData, rowRest => {
+            rowRest.treeLoaded = false;
+          });
         }
-        reactData.treeExpandedMaps = tExpandedMaps;
+        reactData.treeExpandedMaps = {};
         if (transform) {
           handleVirtualTreeToList();
-          return tablePrivateMethods.handleTableData();
+          return $xeTable.handleTableData();
         }
         return (0, _vue.nextTick)();
       },
@@ -7630,7 +7631,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       /**
        * 更新数据行的 Map
        */
-      cacheRowMap(isReset, isSource) {
+      cacheRowMap() {
         const {
           treeConfig
         } = props;
@@ -7657,9 +7658,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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,
@@ -7676,19 +7677,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
               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) {
-          internalData.fullDataRowIdData = fullDataRowIdMaps;
-        }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
           _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
@@ -11261,7 +11258,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (value && value.length >= 50000) {
         (0, _log.warnLog)('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value, true).then(() => {
+      loadTableData(value, false).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,