vxe-table 4.1.9 → 4.1.11

package/README.md

@@ -24,7 +24,7 @@
   * [x] v2.0 基于 vue2.6+，支持所有主流的浏览器，同时兼具功能与性能
   * [x] v3.0 基于 vue2.6+，支持现代浏览器并保留兼容 IE11，提升渲染性能
   * [x] v4.0 基于 vue3.0+，只支持现代浏览器，不支持 IE
-  * [ ] 下一阶段：sticky 表格、css 变量、虚拟滚动与动态行高、数据可视化
+  * [ ] 下一阶段：sticky 渲染模式、css 变量主题、将虚拟滚动提升到极致、虚拟滚动动态行高、数据图表可视化
 
 ## QQ 交流群
 

package/README.zh-TW.md

@@ -24,7 +24,6 @@
   * [x] v2.0 基於 vue2.6+，支持所有主流的瀏覽器，同時兼具功能與效能
   * [x] v3.0 基於 vue2.6+，支持現代瀏覽器並保留相容IE11，提升渲染效能
   * [x] v4.0 基于 vue3.0+，只支持現代瀏覽器，不支持IE
-  * [ ] 下一阶段：sticky 表格、css 变量、虚拟滚动与动态行高、数据可视化
 
 ## QQ 交流群
 

package/es/edit/src/hook.js

