vxe-table 4.1.4 → 4.1.5-beta.0

package/es/edit/src/hook.js

@@ -18,7 +18,7 @@ import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { renderer } from '../../v-x-e-table';
 import { errLog, getLog, isEnableConf } from '../../tools/utils';
-import { getCellValue, setCellValue } from '../../table/src/util';
+import { getCellValue, setCellValue, getRowid } from '../../table/src/util';
 import { browse, removeClass, addClass } from '../../tools/dom';
 var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
 var editHook = {
@@ -87,22 +87,56 @@ var editHook = {
                 var _a;
                 var treeConfig = props.treeConfig;
                 var mergeList = reactData.mergeList, editStore = reactData.editStore, scrollYLoad = reactData.scrollYLoad;
-                var afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var sYOpts = computeSYOpts.value;
+                var treeOpts = computeTreeOpts.value;
                 if (!XEUtils.isArray(records)) {
                     records = [records];
                 }
                 var newRecords = records.map(function (record) { return $xetable.defineField(Object.assign({}, record)); });
                 if (!row) {
-                    afterFullData.unshift.apply(afterFullData, newRecords);
-                    tableFullData.unshift.apply(tableFullData, newRecords);
-                    // 刷新单元格合并
-                    mergeList.forEach(function (mergeItem) {
-                        var mergeRowIndex = mergeItem.row;
-                        if (mergeRowIndex > 0) {
-                            mergeItem.row = mergeRowIndex + newRecords.length;
-                        }
-                    });
+                    // 如果为虚拟树
+                    if (treeConfig && treeOpts.transform) {
+                        newRecords.forEach(function (item) {
+                            var parentRowId = item[treeOpts.parentField];
+                            var rowid = getRowid($xetable, item);
+                            if (parentRowId) {
+                                var matchObj = XEUtils.findTree(treeFullData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts);
+                                if (matchObj) {
+                                    var parentRow = matchObj.item;
+                                    var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
+                                    var parentLevel = parentRest ? parentRest.level : 0;
+                                    var parentChilds = parentRow[treeOpts.children];
+                                    if (!XEUtils.isArray(parentChilds)) {
+                                        parentChilds = parentRow[treeOpts.children] = [];
+                                    }
+                                    parentChilds.push(item);
+                                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parent, level: parentLevel + 1 };
+                                    fullDataRowIdData[rowid] = rest;
+                                    fullAllDataRowIdData[rowid] = rest;
+                                }
+                                else {
+                                    // 父节点不存在
+                                }
+                            }
+                            else {
+                                afterFullData.unshift(item);
+                                treeFullData.unshift(item);
+                            }
+                        });
+                        $xetable.updateVirtualTreeData();
+                    }
+                    else {
+                        afterFullData.unshift.apply(afterFullData, newRecords);
+                        tableFullData.unshift.apply(tableFullData, newRecords);
+                        // 刷新单元格合并
+                        mergeList.forEach(function (mergeItem) {
+                            var mergeRowIndex = mergeItem.row;
+                            if (mergeRowIndex > 0) {
+                                mergeItem.row = mergeRowIndex + newRecords.length;
+                            }
+                        });
+                    }
                 }
                 else {
                     if (row === -1) {
@@ -167,9 +201,10 @@ var editHook = {
             remove: function (rows) {
                 var treeConfig = props.treeConfig;
                 var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection, scrollYLoad = reactData.scrollYLoad;
-                var afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
                 var checkboxOpts = computeCheckboxOpts.value;
                 var sYOpts = computeSYOpts.value;
+                var treeOpts = computeTreeOpts.value;
                 var actived = editStore.actived, removeList = editStore.removeList, insertList = editStore.insertList;
                 var property = checkboxOpts.checkField;
                 var rest = [];
@@ -202,27 +237,45 @@ var editHook = {
                     $xetable.clearMergeCells();
                 }
                 else {
-                    rows.forEach(function (row) {
-                        var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
-                        if (tfIndex > -1) {
-                            var rItems = tableFullData.splice(tfIndex, 1);
-                            rest.push(rItems[0]);
-                        }
-                        var afIndex = $xetable.findRowIndexOf(afterFullData, row);
-                        if (afIndex > -1) {
-                            // 刷新单元格合并
-                            mergeList.forEach(function (mergeItem) {
-                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                                if (mergeRowIndex > afIndex) {
-                                    mergeItem.row = mergeRowIndex - 1;
-                                }
-                                else if (mergeRowIndex + mergeRowspan > afIndex) {
-                                    mergeItem.rowspan = mergeRowspan - 1;
-                                }
-                            });
-                            afterFullData.splice(afIndex, 1);
-                        }
-                    });
+                    // 如果为虚拟树
+                    if (treeConfig && treeOpts.transform) {
+                        rows.forEach(function (row) {
+                            var rowid = getRowid($xetable, row);
+                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            if (matchObj) {
+                                var rItems = matchObj.items.splice(matchObj.index, 1);
+                                rest.push(rItems[0]);
+                            }
+                            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex > -1) {
+                                afterFullData.splice(afIndex, 1);
+                            }
+                            $xetable.updateVirtualTreeData();
+                        });
+                    }
+                    else {
+                        rows.forEach(function (row) {
+                            var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+                            if (tfIndex > -1) {
+                                var rItems = tableFullData.splice(tfIndex, 1);
+                                rest.push(rItems[0]);
+                            }
+                            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex > -1) {
+                                // 刷新单元格合并
+                                mergeList.forEach(function (mergeItem) {
+                                    var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                    if (mergeRowIndex > afIndex) {
+                                        mergeItem.row = mergeRowIndex - 1;
+                                    }
+                                    else if (mergeRowIndex + mergeRowspan > afIndex) {
+                                        mergeItem.rowspan = mergeRowspan - 1;
+                                    }
+                                });
+                                afterFullData.splice(afIndex, 1);
+                            }
+                        });
+                    }
                 }
                 // 如果当前行被激活编辑，则清除激活状态
                 if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
@@ -294,16 +347,30 @@ var editHook = {
              * 获取新增的临时数据
              */
             getInsertRecords: function () {
+                var treeConfig = props.treeConfig;
                 var editStore = reactData.editStore;
-                var tableFullData = internalData.tableFullData;
+                var treeFullData = internalData.treeFullData, tableFullData = internalData.tableFullData;
+                var treeOpts = computeTreeOpts.value;
                 var insertList = editStore.insertList;
                 var insertRecords = [];
                 if (insertList.length) {
-                    tableFullData.forEach(function (row) {
-                        if ($xetable.findRowIndexOf(insertList, row) > -1) {
-                            insertRecords.push(row);
-                        }
-                    });
+                    // 如果为虚拟树
+                    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);
+                            if (matchObj) {
+                                insertRecords.push(row);
+                            }
+                        });
+                    }
+                    else {
+                        insertList.forEach(function (row) {
+                            if ($xetable.findRowIndexOf(tableFullData, row) > -1) {
+                                insertRecords.push(row);
+                            }
+                        });
+                    }
                 }
                 return insertRecords;
             },

