vxe-table 4.1.3 → 4.1.6

package/es/table/src/table.js

@@ -2072,8 +2072,10 @@ export default defineComponent({
             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 || $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+                if (!parent || (expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1)) {
+                    expandMaps.set(row, 1);
                     fullData.push(row);
                 }
             }, treeOpts);
@@ -2258,18 +2260,13 @@ export default defineComponent({
                     var oRow = tableSourceData[rowIndex];
                     if (oRow && row) {
                         if (field) {
-                            XEUtils.set(oRow, field, XEUtils.get(record || row, field));
+                            var newValue = XEUtils.get(record || row, field);
+                            XEUtils.set(row, field, newValue);
+                            XEUtils.set(oRow, field, newValue);
                         }
                         else {
-                            if (record) {
-                                tableSourceData[rowIndex] = record;
-                                XEUtils.clear(row, undefined);
-                                Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                                tablePrivateMethods.cacheRowMap(true);
-                            }
-                            else {
-                                XEUtils.destructuring(oRow, XEUtils.clone(row, true));
-                            }
+                            var newRecord = XEUtils.clone(__assign({}, record), true);
+                            XEUtils.destructuring(oRow, Object.assign(row, newRecord));
                         }
                     }
                     reactData.tableData = tableData.slice(0);
@@ -2289,8 +2286,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);
@@ -3057,6 +3054,17 @@ export default defineComponent({
                 var treeOpts = computeTreeOpts.value;
                 var reserveSelection = [];
                 if (checkboxOpts.reserve) {
+                    var afterFullIdMaps_1 = {};
+                    if (treeConfig) {
+                        XEUtils.eachTree(afterFullData, function (row) {
+                            afterFullIdMaps_1[getRowid($xetable, row)] = 1;
+                        }, treeOpts);
+                    }
+                    else {
+                        afterFullData.forEach(function (row) {
+                            afterFullIdMaps_1[getRowid($xetable, row)] = 1;
+                        });
+                    }
                     XEUtils.each(checkboxReserveRowMap, function (oldRow, oldRowid) {
                         if (oldRow) {
                             if (isFull) {
@@ -3065,15 +3073,8 @@ export default defineComponent({
                                 }
                             }
                             else {
-                                if (treeConfig) {
-                                    if (!XEUtils.findTree(afterFullData, function (row) { return getRowid($xetable, row) === oldRowid; }, treeOpts)) {
-                                        reserveSelection.push(oldRow);
-                                    }
-                                }
-                                else {
-                                    if (!afterFullData.some(function (row) { return getRowid($xetable, row) === oldRowid; })) {
-                                        reserveSelection.push(oldRow);
-                                    }
+                                if (!afterFullIdMaps_1[oldRowid]) {
+                                    reserveSelection.push(oldRow);
                                 }
                             }
                         }
@@ -3124,11 +3125,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'); });
                     }
@@ -3174,7 +3176,8 @@ export default defineComponent({
              * 用于当前行，获取当前行的数据
              */
             getCurrentRecord: function () {
-                return props.highlightCurrentRow ? reactData.currentRow : null;
+                var rowOpts = computeRowOpts.value;
+                return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null;
             },
             /**
              * 用于单选行，获取当已选中的数据
@@ -3209,7 +3212,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;
             },
             /**
              * 用于当前列，设置某列行为高亮状态
@@ -4012,6 +4016,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);
@@ -4092,7 +4097,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) {
                             // 如果是激活编辑状态，则取消编辑
@@ -4126,7 +4131,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) {
@@ -4151,7 +4156,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);
                             }
@@ -4166,7 +4171,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;
                             // 如果是删除键
@@ -4202,7 +4207,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) {
@@ -4843,6 +4848,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;
@@ -4852,7 +4858,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);
                 }
             },
@@ -4872,6 +4878,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;
@@ -4898,7 +4905,7 @@ export default defineComponent({
                 if (!triggerTreeNode) {
                     if (!triggerExpandNode) {
                         // 如果是高亮行
-                        if (highlightCurrentRow) {
+                        if (rowOpts.isCurrent || highlightCurrentRow) {
                             if (!triggerCheckbox && !triggerRadio) {
                                 tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
                             }
@@ -5212,6 +5219,7 @@ export default defineComponent({
                 tablePrivateMethods.handleTableData();
                 tablePrivateMethods.updateScrollYSpace();
             },
+            updateVirtualTreeData: updateVirtualTreeData,
             /**
              * 处理固定列的显示状态
              */
@@ -5679,6 +5687,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;
@@ -5693,8 +5703,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/es/v-x-e-table/src/conf.js

@@ -10,6 +10,7 @@ var GlobalConfig = {
         showHeader: true,
         animat: true,
         delayHover: 250,
+        autoResize: true,
         // keepSource: false,
         // showOverflow: null,
         // showHeaderOverflow: null,
@@ -17,7 +18,6 @@ var GlobalConfig = {
         // resizeInterval: 500,
         // size: null,
         // zIndex: null,
-        // autoResize: false,
         // stripe: false,
         // border: false,
         // round: false,

package/es/validator/src/hook.js

@@ -160,14 +160,14 @@ var validatorHook = {
                     var ruleProps = Object.keys(validRest);
                     return nextTick().then(function () {
                         if (ruleProps.length) {
-                            return Promise.reject(validRest[ruleProps[0]][0]);
+                            return validRest[ruleProps[0]][0];
                         }
                         if (cb) {
                             cb();
                         }
                     });
                 }).catch(function (firstErrParams) {
-                    return new Promise(function (resolve, reject) {
+                    return new Promise(function (resolve) {
                         var finish = function () {
                             nextTick(function () {
                                 if (cb) {
@@ -175,7 +175,7 @@ var validatorHook = {
                                     resolve();
                                 }
                                 else {
-                                    reject(validRest);
+                                    resolve(validRest);
                                 }
                             });
                         };

package/lib/edit/src/hook.js

@@ -113,6 +113,69 @@ var editHook = {
       }
     }
 
+    function insertTreeRow(newRecords, isAppend) {
+      var treeFullData = internalData.treeFullData,
+          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 = (0, _util.getRowid)($xetable, item);
+        var matchObj = parentRowId ? _xeUtils.default.findTree(treeFullData, function (item) {
+          return parentRowId === item[treeOpts.rowField];
+        }, treeOpts) : null;
+
+        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[funcName](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 {
+          if (process.env.NODE_ENV === 'development') {
+            if (parentRowId) {
+              (0, _utils.warnLog)('vxe.error.unableInsert');
+            }
+          }
+
+          afterFullData[funcName](item);
+          treeFullData[funcName](item);
+          var rest = {
+            row: item,
+            rowid: rowid,
+            index: -1,
+            _index: -1,
+            $index: -1,
+            items: treeFullData,
+            parent: null,
+            level: 0
+          };
+          fullDataRowIdData[rowid] = rest;
+          fullAllDataRowIdData[rowid] = rest;
+        }
+      });
+      $xetable.updateVirtualTreeData();
+    }
+
     editMethods = {
       /**
        * 往表格中插入临时数据
@@ -125,9 +188,9 @@ var editHook = {
 
       /**
        * 往表格指定行中插入临时数据
-       * 如果 row 为空则从插入到顶部
-       * 如果 row 为 -1 则从插入到底部
-       * 如果 row 为有效行则插入到该行的位置
+       * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+       * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+       * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
        * @param {Object/Array} records 新的数据
        * @param {Row} row 指定行
        */
@@ -138,9 +201,14 @@ 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;
+        var transform = treeOpts.transform;
 
         if (!_xeUtils.default.isArray(records)) {
           records = [records];
@@ -151,53 +219,113 @@ var editHook = {
         });
 
         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;
-            }
-          });
-        } else {
-          if (row === -1) {
-            afterFullData.push.apply(afterFullData, newRecords);
-            tableFullData.push.apply(tableFullData, newRecords); // 刷新单元格合并
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            insertTreeRow(newRecords, false);
+          } else {
+            afterFullData.unshift.apply(afterFullData, newRecords);
+            tableFullData.unshift.apply(tableFullData, newRecords); // 刷新单元格合并
 
             mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                  mergeRowspan = mergeItem.rowspan;
+              var mergeRowIndex = mergeItem.row;
 
-              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
+              if (mergeRowIndex > 0) {
+                mergeItem.row = mergeRowIndex + newRecords.length;
               }
             });
-          } else {
-            if (treeConfig) {
-              throw new Error((0, _utils.getLog)('vxe.error.noTree', ['insert']));
-            }
+          }
+        } else {
+          if (row === -1) {
+            // 如果为虚拟树
+            if (treeConfig && transform) {
+              insertTreeRow(newRecords, true);
+            } else {
+              afterFullData.push.apply(afterFullData, newRecords);
+              tableFullData.push.apply(tableFullData, newRecords); // 刷新单元格合并
 
-            var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+              mergeList.forEach(function (mergeItem) {
+                var mergeRowIndex = mergeItem.row,
+                    mergeRowspan = mergeItem.rowspan;
 
-            if (afIndex_1 === -1) {
-              throw new Error((0, _utils.errLog)('vxe.error.unableInsert'));
+                if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+                  mergeItem.rowspan = mergeRowspan + newRecords.length;
+                }
+              });
             }
+          } else {
+            // 如果为虚拟树
+            if (treeConfig && transform) {
+              var matchObj_1 = _xeUtils.default.findTree(treeFullData, 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;
+                var parentRest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, parentRow_1)];
+                var parentLevel_1 = parentRest ? parentRest.level : 0;
+                newRecords.forEach(function (item, i) {
+                  var rowid = (0, _util.getRowid)($xetable, item);
+
+                  if (process.env.NODE_ENV === 'development') {
+                    if (item[treeOpts.parentField]) {
+                      if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[treeOpts.rowField]) {
+                        (0, _utils.errLog)('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[treeOpts.rowField]]);
+                      }
+                    }
+                  }
+
+                  if (parentRow_1) {
+                    item[treeOpts.parentField] = parentRow_1[treeOpts.rowField];
+                  }
+
+                  parentChilds_1.splice(matchObj_1.index + i, 0, item);
+                  var rest = {
+                    row: item,
+                    rowid: rowid,
+                    index: -1,
+                    _index: -1,
+                    $index: -1,
+                    items: parentChilds_1,
+                    parent: parentRow_1,
+                    level: parentLevel_1 + 1
+                  };
+                  fullDataRowIdData[rowid] = rest;
+                  fullAllDataRowIdData[rowid] = rest;
+                });
+                $xetable.updateVirtualTreeData();
+              } else {
+                if (process.env.NODE_ENV === 'development') {
+                  (0, _utils.warnLog)('vxe.error.unableInsert');
+                }
 
-            afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
-            tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords)); // 刷新单元格合并
+                insertTreeRow(newRecords, true);
+              }
+            } else {
+              if (treeConfig) {
+                throw new Error((0, _utils.getLog)('vxe.error.noTree', ['insert']));
+              }
 
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                  mergeRowspan = mergeItem.rowspan;
+              var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
 
-              if (mergeRowIndex > afIndex_1) {
-                mergeItem.row = mergeRowIndex + newRecords.length;
-              } else if (mergeRowIndex + mergeRowspan > afIndex_1) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
+              if (afIndex_1 === -1) {
+                throw new Error((0, _utils.errLog)('vxe.error.unableInsert'));
               }
-            });
+
+              afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
+              tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords)); // 刷新单元格合并
+
+              mergeList.forEach(function (mergeItem) {
+                var mergeRowIndex = mergeItem.row,
+                    mergeRowspan = mergeItem.rowspan;
+
+                if (mergeRowIndex > afIndex_1) {
+                  mergeItem.row = mergeRowIndex + newRecords.length;
+                } else if (mergeRowIndex + mergeRowspan > afIndex_1) {
+                  mergeItem.rowspan = mergeRowspan + newRecords.length;
+                }
+              });
+            }
           }
         }
 
@@ -206,7 +334,7 @@ var editHook = {
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData();
+        $xetable.handleTableData(transform);
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
 
@@ -237,10 +365,13 @@ 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 transform = treeOpts.transform;
         var actived = editStore.actived,
             removeList = editStore.removeList,
             insertList = editStore.insertList;
@@ -277,31 +408,55 @@ var editHook = {
           internalData.afterFullData = [];
           $xetable.clearMergeCells();
         } else {
-          rows.forEach(function (row) {
-            var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+          // 如果为虚拟树
+          if (treeConfig && 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);
+              }
+            });
+          }
         } // 如果当前行被激活编辑，则清除激活状态
 
 
@@ -320,7 +475,7 @@ var editHook = {
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData();
+        $xetable.handleTableData(transform);
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
 
@@ -386,17 +541,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;