@@ -25,7 +25,7 @@ var editHook = {
     setupTable: function ($xetable) {
         var props = $xetable.props, reactData = $xetable.reactData, internalData = $xetable.internalData;
         var refElem = $xetable.getRefMaps().refElem;
-        var _a = $xetable.getComputeMaps(), computeMouseOpts = _a.computeMouseOpts, computeEditOpts = _a.computeEditOpts, computeCheckboxOpts = _a.computeCheckboxOpts, computeSYOpts = _a.computeSYOpts, computeTreeOpts = _a.computeTreeOpts;
+        var _a = $xetable.getComputeMaps(), computeMouseOpts = _a.computeMouseOpts, computeEditOpts = _a.computeEditOpts, computeCheckboxOpts = _a.computeCheckboxOpts, computeTreeOpts = _a.computeTreeOpts;
         var editMethods = {};
         var editPrivateMethods = {};
         var getEditColumnModel = function (row, column) {
@@ -67,13 +67,13 @@ var editHook = {
             }
         }
         function insertTreeRow(newRecords, isAppend) {
-            var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+            var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
             var treeOpts = computeTreeOpts.value;
             var funcName = isAppend ? 'push' : 'unshift';
             newRecords.forEach(function (item) {
                 var parentRowId = item[treeOpts.parentField];
                 var rowid = getRowid($xetable, item);
-                var matchObj = parentRowId ? XEUtils.findTree(treeFullData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
+                var matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
                 if (matchObj) {
                     var parentRow = matchObj.item;
                     var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
@@ -94,13 +94,12 @@ var editHook = {
                         }
                     }
                     afterFullData[funcName](item);
-                    treeFullData[funcName](item);
-                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: treeFullData, parent: null, level: 0 };
+                    tableFullTreeData[funcName](item);
+                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: tableFullTreeData, parent: null, level: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
             });
-            $xetable.updateVirtualTreeData();
         }
         editMethods = {
             /**
@@ -122,9 +121,8 @@ var editHook = {
             insertAt: function (records, row) {
                 var _a;
                 var treeConfig = props.treeConfig;
-                var mergeList = reactData.mergeList, editStore = reactData.editStore, scrollYLoad = reactData.scrollYLoad;
-                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-                var sYOpts = computeSYOpts.value;
+                var mergeList = reactData.mergeList, editStore = reactData.editStore;
+                var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var treeOpts = computeTreeOpts.value;
                 var transform = treeOpts.transform;
                 if (!XEUtils.isArray(records)) {
@@ -169,7 +167,7 @@ var editHook = {
                     else {
                         // 如果为虚拟树
                         if (treeConfig && transform) {
-                            var matchObj_1 = XEUtils.findTree(treeFullData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
+                            var matchObj_1 = XEUtils.findTree(tableFullTreeData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
                             if (matchObj_1) {
                                 var parentRow_1 = matchObj_1.parent;
                                 var parentChilds_1 = matchObj_1.items;
@@ -192,7 +190,6 @@ var editHook = {
                                     fullDataRowIdData[rowid] = rest;
                                     fullAllDataRowIdData[rowid] = rest;
                                 });
-                                $xetable.updateVirtualTreeData();
                             }
                             else {
                                 if (process.env.NODE_ENV === 'development') {
@@ -225,13 +222,11 @@ var editHook = {
                     }
                 }
                 (_a = editStore.insertList).unshift.apply(_a, newRecords);
-                reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
                 $xetable.cacheRowMap();
-                $xetable.handleTableData(transform);
-                $xetable.updateAfterDataIndex();
+                $xetable.handleTableData(treeConfig && treeOpts.transform);
                 $xetable.checkSelectionStatus();
-                if (scrollYLoad) {
+                if (reactData.scrollYLoad) {
                     $xetable.updateScrollYSpace();
                 }
                 return nextTick().then(function () {
@@ -252,10 +247,9 @@ var editHook = {
              */
             remove: function (rows) {
                 var treeConfig = props.treeConfig;
-                var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection, scrollYLoad = reactData.scrollYLoad;
-                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection;
+                var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
                 var checkboxOpts = computeCheckboxOpts.value;
-                var sYOpts = computeSYOpts.value;
                 var treeOpts = computeTreeOpts.value;
                 var transform = treeOpts.transform;
                 var actived = editStore.actived, removeList = editStore.removeList, insertList = editStore.insertList;
@@ -294,7 +288,7 @@ var editHook = {
                     if (treeConfig && transform) {
                         rows.forEach(function (row) {
                             var rowid = getRowid($xetable, row);
-                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            var matchObj = XEUtils.findTree(tableFullTreeData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
                             if (matchObj) {
                                 var rItems = matchObj.items.splice(matchObj.index, 1);
                                 rest.push(rItems[0]);
@@ -303,7 +297,6 @@ var editHook = {
                             if (afIndex > -1) {
                                 afterFullData.splice(afIndex, 1);
                             }
-                            $xetable.updateVirtualTreeData();
                         });
                     }
                     else {
@@ -341,13 +334,11 @@ var editHook = {
                         insertList.splice(iIndex, 1);
                     }
                 });
-                reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
                 $xetable.cacheRowMap();
-                $xetable.handleTableData(transform);
-                $xetable.updateAfterDataIndex();
+                $xetable.handleTableData(treeConfig && treeOpts.transform);
                 $xetable.checkSelectionStatus();
-                if (scrollYLoad) {
+                if (reactData.scrollYLoad) {
                     $xetable.updateScrollYSpace();
                 }
                 return nextTick().then(function () {
@@ -402,7 +393,7 @@ var editHook = {
             getInsertRecords: function () {
                 var treeConfig = props.treeConfig;
                 var editStore = reactData.editStore;
-                var treeFullData = internalData.treeFullData, tableFullData = internalData.tableFullData;
+                var tableFullTreeData = internalData.tableFullTreeData, tableFullData = internalData.tableFullData;
                 var treeOpts = computeTreeOpts.value;
                 var insertList = editStore.insertList;
                 var insertRecords = [];
@@ -411,7 +402,7 @@ var editHook = {
                     if (treeConfig && treeOpts.transform) {
                         insertList.forEach(function (row) {
                             var rowid = getRowid($xetable, row);
-                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            var matchObj = XEUtils.findTree(tableFullTreeData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
                             if (matchObj) {
                                 insertRecords.push(row);
                             }

package/es/filter/src/hook.js

@@ -91,7 +91,7 @@ var tableFilterHook = {
                         // 判断面板不能大于表格高度
                         var maxHeight = null;
                         if (filterHeight >= bodyElem.clientHeight) {
-                            maxHeight = Math.max(40, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
+                            maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
                         }
                         if (column.fixed === 'left') {
                             left = targetElem_1.offsetLeft + targetElem_1.offsetParent.offsetLeft - centerWidth;

package/es/select/src/select.js

@@ -151,7 +151,7 @@ export default defineComponent({
             return getSelectLabel(modelValue);
         });
         var getOptkey = function () {
-            return props.optionId || '_XID';
+            return props.optionId || '_X_ID';
         };
         var getOptid = function (option) {
             var optid = option[getOptkey()];

package/es/table/src/body.js

@@ -291,6 +291,7 @@ export default defineComponent({
             var treeOpts = computeTreeOpts.value;
             var editOpts = computeEditOpts.value;
             var rowOpts = computeRowOpts.value;
+            var transform = treeOpts.transform;
             var rows = [];
             tableData.forEach(function (row, $rowIndex) {
                 var trOn = {};
@@ -315,9 +316,14 @@ export default defineComponent({
                 }
                 var rowid = getRowid($xetable, row);
                 var rest = fullDataRowIdData[rowid];
-                var rowLevel = rest ? rest.level : 0;
-                var seq = rest ? rest.seq : -1;
+                var rowLevel = 0;
+                var seq = -1;
+                if (rest) {
+                    rowLevel = rest.level;
+                    seq = rest.seq;
+                }
                 var params = { $table: $xetable, seq: seq, rowid: rowid, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
+                // 处理新增状态
                 var isNewRow = false;
                 if (editConfig) {
                     isNewRow = $xetable.findRowIndexOf(editStore.insertList, row) > -1;
@@ -360,7 +366,7 @@ export default defineComponent({
                     ]));
                 }
                 // 如果是树形表格
-                if (treeConfig && !scrollYLoad && treeExpandeds.length) {
+                if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
                     var rowChildren = row[treeOpts.children];
                     if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
                         rows.push.apply(rows, renderRows(fixedType, rowChildren, tableColumn));

package/es/table/src/table.js

@@ -264,10 +264,12 @@ export default defineComponent({
             rowExpandedReserveRowMap: {},
             // 树结构数据，已展开保留的行
             treeExpandedReserveRowMap: {},
-            // 完整数据、条件处理后
+            // 列表完整数据、条件处理后
             tableFullData: [],
-            treeFullData: [],
             afterFullData: [],
+            // 树结构完整数据、条件处理后
+            tableFullTreeData: [],
+            afterTreeFullData: [],
             tableSynchData: [],
             tableSourceData: [],
             // 收集的列配置（带分组）
@@ -1089,25 +1091,27 @@ export default defineComponent({
         var updateAfterDataIndex = function () {
             var treeConfig = props.treeConfig;
             var afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-            var treeFullData = internalData.treeFullData;
+            var afterTreeFullData = internalData.afterTreeFullData;
             var treeOpts = computeTreeOpts.value;
             if (treeConfig) {
-                XEUtils.eachTree(treeFullData, function (row, index, items, path) {
+                XEUtils.eachTree(afterTreeFullData, function (row, index, items, path) {
                     var rowid = getRowid($xetable, row);
                     var allrest = fullAllDataRowIdData[rowid];
                     var fullrest = fullDataRowIdData[rowid];
                     var seq = path.map(function (num, i) { return i % 2 === 0 ? (Number(num) + 1) : '.'; }).join('');
                     if (allrest) {
                         allrest.seq = seq;
+                        allrest._index = index;
                     }
                     if (fullrest) {
                         fullrest.seq = seq;
+                        fullrest._index = index;
                     }
                     else {
                         fullAllDataRowIdData[rowid] = { row: row, rowid: rowid, seq: seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 };
                         fullDataRowIdData[rowid] = { row: row, rowid: rowid, seq: seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 };
                     }
-                }, treeOpts);
+                }, { children: treeOpts.mapChildren });
             }
             else {
                 afterFullData.forEach(function (row, index) {
@@ -1117,6 +1121,7 @@ export default defineComponent({
                     var seq = index + 1;
                     if (allrest) {
                         allrest.seq = seq;
+                        allrest._index = index;
                     }
                     if (fullrest) {
                         fullrest.seq = seq;
@@ -1134,12 +1139,17 @@ export default defineComponent({
          * 如果存在筛选条件，继续处理
          */
         var updateAfterFullData = function () {
-            var tableFullColumn = internalData.tableFullColumn, tableFullData = internalData.tableFullData;
+            var treeConfig = props.treeConfig;
+            var tableFullColumn = internalData.tableFullColumn, tableFullData = internalData.tableFullData, tableFullTreeData = internalData.tableFullTreeData;
             var filterOpts = computeFilterOpts.value;
             var sortOpts = computeSortOpts.value;
+            var treeOpts = computeTreeOpts.value;
+            var transform = treeOpts.transform;
             var allRemoteFilter = filterOpts.remote, allFilterMethod = filterOpts.filterMethod;
             var allRemoteSort = sortOpts.remote, allSortMethod = sortOpts.sortMethod;
-            var tableData = tableFullData.slice(0);
+            var tableData = [];
+            var tableTree = [];
+            // 处理列
             if (!allRemoteFilter || !allRemoteSort) {
                 var filterColumns_1 = [];
                 var orderColumns_1 = [];
@@ -1165,7 +1175,7 @@ export default defineComponent({
                 // 处理筛选
                 // 支持单列、多列、组合筛选
                 if (!allRemoteFilter && filterColumns_1.length) {
-                    tableData = tableData.filter(function (row) {
+                    var handleFilter = function (row) {
                         return filterColumns_1.every(function (_a) {
                             var column = _a.column, valueList = _a.valueList, itemList = _a.itemList;
                             var filterMethod = column.filterMethod, filterRender = column.filterRender;
@@ -1187,26 +1197,63 @@ export default defineComponent({
                             }
                             return valueList.indexOf(XEUtils.get(row, column.property)) > -1;
                         });
-                    });
+                    };
+                    if (treeConfig && transform) {
+                        // 筛选虚拟树
+                        tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, __assign(__assign({}, treeOpts), { original: true }));
+                        tableData = tableTree;
+                    }
+                    else {
+                        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+                        tableTree = tableData;
+                    }
                 }
-                // 处理排序
+                else {
+                    if (treeConfig && transform) {
+                        // 还原虚拟树
+                        tableTree = XEUtils.searchTree(tableFullTreeData, function () { return true; }, __assign(__assign({}, treeOpts), { original: true }));
+                        tableData = tableTree;
+                    }
+                    else {
+                        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+                        tableTree = tableData;
+                    }
+                }
+                // 处理排序（不能用于树形结构）
                 // 支持单列、多列、组合排序
                 if (!allRemoteSort && orderColumns_1.length) {
-                    if (allSortMethod) {
-                        var sortRests = allSortMethod({ data: tableData, sortList: orderColumns_1, $table: $xetable });
-                        tableData = XEUtils.isArray(sortRests) ? sortRests : tableData;
+                    if (treeConfig && transform) {
+                        // 虚拟树和列表一样，只能排序根级节点
+                        if (allSortMethod) {
+                            var sortRests = allSortMethod({ data: tableTree, sortList: orderColumns_1, $table: $xetable });
+                            tableTree = XEUtils.isArray(sortRests) ? sortRests : tableTree;
+                        }
+                        else {
+                            tableTree = XEUtils.orderBy(tableTree, orderColumns_1.map(function (_a) {
+                                var column = _a.column, order = _a.order;
+                                return [getOrderField(column), order];
+                            }));
+                        }
+                        tableData = tableTree;
                     }
                     else {
-                        tableData = XEUtils.orderBy(tableData, orderColumns_1.map(function (_a) {
-                            var column = _a.column, order = _a.order;
-                            return [getOrderField(column), order];
-                        }));
+                        if (allSortMethod) {
+                            var sortRests = allSortMethod({ data: tableData, sortList: orderColumns_1, $table: $xetable });
+                            tableData = XEUtils.isArray(sortRests) ? sortRests : tableData;
+                        }
+                        else {
+                            tableData = XEUtils.orderBy(tableData, orderColumns_1.map(function (_a) {
+                                var column = _a.column, order = _a.order;
+                                return [getOrderField(column), order];
+                            }));
+                        }
+                        tableTree = tableData;
                     }
                 }
             }
             internalData.afterFullData = tableData;
+            internalData.afterTreeFullData = tableTree;
             updateAfterDataIndex();
-            return tableData;
         };
         var updateStyle = function () {
             var border = props.border, showFooter = props.showFooter, allColumnOverflow = props.showOverflow, allColumnHeaderOverflow = props.showHeaderOverflow, allColumnFooterOverflow = props.showFooterOverflow, mouseConfig = props.mouseConfig, spanMethod = props.spanMethod, footerSpanMethod = props.footerSpanMethod, keyboardConfig = props.keyboardConfig;
@@ -1292,7 +1339,7 @@ export default defineComponent({
                                                 countChild_1++;
                                             }
                                             childWidth_1 += item.renderWidth;
-                                        });
+                                        }, { children: 'children' });
                                     }
                                     thElem.style.width = hasEllipsis ? childWidth_1 - countChild_1 - (border ? 2 : 0) + "px" : '';
                                 }
@@ -1655,7 +1702,7 @@ export default defineComponent({
             var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
             var treeOpts = computeTreeOpts.value;
             var checkboxOpts = computeCheckboxOpts.value;
-            var loadMethod = treeOpts.loadMethod;
+            var transform = treeOpts.transform, loadMethod = treeOpts.loadMethod;
             var checkStrictly = checkboxOpts.checkStrictly;
             var rest = fullAllDataRowIdData[getRowid($xetable, row)];
             return new Promise(function (resolve) {
@@ -1676,9 +1723,18 @@ export default defineComponent({
                                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
                                     tableMethods.setCheckboxRow(childRows, true);
                                 }
+                                nextTick().then(function () {
+                                    if (transform) {
+                                        return tablePrivateMethods.handleTableData();
+                                    }
+                                }).then(function () {
+                                    return tableMethods.recalculate();
+                                }).then(function () { return resolve(); });
                             });
                         }
-                        resolve(nextTick().then(function () { return tableMethods.recalculate(); }));
+                        else {
+                            nextTick().then(function () { return tableMethods.recalculate(); }).then(function () { return resolve(); });
+                        }
                     });
                 }
                 else {
@@ -1806,13 +1862,24 @@ export default defineComponent({
                         if (!treeOpts.children) {
                             errLog('vxe.error.reqProp', ['tree-config.children']);
                         }
+                        if (!treeOpts.mapChildren) {
+                            errLog('vxe.error.reqProp', ['tree-config.mapChildren']);
+                        }
+                        if (treeOpts.children === treeOpts.mapChildren) {
+                            errLog('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+                        }
                         fullData.forEach(function (row) {
                             if (row[treeOpts.children] && row[treeOpts.children].length) {
                                 warnLog('vxe.error.errConflicts', ['tree-config.transform', "row." + treeOpts.children]);
                             }
                         });
                     }
-                    treeData = XEUtils.toArrayTree(fullData, { key: treeOpts.rowField, parentKey: treeOpts.parentField, children: treeOpts.children });
+                    treeData = XEUtils.toArrayTree(fullData, {
+                        key: treeOpts.rowField,
+                        parentKey: treeOpts.parentField,
+                        children: treeOpts.children,
+                        mapChildren: treeOpts.mapChildren
+                    });
                     fullData = treeData.slice(0);
                 }
                 else {
@@ -1829,7 +1896,7 @@ export default defineComponent({
             reactData.scrollYLoad = sYLoad;
             // 全量数据
             internalData.tableFullData = fullData;
-            internalData.treeFullData = treeData;
+            internalData.tableFullTreeData = treeData;
             // 缓存数据
             tablePrivateMethods.cacheRowMap(true);
             // 原始数据
@@ -2102,25 +2169,6 @@ export default defineComponent({
             reactData.scrollYLoad = scrollYLoad;
             return scrollYLoad;
         };
-        var updateVirtualTreeData = function () {
-            var oldScrollYLoad = reactData.scrollYLoad, treeExpandeds = reactData.treeExpandeds;
-            var treeFullData = internalData.treeFullData;
-            var treeOpts = computeTreeOpts.value;
-            var fullData = [];
-            var expandMaps = new Map();
-            XEUtils.eachTree(treeFullData, function (row, index, items, path, parent) {
-                if (!parent || (expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1)) {
-                    expandMaps.set(row, 1);
-                    fullData.push(row);
-                }
-            }, treeOpts);
-            var scrollYLoad = updateScrollYStatus(fullData);
-            internalData.tableFullData = scrollYLoad ? fullData : treeFullData;
-            if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
-                return tablePrivateMethods.handleTableData(true).then(function () { return tableMethods.recalculate(); });
-            }
-            return nextTick();
-        };
         /**
          * 展开与收起树节点
          * @param rows
@@ -2179,7 +2227,7 @@ export default defineComponent({
          */
         var handleVirtualTreeExpand = function (rows, expanded) {
             return handleBaseTreeExpand(rows, expanded).then(function () {
-                return updateVirtualTreeData();
+                return tablePrivateMethods.handleTableData();
             }).then(function () {
                 return tableMethods.recalculate();
             });
@@ -2248,7 +2296,7 @@ export default defineComponent({
                 return clearTableAllStatus($xetable);
             },
             /**
-             * 同步 data 数据
+             * 同步 data 数据（即将废弃）
              * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
              * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
              */
@@ -2345,7 +2393,7 @@ export default defineComponent({
                 var keepSource = props.keepSource;
                 var tableSourceData = internalData.tableSourceData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var treeOpts = computeTreeOpts.value;
-                var children = treeOpts.children;
+                var transform = treeOpts.transform, children = treeOpts.children, mapChildren = treeOpts.mapChildren;
                 var parentRest = fullAllDataRowIdData[getRowid($xetable, row)];
                 var parentLevel = parentRest ? parentRest.level : 0;
                 return tableMethods.createData(childRecords).then(function (rows) {
@@ -2363,6 +2411,9 @@ export default defineComponent({
                         fullAllDataRowIdData[rowid] = rest;
                     }, treeOpts);
                     row[children] = rows;
+                    if (transform) {
+                        row[mapChildren] = rows;
+                    }
                     return rows;
                 });
             },
@@ -3527,7 +3578,7 @@ export default defineComponent({
                         return handleAsyncTreeExpandChilds(row);
                     }).then(function () {
                         if (transform) {
-                            return updateVirtualTreeData();
+                            return tablePrivateMethods.handleTableData();
                         }
                     }).then(function () {
                         return tableMethods.recalculate();
@@ -3604,15 +3655,15 @@ export default defineComponent({
              */
             clearTreeExpand: function () {
                 var treeExpandeds = reactData.treeExpandeds;
-                var treeFullData = internalData.treeFullData;
+                var tableFullTreeData = internalData.tableFullTreeData;
                 var treeOpts = computeTreeOpts.value;
                 var reserve = treeOpts.reserve;
                 var isExists = treeExpandeds.length;
                 reactData.treeExpandeds = [];
                 if (reserve) {
-                    XEUtils.eachTree(treeFullData, function (row) { return handleTreeExpandReserve(row, false); }, treeOpts);
+                    XEUtils.eachTree(tableFullTreeData, function (row) { return handleTreeExpandReserve(row, false); }, treeOpts);
                 }
-                return updateVirtualTreeData().then(function () {
+                return tablePrivateMethods.handleTableData().then(function () {
                     if (isExists) {
                         tableMethods.recalculate();
                     }
@@ -4445,10 +4496,30 @@ export default defineComponent({
                 return record;
             },
             handleTableData: function (force) {
+                var treeConfig = props.treeConfig;
                 var scrollYLoad = reactData.scrollYLoad;
                 var scrollYStore = internalData.scrollYStore, fullDataRowIdData = internalData.fullDataRowIdData;
-                var fullData = force ? updateAfterFullData() : internalData.afterFullData;
-                var tableData = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+                var treeExpandeds = reactData.treeExpandeds;
+                var treeOpts = computeTreeOpts.value;
+                var fullList = [];
+                // 是否进行数据处理
+                if (force) {
+                    updateAfterFullData();
+                }
+                // 如果为虚拟树，将树结构拍平
+                if (treeConfig && treeOpts.transform) {
+                    var expandMaps_1 = new Map();
+                    XEUtils.eachTree(internalData.afterTreeFullData, function (row, index, items, path, parent) {
+                        if (!parent || (expandMaps_1.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1)) {
+                            expandMaps_1.set(row, 1);
+                            fullList.push(row);
+                        }
+                    }, { children: treeOpts.mapChildren });
+                }
+                else {
+                    fullList = internalData.afterFullData;
+                }
+                var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
                 tableData.forEach(function (row, $index) {
                     var rowid = getRowid($xetable, row);
                     var rest = fullDataRowIdData[rowid];
@@ -4466,7 +4537,7 @@ export default defineComponent({
             cacheRowMap: function (isSource) {
                 var treeConfig = props.treeConfig;
                 var treeOpts = computeTreeOpts.value;
-                var fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData, tableFullData = internalData.tableFullData, treeFullData = internalData.treeFullData;
+                var fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData, tableFullData = internalData.tableFullData, tableFullTreeData = internalData.tableFullTreeData;
                 var rowkey = getRowkey($xetable);
                 var isLazy = treeConfig && treeOpts.lazy;
                 var handleCache = function (row, index, items, path, parent, nodes) {
@@ -4491,7 +4562,7 @@ export default defineComponent({
                 }
                 fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
                 if (treeConfig) {
-                    XEUtils.eachTree(treeFullData, handleCache, treeOpts);
+                    XEUtils.eachTree(tableFullTreeData, handleCache, treeOpts);
                 }
                 else {
                     tableFullData.forEach(handleCache);
@@ -5232,7 +5303,6 @@ export default defineComponent({
                 tablePrivateMethods.handleTableData();
                 tablePrivateMethods.updateScrollYSpace();
             },
-            updateVirtualTreeData: updateVirtualTreeData,
             /**
              * 处理固定列的显示状态
              */
@@ -5376,6 +5446,7 @@ export default defineComponent({
                 return false;
             }
         };
+        // 检测对应模块是否安装
         if (process.env.NODE_ENV === 'development') {
             'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(function (name) {
                 $xetable[name] = function () {

package/es/table/src/util.js

@@ -34,7 +34,7 @@ export function getRowUniqueId() {
 export function getRowkey($xetable) {
     var props = $xetable.props;
     var rowId = props.rowId;
-    return rowId || '_XID';
+    return rowId || '_X_ID';
 }
 // 行主键 value
 export function getRowid($xetable, row) {

package/es/v-x-e-table/src/conf.js

@@ -48,7 +48,7 @@ var GlobalConfig = {
         //  storage: false,
         //  checkMethod () {}
         // },
-        // rowId: '_XID', // 行数据的唯一主键字段名
+        // rowId: '_X_ID', // 行数据的唯一主键字段名
         sortConfig: {
             // remote: false,
             // trigger: 'default',
@@ -66,6 +66,7 @@ var GlobalConfig = {
             parentField: 'parentId',
             children: 'children',
             hasChild: 'hasChild',
+            mapChildren: '_X_CHILD',
             indent: 20,
             showIcon: true
         },