vxe-table 4.11.5 → 4.11.6

package/es/table/src/table.js

@@ -2653,15 +2653,11 @@ export default 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) {
@@ -3979,7 +3975,7 @@ export default defineComponent({
              */
             getTreeRowChildren(rowOrRowid) {
                 const { treeConfig } = props;
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -3992,7 +3988,7 @@ export default defineComponent({
                         rowid = 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] || [];
@@ -4006,7 +4002,7 @@ export default defineComponent({
              */
             getTreeParentRow(rowOrRowid) {
                 const { treeConfig } = props;
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 if (rowOrRowid && treeConfig) {
                     let rowid;
                     if (XEUtils.isString(rowOrRowid)) {
@@ -4016,7 +4012,7 @@ export default defineComponent({
                         rowid = getRowid($xeTable, rowOrRowid);
                     }
                     if (rowid) {
-                        const rest = fullDataRowIdData[rowid];
+                        const rest = fullAllDataRowIdData[rowid];
                         return rest ? rest.parent : null;
                     }
                 }
@@ -4031,9 +4027,9 @@ export default defineComponent({
              * @param {String/Number} rowid 行主键
              */
             getRowById(cellValue) {
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 const rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
-                return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+                return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
             },
             /**
              * 根据行获取行的唯一主键
@@ -5216,11 +5212,12 @@ export default defineComponent({
                 return rowRest && !!rowRest.treeLoaded;
             },
             clearTreeExpandLoaded(rows) {
-                const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                 const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
+                let tExpandedMaps = {};
                 if (rows) {
+                    tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                     if (!XEUtils.isArray(rows)) {
                         rows = [rows];
                     }
@@ -5235,10 +5232,15 @@ export default defineComponent({
                         }
                     });
                 }
-                reactData.treeExpandedMaps = tExpandedMaps;
+                else {
+                    XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+                        rowRest.treeLoaded = false;
+                    });
+                }
+                reactData.treeExpandedMaps = {};
                 if (transform) {
                     handleVirtualTreeToList();
-                    return tablePrivateMethods.handleTableData();
+                    return $xeTable.handleTableData();
                 }
                 return nextTick();
             },
@@ -6631,7 +6633,7 @@ export default defineComponent({
             /**
              * 更新数据行的 Map
              */
-            cacheRowMap(isReset, isSource) {
+            cacheRowMap() {
                 const { treeConfig } = props;
                 const treeOpts = computeTreeOpts.value;
                 const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
@@ -6652,23 +6654,19 @@ export default defineComponent({
                     if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
                         row[childrenField] = null;
                     }
-                    let cacheItem = fullAllDataRowIdData[rowid];
-                    if (isReset || !cacheItem) {
-                        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, 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;
+                    let rowRest = fullAllDataRowIdData[rowid];
+                    if (!rowRest) {
+                        rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    }
+                    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.eachTree(tableFullTreeData, handleRow, { children: childrenField });
@@ -9796,7 +9794,7 @@ export default defineComponent({
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
-            loadTableData(value, true).then(() => {
+            loadTableData(value, false).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const expandOpts = computeExpandOpts.value;
                 internalData.inited = true;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.11.5";
+export const version = "4.11.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.11.5"}`;
+const version = `table v${"4.11.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);