vxe-table 3.13.4 → 3.13.5

package/es/table/src/methods.js

@@ -2113,15 +2113,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) {
@@ -2305,16 +2301,21 @@ const Methods = {
     /**
      * 更新数据行的 Map
      */
-    cacheRowMap(isReset, isSource) {
-        const { treeConfig, treeOpts, tableFullData, fullAllDataRowIdData, tableFullTreeData } = this;
+    cacheRowMap() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-        const rowkey = getRowkey(this);
+        const rowkey = getRowkey($xeTable);
         const isLazy = treeConfig && treeOpts.lazy;
         const fullAllDataRowIdMaps = {};
         const fullDataRowIdMaps = {};
-        const handleCache = (row, index, items, path, parentRow, nodes) => {
-            let rowid = getRowid(this, row);
+        const handleRow = (row, index, items, path, parentRow, nodes) => {
+            let rowid = getRowid($xeTable, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
             const level = nodes ? nodes.length - 1 : 0;
             if (eqEmptyValue(rowid)) {
@@ -2324,29 +2325,25 @@ const Methods = {
             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) {
-            this.fullDataRowIdData = fullDataRowIdMaps;
-        }
-        this.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
-            XEUtils.eachTree(tableFullTreeData, handleCache, { children: childrenField });
+            XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
         }
         else {
-            tableFullData.forEach(handleCache);
+            tableFullData.forEach(handleRow);
         }
     },
     cacheSourceMap(fullData) {
@@ -3168,7 +3165,7 @@ const Methods = {
         const props = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { fullDataRowIdData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, mapChildrenField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -3181,7 +3178,7 @@ const Methods = {
                 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] || [];
@@ -3198,7 +3195,7 @@ const Methods = {
         const props = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { fullDataRowIdData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         if (rowOrRowid && treeConfig) {
             let rowid;
             if (XEUtils.isString(rowOrRowid)) {
@@ -3208,7 +3205,7 @@ const Methods = {
                 rowid = getRowid($xeTable, rowOrRowid);
             }
             if (rowid) {
-                const rest = fullDataRowIdData[rowid];
+                const rest = fullAllDataRowIdData[rowid];
                 return rest ? rest.parent : null;
             }
         }
@@ -3226,9 +3223,9 @@ const Methods = {
     getRowById(cellValue) {
         const $xeTable = this;
         const internalData = $xeTable;
-        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;
     },
     /**
      * 根据行获取行的唯一主键
@@ -7459,11 +7456,12 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
         const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
+        let tExpandedMaps = {};
         if (rows) {
+            tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
             if (!XEUtils.isArray(rows)) {
                 rows = [rows];
             }
@@ -7478,7 +7476,12 @@ const Methods = {
                 }
             });
         }
-        reactData.treeExpandedMaps = tExpandedMaps;
+        else {
+            XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+                rowRest.treeLoaded = false;
+            });
+        }
+        reactData.treeExpandedMaps = {};
         if (transform) {
             handleVirtualTreeToList($xeTable);
             return $xeTable.handleTableData();

package/es/table/src/table.js

@@ -1113,7 +1113,7 @@ export default {
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
-            this.loadTableData(value || [], true).then(() => {
+            this.loadTableData(value || [], false).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const expandOpts = $xeTable.computeExpandOpts;
                 this.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 = "3.13.4";
+export const version = "3.13.5";
 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${"3.13.4"}`;
+const version = `table v${"3.13.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);