vxe-table 3.13.4 → 3.13.6

package/es/table/src/methods.js

@@ -38,8 +38,9 @@ const setCustomStorageMap = (id, data) => {
     maps._v = version;
     localStorage.setItem(customStorageKey, XEUtils.toJSONString(maps));
 };
-const getRecoverRowMaps = (_vm, keyMaps) => {
-    const { fullAllDataRowIdData } = _vm;
+const getRecoverRowMaps = ($xeTable, keyMaps) => {
+    const internalData = $xeTable;
+    const { fullAllDataRowIdData } = internalData;
     const restKeys = {};
     XEUtils.each(keyMaps, (row, rowid) => {
         if (fullAllDataRowIdData[rowid]) {
@@ -48,8 +49,9 @@ const getRecoverRowMaps = (_vm, keyMaps) => {
     });
     return restKeys;
 };
-function handleReserveRow(_vm, reserveRowMap) {
-    const { fullDataRowIdData } = _vm;
+function handleReserveRow($xeTable, reserveRowMap) {
+    const internalData = $xeTable;
+    const { fullDataRowIdData } = internalData;
     const reserveList = [];
     XEUtils.each(reserveRowMap, (item, rowid) => {
         if (fullDataRowIdData[rowid] && reserveList.indexOf(fullDataRowIdData[rowid].row) === -1) {
@@ -716,6 +718,215 @@ function updateStyle($xeTable) {
     }
     return $xeTable.$nextTick();
 }
+function handleRadioReserveRow($xeTable, row) {
+    const internalData = $xeTable;
+    const radioOpts = $xeTable.computeRadioOpts;
+    if (radioOpts.reserve) {
+        internalData.radioReserveRow = row;
+    }
+}
+function handleCheckboxReserveRow($xeTable, row, checked) {
+    const internalData = $xeTable;
+    const { checkboxReserveRowMap } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    if (checkboxOpts.reserve) {
+        const rowid = getRowid($xeTable, row);
+        if (checked) {
+            checkboxReserveRowMap[rowid] = row;
+        }
+        else if (checkboxReserveRowMap[rowid]) {
+            delete checkboxReserveRowMap[rowid];
+        }
+    }
+}
+function handleCheckedRadioRow($xeTable, row, isForce) {
+    const reactData = $xeTable;
+    const radioOpts = $xeTable.computeRadioOpts;
+    const { checkMethod } = radioOpts;
+    if (row && (isForce || (!checkMethod || checkMethod({ row })))) {
+        reactData.selectRadioRow = row;
+        handleRadioReserveRow($xeTable, row);
+    }
+    return $xeTable.$nextTick();
+}
+function handleCheckedCheckboxRow($xeTable, rows, value, isForce) {
+    if (rows && !XEUtils.isArray(rows)) {
+        rows = [rows];
+    }
+    $xeTable.handleBatchSelectRows(rows, !!value, isForce);
+    $xeTable.checkSelectionStatus();
+    return $xeTable.$nextTick();
+}
+function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { treeConfig } = props;
+    const { selectCheckboxMaps } = reactData;
+    const { afterFullData, checkboxReserveRowMap } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const { checkField, reserve, checkMethod } = checkboxOpts;
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
+    const selectRowMaps = {};
+    /**
+     * 绑定属性方式（高性能，有污染）
+     * 必须在行数据存在对应的属性，否则将不响应
+     */
+    if (checkField) {
+        const checkValFn = (row) => {
+            if (isForce || (!checkMethod || checkMethod({ row }))) {
+                if (checked) {
+                    selectRowMaps[getRowid($xeTable, row)] = row;
+                }
+                XEUtils.set(row, checkField, checked);
+            }
+            if (treeConfig && indeterminateField) {
+                XEUtils.set(row, indeterminateField, false);
+            }
+        };
+        // 如果存在选中方法
+        // 如果方法成立，则更新值，否则忽略该数据
+        if (treeConfig) {
+            XEUtils.eachTree(afterFullData, checkValFn, { children: childrenField });
+        }
+        else {
+            afterFullData.forEach(checkValFn);
+        }
+    }
+    else {
+        /**
+           * 默认方式（低性能，无污染）
+           * 无需任何属性，直接绑定
+           */
+        if (treeConfig) {
+            if (checked) {
+                /**
+                   * 如果是树勾选
+                   * 如果方法成立，则添加到临时集合中
+                   */
+                XEUtils.eachTree(afterFullData, (row) => {
+                    if (isForce || (!checkMethod || checkMethod({ row }))) {
+                        selectRowMaps[getRowid($xeTable, row)] = row;
+                    }
+                }, { children: childrenField });
+            }
+            else {
+                /**
+                   * 如果是树取消
+                   * 如果方法成立，则不添加到临时集合中
+                   */
+                if (!isForce && checkMethod) {
+                    XEUtils.eachTree(afterFullData, (row) => {
+                        const rowid = getRowid($xeTable, row);
+                        if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
+                            selectRowMaps[rowid] = row;
+                        }
+                    }, { children: childrenField });
+                }
+            }
+        }
+        else {
+            if (checked) {
+                /**
+                   * 如果是行勾选
+                   * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
+                   * 如果不存在选中方法，则添加所有数据到临时集合中
+                   */
+                if (!isForce && checkMethod) {
+                    afterFullData.forEach((row) => {
+                        const rowid = getRowid($xeTable, row);
+                        if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
+                            selectRowMaps[rowid] = row;
+                        }
+                    });
+                }
+                else {
+                    afterFullData.forEach(row => {
+                        selectRowMaps[getRowid($xeTable, row)] = row;
+                    });
+                }
+            }
+            else {
+                /**
+                   * 如果是行取消
+                   * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
+                   * 如果不存在选中方法，无需处理，临时集合默认为空
+                   */
+                if (!isForce && checkMethod) {
+                    afterFullData.forEach((row) => {
+                        const rowid = getRowid($xeTable, row);
+                        if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
+                            selectRowMaps[rowid] = row;
+                        }
+                    });
+                }
+            }
+        }
+    }
+    if (reserve) {
+        if (checked) {
+            XEUtils.each(selectRowMaps, (row, rowid) => {
+                checkboxReserveRowMap[rowid] = row;
+            });
+        }
+        else {
+            afterFullData.forEach((row) => handleCheckboxReserveRow($xeTable, row, false));
+        }
+    }
+    reactData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
+    reactData.isAllSelected = checked;
+    reactData.isIndeterminate = false;
+    reactData.treeIndeterminateMaps = {};
+    internalData.treeIndeterminateRowMaps = {};
+    $xeTable.checkSelectionStatus();
+    return $xeTable.$nextTick();
+}
+// 还原展开、选中等相关状态
+function handleReserveStatus($xeTable) {
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { treeConfig } = props;
+    const { expandColumn, currentRow, selectCheckboxMaps, selectRadioRow, rowExpandedMaps, treeExpandedMaps } = reactData;
+    const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const radioOpts = $xeTable.computeRadioOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    // 单选框
+    if (selectRadioRow && !fullAllDataRowIdData[getRowid($xeTable, selectRadioRow)]) {
+        reactData.selectRadioRow = null; // 刷新单选行状态
+    }
+    // 还原保留选中状态
+    if (radioOpts.reserve && radioReserveRow) {
+        const rowid = getRowid($xeTable, radioReserveRow);
+        if (fullDataRowIdData[rowid]) {
+            handleCheckedRadioRow($xeTable, fullDataRowIdData[rowid].row, true);
+        }
+    }
+    // 复选框
+    reactData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps); // 刷新多选行状态
+    // 还原保留选中状态
+    if (checkboxOpts.reserve) {
+        handleCheckedCheckboxRow($xeTable, handleReserveRow($xeTable, internalData.checkboxReserveRowMap), true, true);
+    }
+    if (currentRow && !fullAllDataRowIdData[getRowid($xeTable, currentRow)]) {
+        reactData.currentRow = null; // 刷新当前行状态
+    }
+    // 行展开
+    reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {}; // 刷新行展开状态
+    // 还原保留状态
+    if (expandColumn && expandOpts.reserve) {
+        $xeTable.setRowExpand(handleReserveRow($xeTable, internalData.rowExpandedReserveRowMap), true);
+    }
+    // 树展开
+    reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {}; // 刷新树展开状态
+    if (treeConfig && treeOpts.reserve) {
+        $xeTable.setTreeExpand(handleReserveRow($xeTable, internalData.treeExpandedReserveRowMap), true);
+    }
+}
 function calcVarRowHeightConfig($xeTable, sizeKey, sizeEl) {
     const reactData = $xeTable;
     const { rowHeightStore } = reactData;
@@ -2113,15 +2324,11 @@ const Methods = {
         internalData.tableFullData = fullData;
         internalData.tableFullTreeData = treeData;
         // 缓存数据
-        $xeTable.cacheRowMap(true, isReset);
+        $xeTable.cacheRowMap(true);
         // 原始数据
         internalData.tableSynchData = datas;
         if (isReset) {
             internalData.isResizeCellHeight = false;
-            reactData.rowExpandedMaps = {};
-            reactData.rowExpandLazyLoadedMaps = {};
-            reactData.treeExpandedMaps = {};
-            reactData.treeExpandLazyLoadedMaps = {};
         }
         // 克隆原数据，用于显示编辑状态，与编辑值做对比
         if (keepSource) {
@@ -2166,7 +2373,7 @@ const Methods = {
                     }
                 }
             }
-            this.handleReserveStatus();
+            handleReserveStatus($xeTable);
             this.checkSelectionStatus();
             return new Promise(resolve => {
                 this.$nextTick()
@@ -2305,16 +2512,21 @@ const Methods = {
     /**
      * 更新数据行的 Map
      */
-    cacheRowMap(isReset, isSource) {
-        const { treeConfig, treeOpts, tableFullData, fullAllDataRowIdData, tableFullTreeData } = this;
+    cacheRowMap() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-        const rowkey = getRowkey(this);
+        const rowkey = getRowkey($xeTable);
         const isLazy = treeConfig && treeOpts.lazy;
         const fullAllDataRowIdMaps = {};
         const fullDataRowIdMaps = {};
-        const handleCache = (row, index, items, path, parentRow, nodes) => {
-            let rowid = getRowid(this, row);
+        const handleRow = (row, index, items, path, parentRow, nodes) => {
+            let rowid = getRowid($xeTable, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
             const level = nodes ? nodes.length - 1 : 0;
             if (eqEmptyValue(rowid)) {
@@ -2324,29 +2536,25 @@ const Methods = {
             if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
                 row[childrenField] = null;
             }
-            let cacheItem = fullAllDataRowIdData[rowid];
-            if (isReset || !cacheItem) {
-                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
-            }
-            cacheItem.row = row;
-            cacheItem.items = items;
-            cacheItem.parent = parentRow;
-            cacheItem.level = level;
-            cacheItem.index = treeConfig && parentRow ? -1 : index;
-            if (isSource) {
-                fullDataRowIdMaps[rowid] = cacheItem;
-            }
-            fullAllDataRowIdMaps[rowid] = cacheItem;
+            let rowRest = fullAllDataRowIdData[rowid];
+            if (!rowRest) {
+                rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            }
+            rowRest.row = row;
+            rowRest.items = items;
+            rowRest.parent = parentRow;
+            rowRest.level = level;
+            rowRest.index = treeConfig && parentRow ? -1 : index;
+            fullDataRowIdMaps[rowid] = rowRest;
+            fullAllDataRowIdMaps[rowid] = rowRest;
         };
-        if (isSource) {
-            this.fullDataRowIdData = fullDataRowIdMaps;
-        }
-        this.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
-            XEUtils.eachTree(tableFullTreeData, handleCache, { children: childrenField });
+            XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
         }
         else {
-            tableFullData.forEach(handleCache);
+            tableFullData.forEach(handleRow);
         }
     },
     cacheSourceMap(fullData) {
@@ -3168,7 +3376,7 @@ const Methods = {
         const props = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { fullDataRowIdData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, mapChildrenField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -3181,7 +3389,7 @@ const Methods = {
                 rowid = getRowid($xeTable, rowOrRowid);
             }
             if (rowid) {
-                const rest = fullDataRowIdData[rowid];
+                const rest = fullAllDataRowIdData[rowid];
                 const row = rest ? rest.row : null;
                 if (row) {
                     return row[transform ? mapChildrenField : childrenField] || [];
@@ -3198,7 +3406,7 @@ const Methods = {
         const props = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { fullDataRowIdData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         if (rowOrRowid && treeConfig) {
             let rowid;
             if (XEUtils.isString(rowOrRowid)) {
@@ -3208,7 +3416,7 @@ const Methods = {
                 rowid = getRowid($xeTable, rowOrRowid);
             }
             if (rowid) {
-                const rest = fullDataRowIdData[rowid];
+                const rest = fullAllDataRowIdData[rowid];
                 return rest ? rest.parent : null;
             }
         }
@@ -3226,9 +3434,9 @@ const Methods = {
     getRowById(cellValue) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { fullDataRowIdData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         const rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
-        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+        return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
     },
     /**
      * 根据行获取行的唯一主键
@@ -4990,10 +5198,11 @@ const Methods = {
      * 处理默认勾选
      */
     handleDefaultSelectionChecked() {
+        const $xeTable = this;
         const { fullDataRowIdData, checkboxOpts } = this;
         const { checkAll, checkRowKeys } = checkboxOpts;
         if (checkAll) {
-            this.handleCheckedAllCheckboxRow(true, true);
+            handleCheckedAllCheckboxRow($xeTable, true, true);
         }
         else if (checkRowKeys) {
             const defSelection = [];
@@ -5002,17 +5211,12 @@ const Methods = {
                     defSelection.push(fullDataRowIdData[rowid].row);
                 }
             });
-            this.handleCheckedCheckboxRow(defSelection, true, true);
+            handleCheckedCheckboxRow($xeTable, defSelection, true, true);
         }
     },
     handleCheckedCheckboxRow(rows, value, isForce) {
         const $xeTable = this;
-        if (rows && !XEUtils.isArray(rows)) {
-            rows = [rows];
-        }
-        $xeTable.handleBatchSelectRows(rows, !!value, isForce);
-        $xeTable.checkSelectionStatus();
-        return this.$nextTick();
+        return handleCheckedCheckboxRow($xeTable, rows, value, isForce);
     },
     /**
      * 用于多选行，设置行为选中状态，第二个参数为选中与否
@@ -5024,7 +5228,7 @@ const Methods = {
         if (rows && !XEUtils.isArray(rows)) {
             rows = [rows];
         }
-        return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
+        return handleCheckedCheckboxRow($xeTable, rows, checked, true);
     },
     setCheckboxRowKey(keys, checked) {
         const $xeTable = this;
@@ -5040,7 +5244,7 @@ const Methods = {
                 rows.push(rowRest.row);
             }
         });
-        return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
+        return handleCheckedCheckboxRow($xeTable, rows, checked, true);
     },
     isCheckedByCheckboxRow(row) {
         const $xeTable = this;
@@ -5109,7 +5313,7 @@ const Methods = {
                         if (indeterminateField) {
                             XEUtils.set(row, indeterminateField, false);
                         }
-                        $xeTable.handleCheckboxReserveRow(row, checked);
+                        handleCheckboxReserveRow($xeTable, row, checked);
                     }
                 }, { children: transform ? mapChildrenField : childrenField });
                 reactData.selectCheckboxMaps = selectRowMaps;
@@ -5120,7 +5324,7 @@ const Methods = {
                 rows.forEach(row => {
                     if (isForce || (!checkMethod || checkMethod({ row }))) {
                         XEUtils.set(row, checkField, checked);
-                        $xeTable.handleCheckboxReserveRow(row, checked);
+                        handleCheckboxReserveRow($xeTable, row, checked);
                     }
                 });
             }
@@ -5141,7 +5345,7 @@ const Methods = {
                             delete selectRowMaps[rowid];
                         }
                     }
-                    $xeTable.handleCheckboxReserveRow(row, checked);
+                    handleCheckboxReserveRow($xeTable, row, checked);
                 }
             }, { children: transform ? mapChildrenField : childrenField });
             reactData.selectCheckboxMaps = selectRowMaps;
@@ -5161,7 +5365,7 @@ const Methods = {
                         delete selectRowMaps[rowid];
                     }
                 }
-                $xeTable.handleCheckboxReserveRow(row, checked);
+                handleCheckboxReserveRow($xeTable, row, checked);
             }
         });
         reactData.selectCheckboxMaps = selectRowMaps;
@@ -5197,6 +5401,7 @@ const Methods = {
         }
     },
     triggerCheckRowEvent(evnt, params, checked) {
+        const $xeTable = this;
         const { checkboxOpts, afterFullData } = this;
         const { checkMethod, trigger } = checkboxOpts;
         const { row } = params;
@@ -5213,7 +5418,7 @@ const Methods = {
                 if (_rowIndex !== _firstRowIndex) {
                     this.setAllCheckboxRow(false);
                     const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-                    this.handleCheckedCheckboxRow(rangeRows, true, false);
+                    handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
                     this.emitEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
                     return;
                 }
@@ -5242,147 +5447,13 @@ const Methods = {
         $xeTable.checkSelectionStatus();
         return $xeTable.$nextTick();
     },
-    handleCheckedAllCheckboxRow(checked, isForce) {
-        const $xeTable = this;
-        const reactData = $xeTable;
-        const { afterFullData, treeConfig, treeOpts, selectCheckboxMaps, checkboxReserveRowMap, checkboxOpts, afterFullRowMaps } = this;
-        const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts;
-        const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
-        const childrenField = treeOpts.children || treeOpts.childrenField;
-        const selectRowMaps = {};
-        // 疑惑！
-        if (!treeConfig) {
-            XEUtils.each(selectCheckboxMaps, (row, rowid) => {
-                if (!afterFullRowMaps[rowid]) {
-                    selectRowMaps[rowid] = row;
-                }
-            });
-        }
-        // 疑惑！
-        if (checkStrictly) {
-            this.isAllSelected = checked;
-        }
-        else {
-            /**
-             * 绑定属性方式（高性能，有污染）
-             * 必须在行数据存在对应的属性，否则将不响应
-             */
-            if (checkField) {
-                const checkValFn = (row) => {
-                    if (isForce || (!checkMethod || checkMethod({ row }))) {
-                        if (checked) {
-                            selectRowMaps[getRowid(this, row)] = row;
-                        }
-                        XEUtils.set(row, checkField, checked);
-                    }
-                    if (treeConfig && indeterminateField) {
-                        XEUtils.set(row, indeterminateField, false);
-                    }
-                };
-                // 如果存在选中方法
-                // 如果方法成立，则更新值，否则忽略该数据
-                if (treeConfig) {
-                    XEUtils.eachTree(afterFullData, checkValFn, { children: childrenField });
-                }
-                else {
-                    afterFullData.forEach(checkValFn);
-                }
-            }
-            else {
-                /**
-                 * 默认方式（低性能，无污染）
-                 * 无需任何属性，直接绑定
-                 */
-                if (treeConfig) {
-                    if (checked) {
-                        /**
-                         * 如果是树勾选
-                         * 如果方法成立，则添加到临时集合中
-                         */
-                        XEUtils.eachTree(afterFullData, (row) => {
-                            if (isForce || (!checkMethod || checkMethod({ row }))) {
-                                selectRowMaps[getRowid(this, row)] = row;
-                            }
-                        }, { children: childrenField });
-                    }
-                    else {
-                        /**
-                         * 如果是树取消
-                         * 如果方法成立，则不添加到临时集合中
-                         */
-                        if (!isForce && checkMethod) {
-                            XEUtils.eachTree(afterFullData, (row) => {
-                                const rowid = getRowid(this, row);
-                                if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
-                                    selectRowMaps[rowid] = row;
-                                }
-                            }, { children: childrenField });
-                        }
-                    }
-                }
-                else {
-                    if (checked) {
-                        /**
-                         * 如果是行勾选
-                         * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
-                         * 如果不存在选中方法，则添加所有数据到临时集合中
-                         */
-                        if (!isForce && checkMethod) {
-                            afterFullData.forEach((row) => {
-                                const rowid = getRowid(this, row);
-                                if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
-                                    selectRowMaps[rowid] = row;
-                                }
-                            });
-                        }
-                        else {
-                            afterFullData.forEach((row) => {
-                                selectRowMaps[getRowid(this, row)] = row;
-                            });
-                        }
-                    }
-                    else {
-                        /**
-                         * 如果是行取消
-                         * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
-                         * 如果不存在选中方法，无需处理，临时集合默认为空
-                         */
-                        if (!isForce && checkMethod) {
-                            afterFullData.forEach((row) => {
-                                const rowid = getRowid(this, row);
-                                if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
-                                    selectRowMaps[rowid] = row;
-                                }
-                            });
-                        }
-                    }
-                }
-            }
-            if (reserve) {
-                if (checked) {
-                    XEUtils.each(selectRowMaps, (row, rowid) => {
-                        checkboxReserveRowMap[rowid] = row;
-                    });
-                }
-                else {
-                    afterFullData.forEach((row) => this.handleCheckboxReserveRow(row, false));
-                }
-            }
-            this.selectCheckboxMaps = checkField ? {} : selectRowMaps;
-        }
-        reactData.isAllSelected = checked;
-        reactData.isIndeterminate = false;
-        this.treeIndeterminateMaps = {};
-        this.treeIndeterminateRowMaps = {};
-        this.checkSelectionStatus();
-        return this.$nextTick();
-    },
     /**
      * 用于多选行，设置所有行的选中状态
      * @param {Boolean} value 是否选中
      */
     setAllCheckboxRow(value) {
-        return this.handleCheckedAllCheckboxRow(value, true);
+        const $xeTable = this;
+        return handleCheckedAllCheckboxRow($xeTable, value, true);
     },
     updateCheckboxStatus() {
         const $xeTable = this;
@@ -5544,42 +5615,6 @@ const Methods = {
         $xeTable.updateCheckboxStatus();
         $xeTable.updateAllCheckboxStatus();
     },
-    // 还原展开、选中等相关状态
-    handleReserveStatus() {
-        const $xeTable = this;
-        const { expandColumn, treeOpts, treeConfig, fullDataRowIdData, fullAllDataRowIdData, currentRow, selectRadioRow, radioReserveRow, radioOpts, checkboxOpts, selectCheckboxMaps, rowExpandedMaps, treeExpandedMaps, expandOpts } = this;
-        // 单选框
-        if (selectRadioRow && !fullAllDataRowIdData[getRowid($xeTable, selectRadioRow)]) {
-            this.selectRadioRow = null; // 刷新单选行状态
-        }
-        // 还原保留选中状态
-        if (radioOpts.reserve && radioReserveRow) {
-            const rowid = getRowid(this, radioReserveRow);
-            if (fullDataRowIdData[rowid]) {
-                this.handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
-            }
-        }
-        // 复选框
-        this.selectCheckboxMaps = getRecoverRowMaps(this, selectCheckboxMaps); // 刷新多选行状态
-        // 还原保留选中状态
-        if (checkboxOpts.reserve) {
-            this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
-        }
-        if (currentRow && !this.fullAllDataRowIdData[getRowid($xeTable, currentRow)]) {
-            this.currentRow = null; // 刷新当前行状态
-        }
-        // 行展开
-        this.rowExpandedMaps = expandColumn ? getRecoverRowMaps(this, rowExpandedMaps) : []; // 刷新行展开状态
-        // 还原保留状态
-        if (expandColumn && expandOpts.reserve) {
-            this.setRowExpand(handleReserveRow(this, this.rowExpandedReserveRowMap), true);
-        }
-        // 树展开
-        this.treeExpandedMaps = treeConfig ? getRecoverRowMaps(this, treeExpandedMaps) : []; // 刷新树展开状态
-        if (treeConfig && treeOpts.reserve) {
-            this.setTreeExpand(handleReserveRow(this, this.treeExpandedReserveRowMap), true);
-        }
-    },
     /**
      * 获取单选框保留选中的行
      */
@@ -5614,12 +5649,6 @@ const Methods = {
         this.radioReserveRow = null;
         return this.$nextTick();
     },
-    handleRadioReserveRow(row) {
-        const { radioOpts } = this;
-        if (radioOpts.reserve) {
-            this.radioReserveRow = row;
-        }
-    },
     /**
      * 获取复选框保留选中的行
      */
@@ -5673,15 +5702,22 @@ const Methods = {
         }
     },
     handleCheckAllEvent(evnt, value) {
-        this.handleCheckedAllCheckboxRow(value);
+        const $xeTable = this;
+        handleCheckedAllCheckboxRow($xeTable, value);
         if (evnt) {
-            this.emitEvent('checkbox-all', { records: this.getCheckboxRecords(), reserves: this.getCheckboxReserveRecords(), indeterminates: this.getCheckboxIndeterminateRecords(), checked: value }, evnt);
+            $xeTable.dispatchEvent('checkbox-all', {
+                records: $xeTable.getCheckboxRecords(),
+                reserves: $xeTable.getCheckboxReserveRecords(),
+                indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+                checked: value
+            }, evnt);
         }
     },
     /**
      * 多选，选中所有事件
      */
     triggerCheckAllEvent(evnt, value) {
+        const $xeTable = this;
         const { checkboxOpts } = this;
         const { trigger } = checkboxOpts;
         if (trigger === 'manual') {
@@ -5690,7 +5726,7 @@ const Methods = {
         if (evnt) {
             evnt.stopPropagation();
         }
-        this.handleCheckAllEvent(evnt, value);
+        $xeTable.handleCheckAllEvent(evnt, value);
     },
     /**
      * 多选，切换所有行的选中状态
@@ -5735,11 +5771,12 @@ const Methods = {
      * 处理单选框默认勾选
      */
     handleDefaultRadioChecked() {
+        const $xeTable = this;
         const { radioOpts, fullDataRowIdData } = this;
         const { checkRowKey: rowid, reserve } = radioOpts;
         if (rowid) {
             if (fullDataRowIdData[rowid]) {
-                this.handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
+                handleCheckedRadioRow($xeTable, fullDataRowIdData[rowid].row, true);
             }
             if (reserve) {
                 const rowkey = getRowkey(this);
@@ -5751,6 +5788,7 @@ const Methods = {
      * 单选，行选中事件
      */
     triggerRadioRowEvent(evnt, params) {
+        const $xeTable = this;
         const { selectRadioRow: oldValue, radioOpts } = this;
         const { row } = params;
         const { trigger } = radioOpts;
@@ -5761,7 +5799,7 @@ const Methods = {
         let newValue = row;
         let isChange = oldValue !== newValue;
         if (isChange) {
-            this.handleCheckedRadioRow(newValue);
+            handleCheckedRadioRow($xeTable, newValue);
         }
         else if (!radioOpts.strict) {
             isChange = oldValue === newValue;
@@ -5832,22 +5870,13 @@ const Methods = {
         }
         return false;
     },
-    handleCheckedRadioRow(row, isForce) {
-        const { radioOpts } = this;
-        const { checkMethod } = radioOpts;
-        if (row && (isForce || (!checkMethod || checkMethod({ row })))) {
-            this.selectRadioRow = row;
-            this.handleRadioReserveRow(row);
-        }
-        return this.$nextTick();
-    },
     /**
      * 用于单选行，设置某一行为选中状态
      * @param {Row} row 行对象
      */
     setRadioRow(row) {
         const $xeTable = this;
-        return $xeTable.handleCheckedRadioRow(row, true);
+        return handleCheckedRadioRow($xeTable, row, true);
     },
     /**
      * 用于单选行，设置某一行为选中状态
@@ -5859,7 +5888,7 @@ const Methods = {
         const { fullAllDataRowIdData } = internalData;
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
-            return $xeTable.handleCheckedRadioRow(rowRest.row, true);
+            return handleCheckedRadioRow($xeTable, rowRest.row, true);
         }
         return $xeTable.$nextTick();
     },
@@ -7459,11 +7488,12 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
         const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
+        let tExpandedMaps = {};
         if (rows) {
+            tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
             if (!XEUtils.isArray(rows)) {
                 rows = [rows];
             }
@@ -7478,7 +7508,12 @@ const Methods = {
                 }
             });
         }
-        reactData.treeExpandedMaps = tExpandedMaps;
+        else {
+            XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+                rowRest.treeLoaded = false;
+            });
+        }
+        reactData.treeExpandedMaps = {};
         if (transform) {
             handleVirtualTreeToList($xeTable);
             return $xeTable.handleTableData();
@@ -7595,7 +7630,7 @@ const Methods = {
                             }
                             // 如果当前节点已选中，则展开后子节点也被选中
                             if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
-                                this.handleCheckedCheckboxRow(childRows, true);
+                                handleCheckedCheckboxRow($xeTable, childRows, true);
                             }
                             return this.$nextTick().then(() => {
                                 if (transform) {