package/es/table/src/body.js

@@ -290,6 +290,7 @@ export default defineComponent({
             var radioOpts = computeRadioOpts.value;
             var treeOpts = computeTreeOpts.value;
             var editOpts = computeEditOpts.value;
+            var rowOpts = computeRowOpts.value;
             var rows = [];
             tableData.forEach(function (row, $rowIndex) {
                 var trOn = {};
@@ -302,7 +303,7 @@ export default defineComponent({
                 // 确保任何情况下 rowIndex 都精准指向真实 data 索引
                 rowIndex = $xetable.getRowIndex(row);
                 // 事件绑定
-                if (highlightHoverRow) {
+                if (rowOpts.isHover || highlightHoverRow) {
                     trOn.onMouseenter = function (evnt) {
                         if (isOperateMouse()) {
                             return;
@@ -402,6 +403,7 @@ export default defineComponent({
             var highlightHoverRow = tableProps.highlightHoverRow;
             var scrollXLoad = tableReactData.scrollXLoad, scrollYLoad = tableReactData.scrollYLoad;
             var elemStore = tableInternalData.elemStore, lastScrollTop = tableInternalData.lastScrollTop, lastScrollLeft = tableInternalData.lastScrollLeft;
+            var rowOpts = computeRowOpts.value;
             var tableHeader = refTableHeader.value;
             var tableBody = refTableBody.value;
             var tableFooter = refTableFooter.value;
@@ -425,7 +427,7 @@ export default defineComponent({
             tableInternalData.lastScrollTop = scrollTop;
             tableInternalData.lastScrollLeft = scrollLeft;
             tableInternalData.lastScrollTime = Date.now();
-            if (highlightHoverRow) {
+            if (rowOpts.isHover || highlightHoverRow) {
                 $xetable.clearHoverRow();
             }
             if (leftElem && fixedType === 'left') {
@@ -519,6 +521,7 @@ export default defineComponent({
             var highlightHoverRow = tableProps.highlightHoverRow;
             var scrollYLoad = tableReactData.scrollYLoad;
             var lastScrollTop = tableInternalData.lastScrollTop, lastScrollLeft = tableInternalData.lastScrollLeft;
+            var rowOpts = computeRowOpts.value;
             var tableBody = refTableBody.value;
             var scrollBodyElem = refElem.value;
             var bodyElem = tableBody.$el;
@@ -539,7 +542,7 @@ export default defineComponent({
                 tableInternalData.lastScrollTop = scrollTop;
                 tableInternalData.lastScrollLeft = scrollLeft;
                 tableInternalData.lastScrollTime = Date.now();
-                if (highlightHoverRow) {
+                if (rowOpts.isHover || highlightHoverRow) {
                     $xetable.clearHoverRow();
                 }
                 handleWheel(evnt, isTopWheel, deltaTop, isRollX, isRollY);

package/es/table/src/table.js

@@ -2291,8 +2291,8 @@ export default defineComponent({
                 var tableSourceData = internalData.tableSourceData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var treeOpts = computeTreeOpts.value;
                 var children = treeOpts.children;
-                var rest = fullAllDataRowIdData[getRowid($xetable, row)];
-                var parentLevel = rest ? rest.level : 0;
+                var parentRest = fullAllDataRowIdData[getRowid($xetable, row)];
+                var parentLevel = parentRest ? parentRest.level : 0;
                 return tableMethods.createData(childRecords).then(function (rows) {
                     if (keepSource) {
                         var rowid_1 = getRowid($xetable, row);
@@ -3126,11 +3126,12 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             setCurrentRow: function (row) {
+                var rowOpts = computeRowOpts.value;
                 var el = refElem.value;
                 tableMethods.clearCurrentRow();
                 tableMethods.clearCurrentColumn();
                 reactData.currentRow = row;
-                if (props.highlightCurrentRow) {
+                if (rowOpts.isCurrent || props.highlightCurrentRow) {
                     if (el) {
                         XEUtils.arrayEach(el.querySelectorAll("[rowid=\"" + getRowid($xetable, row) + "\"]"), function (elem) { return addClass(elem, 'row--current'); });
                     }
@@ -3176,7 +3177,8 @@ export default defineComponent({
              * 用于当前行，获取当前行的数据
              */
             getCurrentRecord: function () {
-                return props.highlightCurrentRow ? reactData.currentRow : null;
+                var rowOpts = computeRowOpts.value;
+                return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null;
             },
             /**
              * 用于单选行，获取当已选中的数据
@@ -3211,7 +3213,8 @@ export default defineComponent({
                 return null;
             },
             getCurrentColumn: function () {
-                return props.highlightCurrentColumn ? reactData.currentColumn : null;
+                var columnOpts = computeColumnOpts.value;
+                return columnOpts.isCurrent || props.highlightCurrentColumn ? reactData.currentColumn : null;
             },
             /**
              * 用于当前列，设置某列行为高亮状态
@@ -4014,6 +4017,7 @@ export default defineComponent({
                     var editOpts = computeEditOpts.value;
                     var treeOpts = computeTreeOpts.value;
                     var menuList = computeMenuList.value;
+                    var rowOpts = computeRowOpts.value;
                     var selected = editStore.selected, actived = editStore.actived;
                     var keyCode = evnt.keyCode;
                     var isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE);
@@ -4094,7 +4098,7 @@ export default defineComponent({
                             internalData._keyCtx = false;
                         }, 1000);
                     }
-                    else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && highlightCurrentRow && currentRow))) {
+                    else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
                         // 退出选中
                         if (hasCtrlKey) {
                             // 如果是激活编辑状态，则取消编辑
@@ -4128,7 +4132,7 @@ export default defineComponent({
                                     }
                                 }
                             }
-                            else if (treeConfig && highlightCurrentRow && currentRow) {
+                            else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                                 // 如果是树形表格当前行回车移动到子节点
                                 var childrens = currentRow[treeOpts.children];
                                 if (childrens && childrens.length) {
@@ -4153,7 +4157,7 @@ export default defineComponent({
                             if (selected.row && selected.column) {
                                 $xetable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                             }
-                            else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+                            else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                                 // 当前行按键上下移动
                                 $xetable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
                             }
@@ -4168,7 +4172,7 @@ export default defineComponent({
                             $xetable.moveTabSelected(actived.args, hasShiftKey, evnt);
                         }
                     }
-                    else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+                    else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
                         if (!isEditStatus) {
                             var delMethod = keyboardOpts.delMethod, backMethod = keyboardOpts.backMethod;
                             // 如果是删除键
@@ -4204,7 +4208,7 @@ export default defineComponent({
                                     tableMethods.updateFooter();
                                 }
                             }
-                            else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+                            else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                                 // 如果树形表格回退键关闭当前行返回父节点
                                 var parentRow_1 = XEUtils.findTree(internalData.afterFullData, function (item) { return item === currentRow; }, treeOpts).parent;
                                 if (parentRow_1) {
@@ -4845,6 +4849,7 @@ export default defineComponent({
             triggerHeaderCellClickEvent: function (evnt, params) {
                 var _lastResizeTime = internalData._lastResizeTime;
                 var sortOpts = computeSortOpts.value;
+                var columnOpts = computeColumnOpts.value;
                 var column = params.column;
                 var cell = evnt.currentTarget;
                 var triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300;
@@ -4854,7 +4859,7 @@ export default defineComponent({
                     tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column));
                 }
                 tableMethods.dispatchEvent('header-cell-click', Object.assign({ triggerResizable: triggerResizable, triggerSort: triggerSort, triggerFilter: triggerFilter, cell: cell }, params), evnt);
-                if (props.highlightCurrentColumn) {
+                if (columnOpts.isCurrent || props.highlightCurrentColumn) {
                     tableMethods.setCurrentColumn(column);
                 }
             },
@@ -4874,6 +4879,7 @@ export default defineComponent({
                 var treeOpts = computeTreeOpts.value;
                 var radioOpts = computeRadioOpts.value;
                 var checkboxOpts = computeCheckboxOpts.value;
+                var rowOpts = computeRowOpts.value;
                 var actived = editStore.actived;
                 var row = params.row, column = params.column;
                 var type = column.type, treeNode = column.treeNode;
@@ -4900,7 +4906,7 @@ export default defineComponent({
                 if (!triggerTreeNode) {
                     if (!triggerExpandNode) {
                         // 如果是高亮行
-                        if (highlightCurrentRow) {
+                        if (rowOpts.isCurrent || highlightCurrentRow) {
                             if (!triggerCheckbox && !triggerRadio) {
                                 tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
                             }
@@ -5214,6 +5220,7 @@ export default defineComponent({
                 tablePrivateMethods.handleTableData();
                 tablePrivateMethods.updateScrollYSpace();
             },
+            updateVirtualTreeData: updateVirtualTreeData,
             /**
              * 处理固定列的显示状态
              */
@@ -5681,6 +5688,8 @@ export default defineComponent({
             var leftList = columnStore.leftList, rightList = columnStore.rightList;
             var tooltipOpts = computeTooltipOpts.value;
             var treeOpts = computeTreeOpts.value;
+            var rowOpts = computeRowOpts.value;
+            var columnOpts = computeColumnOpts.value;
             var vSize = computeSize.value;
             var tableBorder = computeTableBorder.value;
             var mouseOpts = computeMouseOpts.value;
@@ -5695,8 +5704,8 @@ export default defineComponent({
                         _a['cell--highlight'] = highlightCell,
                         _a['cell--selected'] = mouseConfig && mouseOpts.selected,
                         _a['cell--area'] = mouseConfig && mouseOpts.area,
-                        _a['row--highlight'] = highlightHoverRow,
-                        _a['column--highlight'] = highlightHoverColumn,
+                        _a['row--highlight'] = rowOpts.isHover || highlightHoverRow,
+                        _a['column--highlight'] = columnOpts.isHover || highlightHoverColumn,
                         _a['is--header'] = showHeader,
                         _a['is--footer'] = showFooter,
                         _a['is--group'] = isGroup,

package/lib/edit/src/hook.js

@@ -138,9 +138,13 @@ var editHook = {
         var mergeList = reactData.mergeList,
             editStore = reactData.editStore,
             scrollYLoad = reactData.scrollYLoad;
-        var afterFullData = internalData.afterFullData,
-            tableFullData = internalData.tableFullData;
+        var treeFullData = internalData.treeFullData,
+            afterFullData = internalData.afterFullData,
+            tableFullData = internalData.tableFullData,
+            fullDataRowIdData = internalData.fullDataRowIdData,
+            fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var sYOpts = computeSYOpts.value;
+        var treeOpts = computeTreeOpts.value;
 
         if (!_xeUtils.default.isArray(records)) {
           records = [records];
@@ -151,16 +155,60 @@ var editHook = {
         });
 
         if (!row) {
-          afterFullData.unshift.apply(afterFullData, newRecords);
-          tableFullData.unshift.apply(tableFullData, newRecords); // 刷新单元格合并
+          // 如果为虚拟树
+          if (treeConfig && treeOpts.transform) {
+            newRecords.forEach(function (item) {
+              var parentRowId = item[treeOpts.parentField];
+              var rowid = (0, _util.getRowid)($xetable, item);
+
+              if (parentRowId) {
+                var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+                  return parentRowId === item[treeOpts.rowField];
+                }, treeOpts);
+
+                if (matchObj) {
+                  var parentRow = matchObj.item;
+                  var parentRest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, parentRow)];
+                  var parentLevel = parentRest ? parentRest.level : 0;
+                  var parentChilds = parentRow[treeOpts.children];
+
+                  if (!_xeUtils.default.isArray(parentChilds)) {
+                    parentChilds = parentRow[treeOpts.children] = [];
+                  }
+
+                  parentChilds.push(item);
+                  var rest = {
+                    row: item,
+                    rowid: rowid,
+                    index: -1,
+                    _index: -1,
+                    $index: -1,
+                    items: parentChilds,
+                    parent: parent,
+                    level: parentLevel + 1
+                  };
+                  fullDataRowIdData[rowid] = rest;
+                  fullAllDataRowIdData[rowid] = rest;
+                } else {// 父节点不存在
+                }
+              } else {
+                afterFullData.unshift(item);
+                treeFullData.unshift(item);
+              }
+            });
+            $xetable.updateVirtualTreeData();
+          } else {
+            afterFullData.unshift.apply(afterFullData, newRecords);
+            tableFullData.unshift.apply(tableFullData, newRecords); // 刷新单元格合并
 
-          mergeList.forEach(function (mergeItem) {
-            var mergeRowIndex = mergeItem.row;
+            mergeList.forEach(function (mergeItem) {
+              var mergeRowIndex = mergeItem.row;
 
-            if (mergeRowIndex > 0) {
-              mergeItem.row = mergeRowIndex + newRecords.length;
-            }
-          });
+              if (mergeRowIndex > 0) {
+                mergeItem.row = mergeRowIndex + newRecords.length;
+              }
+            });
+          }
         } else {
           if (row === -1) {
             afterFullData.push.apply(afterFullData, newRecords);
@@ -237,10 +285,12 @@ var editHook = {
             editStore = reactData.editStore,
             selection = reactData.selection,
             scrollYLoad = reactData.scrollYLoad;
-        var afterFullData = internalData.afterFullData,
+        var treeFullData = internalData.treeFullData,
+            afterFullData = internalData.afterFullData,
             tableFullData = internalData.tableFullData;
         var checkboxOpts = computeCheckboxOpts.value;
         var sYOpts = computeSYOpts.value;
+        var treeOpts = computeTreeOpts.value;
         var actived = editStore.actived,
             removeList = editStore.removeList,
             insertList = editStore.insertList;
@@ -277,31 +327,55 @@ var editHook = {
           internalData.afterFullData = [];
           $xetable.clearMergeCells();
         } else {
-          rows.forEach(function (row) {
-            var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+          // 如果为虚拟树
+          if (treeConfig && treeOpts.transform) {
+            rows.forEach(function (row) {
+              var rowid = (0, _util.getRowid)($xetable, row);
+
+              var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+                return rowid === (0, _util.getRowid)($xetable, item);
+              }, treeOpts);
+
+              if (matchObj) {
+                var rItems = matchObj.items.splice(matchObj.index, 1);
+                rest.push(rItems[0]);
+              }
 
-            if (tfIndex > -1) {
-              var rItems = tableFullData.splice(tfIndex, 1);
-              rest.push(rItems[0]);
-            }
+              var afIndex = $xetable.findRowIndexOf(afterFullData, row);
 
-            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+              if (afIndex > -1) {
+                afterFullData.splice(afIndex, 1);
+              }
 
-            if (afIndex > -1) {
-              // 刷新单元格合并
-              mergeList.forEach(function (mergeItem) {
-                var mergeRowIndex = mergeItem.row,
-                    mergeRowspan = mergeItem.rowspan;
+              $xetable.updateVirtualTreeData();
+            });
+          } else {
+            rows.forEach(function (row) {
+              var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
 
-                if (mergeRowIndex > afIndex) {
-                  mergeItem.row = mergeRowIndex - 1;
-                } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                  mergeItem.rowspan = mergeRowspan - 1;
-                }
-              });
-              afterFullData.splice(afIndex, 1);
-            }
-          });
+              if (tfIndex > -1) {
+                var rItems = tableFullData.splice(tfIndex, 1);
+                rest.push(rItems[0]);
+              }
+
+              var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+
+              if (afIndex > -1) {
+                // 刷新单元格合并
+                mergeList.forEach(function (mergeItem) {
+                  var mergeRowIndex = mergeItem.row,
+                      mergeRowspan = mergeItem.rowspan;
+
+                  if (mergeRowIndex > afIndex) {
+                    mergeItem.row = mergeRowIndex - 1;
+                  } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                    mergeItem.rowspan = mergeRowspan - 1;
+                  }
+                });
+                afterFullData.splice(afIndex, 1);
+              }
+            });
+          }
         } // 如果当前行被激活编辑，则清除激活状态
 
 
@@ -386,17 +460,35 @@ var editHook = {
        * 获取新增的临时数据
        */
       getInsertRecords: function getInsertRecords() {
+        var treeConfig = props.treeConfig;
         var editStore = reactData.editStore;
-        var tableFullData = internalData.tableFullData;
+        var treeFullData = internalData.treeFullData,
+            tableFullData = internalData.tableFullData;
+        var treeOpts = computeTreeOpts.value;
         var insertList = editStore.insertList;
         var insertRecords = [];
 
         if (insertList.length) {
-          tableFullData.forEach(function (row) {
-            if ($xetable.findRowIndexOf(insertList, row) > -1) {
-              insertRecords.push(row);
-            }
-          });
+          // 如果为虚拟树
+          if (treeConfig && treeOpts.transform) {
+            insertList.forEach(function (row) {
+              var rowid = (0, _util.getRowid)($xetable, row);
+
+              var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+                return rowid === (0, _util.getRowid)($xetable, item);
+              }, treeOpts);
+
+              if (matchObj) {
+                insertRecords.push(row);
+              }
+            });
+          } else {
+            insertList.forEach(function (row) {
+              if ($xetable.findRowIndexOf(tableFullData, row) > -1) {
+                insertRecords.push(row);
+              }
+            });
+          }
         }
 
         return insertRecords;