vxe-table 3.13.16 → 3.13.18

package/es/table/module/edit/mixin.js

@@ -157,11 +157,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     const parentLevel = parentRest ? parentRest.level : 0;
                     newRecords.forEach((item, i) => {
                         const rowid = getRowid($xeTable, item);
-                        if (process.env.NODE_ENV === 'development') {
-                            if (item[treeOpts.parentField]) {
-                                if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                                    errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                                }
+                        if (item[treeOpts.parentField]) {
+                            if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                                errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
                             }
                         }
                         if (parentRow) {

package/es/table/module/export/export-panel.js

@@ -53,30 +53,28 @@ export default {
     },
     created() {
         const $xeTableExportPanel = this;
-        if (process.env.NODE_ENV === 'development') {
-            const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
-            const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
-            const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
-            const VxeUIInputComponent = VxeUI.getComponent('VxeInput');
-            const VxeUICheckboxComponent = VxeUI.getComponent('VxeCheckbox');
-            $xeTableExportPanel.$nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-                if (!VxeUIInputComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-input']);
-                }
-                if (!VxeUICheckboxComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-checkbox']);
-                }
-            });
-        }
+        const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
+        const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+        const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
+        const VxeUIInputComponent = VxeUI.getComponent('VxeInput');
+        const VxeUICheckboxComponent = VxeUI.getComponent('VxeCheckbox');
+        $xeTableExportPanel.$nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+            if (!VxeUIInputComponent) {
+                errLog('vxe.error.reqComp', ['vxe-input']);
+            }
+            if (!VxeUICheckboxComponent) {
+                errLog('vxe.error.reqComp', ['vxe-checkbox']);
+            }
+        });
     },
     render(h) {
         const $xeTable = this.$xeTable;

package/es/table/module/export/import-panel.js

@@ -45,22 +45,20 @@ export default {
     },
     created() {
         const $xeTableImportPanel = this;
-        if (process.env.NODE_ENV === 'development') {
-            const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
-            const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
-            const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
-            $xeTableImportPanel.$nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-            });
-        }
+        const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
+        const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+        const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
+        $xeTableImportPanel.$nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+        });
     },
     render(h) {
         const $xeTable = this.$xeTable;

package/es/table/module/export/mixin.js

@@ -568,10 +568,8 @@ function downloadFile($xetable, opts, content) {
     saveLocalFile({ filename, type, content }).then(() => {
         if (opts.message !== false) {
             // 检测弹窗模块
-            if (process.env.NODE_ENV === 'development') {
-                if (!VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal']);
-                }
+            if (!VxeUI.modal) {
+                errLog('vxe.error.reqModule', ['Modal']);
             }
             VxeUI.modal.message({ content: getI18n('vxe.table.expSuccess'), status: 'success' });
         }
@@ -800,10 +798,8 @@ function handleImport($xeTable, content, opts) {
             }
             if (opts.message !== false) {
                 // 检测弹窗模块
-                if (process.env.NODE_ENV === 'development') {
-                    if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
-                    }
+                if (!VxeUI.modal) {
+                    errLog('vxe.error.reqModule', ['Modal']);
                 }
                 VxeUI.modal.message({ content: getI18n('vxe.table.impSuccess', [rows.length]), status: 'success' });
             }
@@ -816,10 +812,8 @@ function handleImport($xeTable, content, opts) {
     }
     else if (opts.message !== false) {
         // 检测弹窗模块
-        if (process.env.NODE_ENV === 'development') {
-            if (!VxeUI.modal) {
-                errLog('vxe.error.reqModule', ['Modal']);
-            }
+        if (!VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal']);
         }
         VxeUI.modal.message({ content: getI18n('vxe.error.impFields'), status: 'error' });
         if (_importReject) {
@@ -835,10 +829,8 @@ function handleFileImport($xetable, file, opts) {
     if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
         if (opts.message !== false) {
             // 检测弹窗模块
-            if (process.env.NODE_ENV === 'development') {
-                if (!VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal']);
-                }
+            if (!VxeUI.modal) {
+                errLog('vxe.error.reqModule', ['Modal']);
             }
             VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' });
         }
@@ -888,9 +880,7 @@ function handleFileImport($xetable, file, opts) {
         }
         else {
             // 不支持的浏览器
-            if (process.env.NODE_ENV === 'development') {
-                errLog('vxe.error.notExp');
-            }
+            errLog('vxe.error.notExp');
             _importResolve({ status: true });
         }
     });
@@ -950,10 +940,8 @@ export function readLocalFile(options = {}) {
             else {
                 if (options.message !== false) {
                     // 检测弹窗模块
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                            errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                    if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                     }
                     VxeUI.modal.message({ content: getI18n('vxe.error.notType', [errType]), status: 'error' });
                 }
@@ -1618,20 +1606,16 @@ export default {
         _closeExport: handleCloseExport,
         _openExport(options) {
             const { exportOpts } = this;
-            if (process.env.NODE_ENV === 'development') {
-                if (!this.exportConfig) {
-                    errLog('vxe.error.reqProp', ['export-config']);
-                }
+            if (!this.exportConfig) {
+                errLog('vxe.error.reqProp', ['export-config']);
             }
             return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
         },
         _closePrint: handleCloseExport,
         _openPrint(options) {
             const { printOpts } = this;
-            if (process.env.NODE_ENV === 'development') {
-                if (!this.printConfig) {
-                    errLog('vxe.error.reqProp', ['print-config']);
-                }
+            if (!this.printConfig) {
+                errLog('vxe.error.reqProp', ['print-config']);
             }
             return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
         }

package/es/table/module/keyboard/mixin.js

@@ -231,9 +231,10 @@ export default {
             });
         },
         handleCellMousedownEvent(evnt, params) {
+            const $xeTable = this;
             const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this;
-            if (mouseConfig && mouseOpts.area && this.handleMousedownCellAreaEvent) {
-                return this.handleMousedownCellAreaEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.handleMousedownCellAreaEvent) {
+                return $xeTable.handleMousedownCellAreaEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

package/es/table/module/validator/mixin.js

@@ -355,9 +355,7 @@ export default {
                                         }
                                     }
                                     else {
-                                        if (process.env.NODE_ENV === 'development') {
-                                            errLog('vxe.error.notValidators', [validator]);
-                                        }
+                                        errLog('vxe.error.notValidators', [validator]);
                                     }
                                 }
                                 else {

package/es/table/render/index.js

@@ -151,10 +151,8 @@ function getComponentOns(renderOpts, params, eFns) {
     const ons = {};
     XEUtils.objectEach(events, (func, key) => {
         ons[getOnName(key)] = function (...args) {
-            if (process.env.NODE_ENV === 'development') {
-                if (!XEUtils.isFunction(func)) {
-                    errLog('vxe.error.errFunc', [func]);
-                }
+            if (!XEUtils.isFunction(func)) {
+                errLog('vxe.error.errFunc', [func]);
             }
             func(params, ...args);
         };

package/es/table/src/body.js

@@ -64,7 +64,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const { fullAllDataRowIdData } = tableInternalData;
-    const { columnKey, resizable: allResizable, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
+    const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
     const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
     const { afterFullData, scrollXStore, scrollYStore } = tableInternalData;
     const cellOpts = $xeTable.computeCellOpts;
@@ -98,7 +98,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
     let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
     const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
-    const cellOverflow = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow;
+    const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
     const showEllipsis = cellOverflow === 'ellipsis';
     const showTitle = cellOverflow === 'title';
     const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';

package/es/table/src/columnInfo.js

@@ -12,41 +12,39 @@ export class ColumnInfo {
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const tableProps = $xetable;
-        if (process.env.NODE_ENV === 'development') {
-            const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-            if (_vm.type && types.indexOf(_vm.type) === -1) {
-                warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
-            }
-            if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
-                warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-            }
-            if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-                warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+        if (_vm.type && types.indexOf(_vm.type) === -1) {
+            warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+        }
+        if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
+            warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+        }
+        if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
+            warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        }
+        if (_vm.type === 'expand') {
+            const { treeConfig } = tableProps;
+            if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
+                errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
             }
-            if (_vm.type === 'expand') {
-                const { treeConfig } = tableProps;
-                if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
-                    errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
+        }
+        if (_vm.remoteSort) {
+            warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
+        }
+        if (_vm.sortMethod) {
+            warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
+        }
+        if (formatter) {
+            if (XEUtils.isString(formatter)) {
+                const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter]);
                 }
             }
-            if (_vm.remoteSort) {
-                warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
-            }
-            if (_vm.sortMethod) {
-                warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
-            }
-            if (formatter) {
-                if (XEUtils.isString(formatter)) {
-                    const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter]);
-                    }
-                }
-                else if (XEUtils.isArray(formatter)) {
-                    const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter[0]]);
-                    }
+            else if (XEUtils.isArray(formatter)) {
+                const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter[0]]);
                 }
             }
         }

package/es/table/src/methods.js

@@ -2295,28 +2295,26 @@ const Methods = {
         if (treeConfig) {
             // 树结构自动转换
             if (treeOpts.transform) {
-                if (process.env.NODE_ENV === 'development') {
-                    if (!treeOpts.rowField) {
-                        errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
-                    }
-                    if (!treeOpts.parentField) {
-                        errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
-                    }
-                    if (!childrenField) {
-                        errLog('vxe.error.reqProp', ['tree-config.childrenField']);
-                    }
-                    if (!treeOpts.mapChildrenField) {
-                        errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-                    }
-                    if (childrenField === treeOpts.mapChildrenField) {
-                        errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-                    }
-                    // fullData.forEach(row => {
-                    //   if (row[childrenField] && row[childrenField].length) {
-                    //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-                    //   }
-                    // })
+                if (!treeOpts.rowField) {
+                    errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
+                }
+                if (!treeOpts.parentField) {
+                    errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
+                }
+                if (!childrenField) {
+                    errLog('vxe.error.reqProp', ['tree-config.childrenField']);
+                }
+                if (!treeOpts.mapChildrenField) {
+                    errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
                 }
+                if (childrenField === treeOpts.mapChildrenField) {
+                    errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+                }
+                // fullData.forEach(row => {
+                //   if (row[childrenField] && row[childrenField].length) {
+                //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
+                //   }
+                // })
                 treeData = XEUtils.toArrayTree(fullData, {
                     key: treeOpts.rowField,
                     parentKey: treeOpts.parentField,
@@ -2381,16 +2379,14 @@ const Methods = {
                 //     }
                 //   }
                 // }
-                if (process.env.NODE_ENV === 'development') {
-                    if (!(this.height || this.maxHeight)) {
-                        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-                    }
-                    // if (!this.showOverflow) {
-                    //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-                    // }
-                    if (this.spanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-                    }
+                if (!(this.height || this.maxHeight)) {
+                    errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+                }
+                // if (!this.showOverflow) {
+                //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+                // }
+                if (this.spanMethod) {
+                    warnLog('vxe.error.scrollErrProp', ['table.span-method']);
                 }
             }
             handleReserveStatus($xeTable);
@@ -2535,16 +2531,18 @@ const Methods = {
     cacheRowMap() {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const treeOpts = $xeTable.computeTreeOpts;
+        const { treeExpandedMaps } = reactData;
         const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const rowkey = getRowkey($xeTable);
-        const isLazy = treeConfig && treeOpts.lazy;
-        const fullAllDataRowIdMaps = {};
+        const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
+        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
         const handleRow = (row, index, items, path, parentRow, nodes) => {
             let rowid = getRowid($xeTable, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -2553,13 +2551,23 @@ const Methods = {
                 rowid = getRowUniqueId();
                 XEUtils.set(row, rowkey, rowid);
             }
-            if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-                row[childrenField] = null;
+            if (treeConfig && treeOpts.lazy) {
+                const treeExpRest = treeExpandedMaps[rowid];
+                if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
+                    row[childrenField] = null;
+                }
+                if (treeExpRest) {
+                    if (!row[childrenField] || !row[childrenField].length) {
+                        delete treeTempExpandedMaps[rowid];
+                    }
+                }
             }
             let rowRest = fullAllDataRowIdData[rowid];
             if (!rowRest) {
                 rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             }
+            rowRest.treeLoaded = false;
+            rowRest.expandLoaded = false;
             rowRest.row = row;
             rowRest.items = items;
             rowRest.parent = parentRow;
@@ -2568,14 +2576,15 @@ const Methods = {
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
         };
-        internalData.fullDataRowIdData = fullDataRowIdMaps;
-        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
             XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
         }
         else {
             tableFullData.forEach(handleRow);
         }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        reactData.treeExpandedMaps = treeTempExpandedMaps;
     },
     cacheSourceMap(fullData) {
         let { treeConfig, treeOpts, sourceDataRowIdData } = this;
@@ -2912,12 +2921,19 @@ const Methods = {
      * 如果还额外传了 field 则还原指定的单元格数据
      */
     revertData(rows, field) {
-        const { keepSource, tableSourceData, treeConfig } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource, treeConfig } = props;
+        const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { transform } = treeOpts;
         if (!keepSource) {
             if (process.env.NODE_ENV === 'development') {
                 warnLog('vxe.error.reqProp', ['keep-source']);
             }
-            return this.$nextTick();
+            return $xeTable.$nextTick();
         }
         let targetRows = rows;
         if (rows) {
@@ -2926,16 +2942,14 @@ const Methods = {
             }
         }
         else {
-            targetRows = XEUtils.toArray(this.getUpdateRecords());
+            targetRows = XEUtils.toArray($xeTable.getUpdateRecords());
         }
+        let reDelFlag = false;
         if (targetRows.length) {
             targetRows.forEach((row) => {
-                if (!this.isInsertByRow(row)) {
-                    const rowIndex = this.getRowIndex(row);
-                    if (treeConfig && rowIndex === -1) {
-                        errLog('vxe.error.noTree', ['revertData']);
-                    }
-                    const oRow = tableSourceData[rowIndex];
+                if (!$xeTable.isInsertByRow(row)) {
+                    const rowid = getRowid($xeTable, row);
+                    const oRow = sourceDataRowIdData[rowid];
                     if (oRow && row) {
                         if (field) {
                             XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
@@ -2943,14 +2957,38 @@ const Methods = {
                         else {
                             XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                         }
+                        if ($xeTable.isRemoveByRow(row)) {
+                            const rowRest = fullAllDataRowIdData[rowid];
+                            if (rowRest) {
+                                const reRow = rowRest.row;
+                                tableFullData.unshift(reRow);
+                                afterFullData.unshift(reRow);
+                                reDelFlag = true;
+                            }
+                        }
                     }
                 }
             });
         }
         if (rows) {
-            return this.$nextTick();
+            if (reDelFlag) {
+                $xeTable.updateFooter();
+                $xeTable.cacheRowMap(false);
+                $xeTable.handleTableData(treeConfig && transform);
+                if (!(treeConfig && transform)) {
+                    $xeTable.updateAfterDataIndex();
+                }
+                $xeTable.checkSelectionStatus();
+                if (reactData.scrollYLoad) {
+                    $xeTable.updateScrollYSpace();
+                }
+            }
+            return $xeTable.$nextTick().then(() => {
+                $xeTable.updateCellAreas();
+                return $xeTable.recalculate();
+            });
         }
-        return this.reloadData(tableSourceData);
+        return $xeTable.reloadData(tableSourceData);
     },
     /**
      * 清空单元格内容
@@ -3069,10 +3107,19 @@ const Methods = {
      * @param {Row} row 行对象
      */
     isInsertByRow(row) {
-        const { editStore } = this;
-        const rowid = getRowid(this, row);
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { editStore } = reactData;
+        const rowid = getRowid($xeTable, row);
         return !!editStore.insertMaps[rowid];
     },
+    isRemoveByRow(row) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { editStore } = reactData;
+        const rowid = getRowid($xeTable, row);
+        return !!editStore.removeMaps[rowid];
+    },
     /**
      * 删除所有新增的临时数据
      * @returns
@@ -8829,23 +8876,21 @@ const Methods = {
 const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
-        if (process.env.NODE_ENV === 'development') {
-            if (!this[`_${name}`]) {
-                if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableExportModule']);
-                }
-                else if ('fullValidate,validate'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
-                }
-                else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
-                }
-                else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableEditModule']);
-                }
-                else if ('openCustom'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
-                }
+        if (!this[`_${name}`]) {
+            if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+            }
+            else if ('fullValidate,validate'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+            }
+            else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
+            }
+            else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableEditModule']);
+            }
+            else if ('openCustom'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
             }
         }
         return this[`_${name}`] ? this[`_${name}`](...args) : null;