vxe-table 4.3.8 → 4.3.10

package/lib/index.umd.js

@@ -2260,7 +2260,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.3.8"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.3.10"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -4057,7 +4057,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.3.8",
+  version: "4.3.10",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -8617,6 +8617,10 @@ const quarterSize = 8;
     };
     const focusEvent = evnt => {
       reactData.isActivated = true;
+      const isDatePickerType = computeIsDatePickerType.value;
+      if (isDatePickerType) {
+        datePickerOpenEvent(evnt);
+      }
       triggerEvent(evnt);
     };
     const clickPrefixEvent = evnt => {
@@ -9593,10 +9597,6 @@ const quarterSize = 8;
       }
     };
     const clickEvent = evnt => {
-      const isDatePickerType = computeIsDatePickerType.value;
-      if (isDatePickerType) {
-        datePickerOpenEvent(evnt);
-      }
       triggerEvent(evnt);
     };
     // 弹出面板
@@ -15280,7 +15280,7 @@ const Cell = {
         return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
       }
     }
-    return renderTitleContent(params, [formatText(column.getTitle(), 1)]);
+    return renderTitleContent(params, formatText(column.getTitle(), 1));
   },
   renderDefaultHeader(params) {
     return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params));
@@ -15414,7 +15414,7 @@ const Cell = {
       slots
     } = column;
     const headerSlot = slots ? slots.header : null;
-    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)]);
+    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1));
   },
   renderSeqCell(params) {
     const {
@@ -16553,7 +16553,7 @@ dynamicApp.component('VxeTableColgroup', src_group);
 
 const tableComponentPropKeys = Object.keys(props);
 const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect'];
-const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
+const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',
   props: {
@@ -16842,7 +16842,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             escClosable: true
           }).then(type => {
             if (type === 'confirm') {
-              callback();
+              return callback();
             }
           });
         } else {
@@ -16880,7 +16880,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       tablePage.pageSize = pageSize;
       gridMethods.dispatchEvent('page-change', params);
       if (proxyConfig) {
-        gridMethods.commitProxy('query');
+        gridMethods.commitProxy('query').then(rest => {
+          gridMethods.dispatchEvent('proxy-query', rest, params.$event);
+        });
       }
     };
     const sortChangeEvent = params => {
@@ -16897,7 +16899,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         reactData.sortData = params.sortList;
         if (proxyConfig) {
           reactData.tablePage.currentPage = 1;
-          gridMethods.commitProxy('query');
+          gridMethods.commitProxy('query').then(rest => {
+            gridMethods.dispatchEvent('proxy-query', rest, params.$event);
+          });
         }
       }
       gridMethods.dispatchEvent('sort-change', params);
@@ -16916,7 +16920,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         reactData.filterData = params.filterList;
         if (proxyConfig) {
           reactData.tablePage.currentPage = 1;
-          gridMethods.commitProxy('query');
+          gridMethods.commitProxy('query').then(rest => {
+            gridMethods.dispatchEvent('proxy-query', rest, params.$event);
+          });
         }
       }
       gridMethods.dispatchEvent('filter-change', params);
@@ -16926,7 +16932,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         proxyConfig
       } = props;
       if (proxyConfig) {
-        gridMethods.commitProxy('reload');
+        gridMethods.commitProxy('reload').then(rest => {
+          gridMethods.dispatchEvent('proxy-query', {
+            ...rest,
+            isReload: true
+          }, params.$event);
+        });
       }
       gridMethods.dispatchEvent('form-submit', params);
     };
@@ -16935,7 +16946,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         proxyConfig
       } = props;
       if (proxyConfig) {
-        gridMethods.commitProxy('reload');
+        gridMethods.commitProxy('reload').then(rest => {
+          gridMethods.dispatchEvent('proxy-query', {
+            ...rest,
+            isReload: true
+          }, params.$event);
+        });
       }
       gridMethods.dispatchEvent('form-reset', params);
     };
@@ -17232,7 +17248,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         if (!proxyInited) {
           reactData.proxyInited = true;
           if (proxyOpts.autoLoad !== false) {
-            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => gridMethods.commitProxy('_init'));
+            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => gridMethods.commitProxy('_init')).then(rest => {
+              gridMethods.dispatchEvent('proxy-query', {
+                ...rest,
+                isInited: true
+              }, new Event('init'));
+            });
           }
         }
       }
@@ -17290,13 +17311,11 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         const btnParams = button ? button.params : null;
         switch (code) {
           case 'insert':
-            $xetable.insert({});
-            break;
+            return $xetable.insert({});
           case 'insert_actived':
-            $xetable.insert({}).then(({
+            return $xetable.insert({}).then(({
               row
-            }) => $xetable.setActiveRow(row));
-            break;
+            }) => $xetable.setEditRow(row));
           case 'mark_cancel':
             triggerPendingEvent(code);
             break;
@@ -17315,8 +17334,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             $xetable.openExport(btnParams);
             break;
           case 'reset_custom':
-            $xetable.resetColumn(true);
-            break;
+            return $xetable.resetColumn(true);
           case '_init':
           case 'reload':
           case 'query':
@@ -17367,9 +17385,11 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                     filterList = $xetable.getCheckedFilters();
                   }
                 }
-                const params = {
+                const commitParams = {
                   code,
                   button,
+                  isInited,
+                  isReload,
                   $grid: $xegrid,
                   page: pageParams,
                   sort: sortList.length ? sortList[0] : {},
@@ -17381,8 +17401,8 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 reactData.sortData = sortList;
                 reactData.filterData = filterList;
                 reactData.tableLoading = true;
-                const applyArgs = [params].concat(args);
-                return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).catch(e => e).then(rest => {
+                const applyArgs = [commitParams].concat(args);
+                return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
                   reactData.tableLoading = false;
                   if (rest) {
                     if (isEnableConf(pagerConfig)) {
@@ -17403,6 +17423,13 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   if (afterQuery) {
                     afterQuery(...applyArgs);
                   }
+                  return {
+                    status: true
+                  };
+                }).catch(() => {
+                  return {
+                    status: false
+                  };
                 });
               } else {
                 if (true) {
@@ -17420,13 +17447,14 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 const body = {
                   removeRecords
                 };
-                const applyArgs = [{
+                const commitParams = {
                   $grid: $xegrid,
                   code,
                   button,
                   body,
                   options: ajaxMethods
-                }].concat(args);
+                };
+                const applyArgs = [commitParams].concat(args);
                 if (selectRecords.length) {
                   return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                     if (!removeRecords.length) {
@@ -17453,6 +17481,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                       } else {
                         gridMethods.commitProxy('query');
                       }
+                      return {
+                        status: true
+                      };
                     }).catch(rest => {
                       reactData.tableLoading = false;
                       if (isMsg) {
@@ -17467,6 +17498,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                           status: 'error'
                         });
                       }
+                      return {
+                        status: false
+                      };
                     });
                   });
                 } else {
@@ -17504,13 +17538,14 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   updateRecords,
                   pendingRecords
                 } = body;
-                const applyArgs = [{
+                const commitParams = {
                   $grid: $xegrid,
                   code,
                   button,
                   body,
                   options: ajaxMethods
-                }].concat(args);
+                };
+                const applyArgs = [commitParams].concat(args);
                 // 排除掉新增且标记为删除的数据
                 if (insertRecords.length) {
                   body.pendingRecords = pendingRecords.filter(row => $xetable.findRowIndexOf(insertRecords, row) === -1);
@@ -17551,6 +17586,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                       } else {
                         gridMethods.commitProxy('query');
                       }
+                      return {
+                        status: true
+                      };
                     }).catch(rest => {
                       reactData.tableLoading = false;
                       if (isMsg) {
@@ -17566,6 +17604,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                           status: 'error'
                         });
                       }
+                      return {
+                        status: false
+                      };
                     });
                   } else {
                     if (isMsg) {
@@ -17718,15 +17759,28 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         }
         return 0;
       },
+      triggerToolbarCommitEvent(params, evnt) {
+        const {
+          code
+        } = params;
+        return gridMethods.commitProxy(params, evnt).then(rest => {
+          if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
+            gridMethods.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', {
+              ...rest,
+              isReload: code === 'reload'
+            }, evnt);
+          }
+        });
+      },
       triggerToolbarBtnEvent(button, evnt) {
-        gridMethods.commitProxy(button, evnt);
+        gridPrivateMethods.triggerToolbarCommitEvent(button, evnt);
         gridMethods.dispatchEvent('toolbar-button-click', {
           code: button.code,
           button
         }, evnt);
       },
       triggerToolbarTolEvent(tool, evnt) {
-        gridMethods.commitProxy(tool, evnt);
+        gridPrivateMethods.triggerToolbarCommitEvent(tool, evnt);
         gridMethods.dispatchEvent('toolbar-tool-click', {
           code: tool.code,
           tool,
@@ -18108,7 +18162,7 @@ dynamicApp.component(grid.name, grid);
         }
       }, 300);
     };
-    const refreshEvent = () => {
+    const refreshEvent = evnt => {
       const {
         isRefresh
       } = reactData;
@@ -18126,7 +18180,9 @@ dynamicApp.component(grid.name, grid);
           }
         } else if ($xegrid) {
           reactData.isRefresh = true;
-          $xegrid.commitProxy(refreshOpts.code || 'reload').catch(e => e).then(() => {
+          $xegrid.triggerToolbarCommitEvent({
+            code: refreshOpts.code || 'reload'
+          }, evnt).catch(e => e).then(() => {
             reactData.isRefresh = false;
           });
         }
@@ -18672,7 +18728,7 @@ dynamicApp.component(toolbar.name, toolbar);
     };
     const triggerJumpEvent = evnt => {
       const inputElem = evnt.target;
-      const inpValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inputElem.value);
+      const inpValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(inputElem.value);
       const pageCount = computePageCount.value;
       const current = inpValue <= 0 ? 1 : inpValue >= pageCount ? pageCount : inpValue;
       inputElem.value = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(current);
@@ -18740,11 +18796,17 @@ dynamicApp.component(toolbar.name, toolbar);
         value
       } = params;
       const pageSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(value);
+      const pageCount = getPageCount(props.total, pageSize);
+      let currentPage = props.currentPage;
+      if (currentPage > pageCount) {
+        currentPage = pageCount;
+        emit('update:currentPage', pageCount);
+      }
       emit('update:pageSize', pageSize);
       pagerMethods.dispatchEvent('page-change', {
         type: 'size',
         pageSize,
-        currentPage: Math.min(props.currentPage, getPageCount(props.total, pageSize))
+        currentPage
       });
     };
     const jumpInputEvent = evnt => {
@@ -22289,6 +22351,9 @@ function createResizeEvent(callback) {
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => setTimeout(() => recalculate()));
       }
     });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onActivated)(() => {
+      recalculate().then(() => refreshScroll());
+    });
     let resizeObserver;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
       GlobalEvent.on($xelist, 'resize', () => {
@@ -26358,7 +26423,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           checkRowKeys
         } = checkboxOpts;
         if (checkAll) {
-          tableMethods.setAllCheckboxRow(true);
+          handleCheckedAllCheckboxRow(true, true);
         } else if (checkRowKeys) {
           const defSelection = [];
           checkRowKeys.forEach(rowid => {
@@ -26366,7 +26431,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               defSelection.push(fullDataRowIdData[rowid].row);
             }
           });
-          tableMethods.setCheckboxRow(defSelection, true);
+          handleCheckedCheckboxRow(defSelection, true, true);
         }
       }
     };
@@ -26388,7 +26453,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         } = radioOpts;
         if (rowid) {
           if (fullDataRowIdData[rowid]) {
-            tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
+            handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
           }
           if (reserve) {
             const rowkey = getRowkey($xetable);
@@ -26448,6 +26513,150 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         }
       }
     };
+    const handleCheckedRadioRow = (row, isForce) => {
+      const radioOpts = computeRadioOpts.value;
+      const {
+        checkMethod
+      } = radioOpts;
+      if (row && (isForce || !checkMethod || checkMethod({
+        row
+      }))) {
+        reactData.selectRow = row;
+        handleRadioReserveRow(row);
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
+    const handleCheckedCheckboxRow = (rows, value, isForce) => {
+      if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+        rows = [rows];
+      }
+      rows.forEach(row => tablePrivateMethods.handleSelectRow({
+        row
+      }, !!value, isForce));
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
+    const handleCheckedAllCheckboxRow = (value, isForce) => {
+      const {
+        treeConfig
+      } = props;
+      const {
+        selection
+      } = reactData;
+      const {
+        afterFullData,
+        checkboxReserveRowMap
+      } = internalData;
+      const treeOpts = computeTreeOpts.value;
+      const checkboxOpts = computeCheckboxOpts.value;
+      const {
+        checkField,
+        reserve,
+        checkStrictly,
+        checkMethod
+      } = checkboxOpts;
+      let selectRows = [];
+      const beforeSelection = treeConfig ? [] : selection.filter(row => $xetable.findRowIndexOf(afterFullData, row) === -1);
+      if (checkStrictly) {
+        reactData.isAllSelected = value;
+      } else {
+        /**
+         * 绑定属性方式（高性能，有污染）
+         * 必须在行数据存在对应的属性，否则将不响应
+         */
+        if (checkField) {
+          const checkValFn = row => {
+            if (isForce || !checkMethod || checkMethod({
+              row
+            })) {
+              if (value) {
+                selectRows.push(row);
+              }
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
+            }
+          };
+          // 如果存在选中方法
+          // 如果方法成立，则更新值，否则忽略该数据
+          if (treeConfig) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, checkValFn, treeOpts);
+          } else {
+            afterFullData.forEach(checkValFn);
+          }
+        } else {
+          /**
+           * 默认方式（低性能，无污染）
+           * 无需任何属性，直接绑定
+           */
+          if (treeConfig) {
+            if (value) {
+              /**
+               * 如果是树勾选
+               * 如果方法成立，则添加到临时集合中
+               */
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
+                if (isForce || !checkMethod || checkMethod({
+                  row
+                })) {
+                  selectRows.push(row);
+                }
+              }, treeOpts);
+            } else {
+              /**
+               * 如果是树取消
+               * 如果方法成立，则不添加到临时集合中
+               */
+              if (!isForce && checkMethod) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
+                  if (checkMethod({
+                    row
+                  }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
+                    selectRows.push(row);
+                  }
+                }, treeOpts);
+              }
+            }
+          } else {
+            if (value) {
+              /**
+               * 如果是行勾选
+               * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
+               * 如果不存在选中方法，则添加所有数据到临时集合中
+               */
+              if (!isForce && checkMethod) {
+                selectRows = afterFullData.filter(row => $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({
+                  row
+                }));
+              } else {
+                selectRows = afterFullData.slice(0);
+              }
+            } else {
+              /**
+               * 如果是行取消
+               * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
+               * 如果不存在选中方法，无需处理，临时集合默认为空
+               */
+              if (!isForce && checkMethod) {
+                selectRows = afterFullData.filter(row => checkMethod({
+                  row
+                }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1);
+              }
+            }
+          }
+        }
+        if (reserve) {
+          if (value) {
+            selectRows.forEach(row => {
+              checkboxReserveRowMap[getRowid($xetable, row)] = row;
+            });
+          } else {
+            afterFullData.forEach(row => handleCheckboxReserveRow(row, false));
+          }
+        }
+        reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
+      }
+      reactData.treeIndeterminates = [];
+      tablePrivateMethods.checkSelectionStatus();
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
     // 还原展开、选中等相关状态
     const handleReserveStatus = () => {
       const {
@@ -26478,14 +26687,14 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       if (radioOpts.reserve && radioReserveRow) {
         const rowid = getRowid($xetable, radioReserveRow);
         if (fullDataRowIdData[rowid]) {
-          tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
+          handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
         }
       }
       // 复选框
       reactData.selection = getRecoverRow(selection); // 刷新多选行状态
       // 还原保留选中状态
       if (checkboxOpts.reserve) {
-        tableMethods.setCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true);
+        handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true);
       }
       if (currentRow && !fullAllDataRowIdData[getRowid($xetable, currentRow)]) {
         reactData.currentRow = null; // 刷新当前行状态
@@ -26570,7 +26779,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 }
                 // 如果当前节点已选中，则展开后子节点也被选中
                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
-                  tableMethods.setCheckboxRow(childRows, true);
+                  handleCheckedCheckboxRow(childRows, true);
                 }
                 return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
                   if (transform) {
@@ -28046,13 +28255,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * @param {Boolean} value 是否选中
        */
       setCheckboxRow(rows, value) {
-        if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
-          rows = [rows];
-        }
-        rows.forEach(row => tablePrivateMethods.handleSelectRow({
-          row
-        }, !!value));
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleCheckedCheckboxRow(rows, value, true);
       },
       isCheckedByCheckboxRow(row) {
         const {
@@ -28077,9 +28280,17 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 多选，切换某一行的选中状态
        */
       toggleCheckboxRow(row) {
-        tablePrivateMethods.handleToggleCheckRowEvent(null, {
+        const {
+          selection
+        } = reactData;
+        const checkboxOpts = computeCheckboxOpts.value;
+        const {
+          checkField
+        } = checkboxOpts;
+        const value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
+        tablePrivateMethods.handleSelectRow({
           row
-        });
+        }, value, true);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       /**
@@ -28087,126 +28298,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * @param {Boolean} value 是否选中
        */
       setAllCheckboxRow(value) {
-        const {
-          treeConfig
-        } = props;
-        const {
-          selection
-        } = reactData;
-        const {
-          afterFullData,
-          checkboxReserveRowMap
-        } = internalData;
-        const treeOpts = computeTreeOpts.value;
-        const checkboxOpts = computeCheckboxOpts.value;
-        const {
-          checkField,
-          reserve,
-          checkStrictly,
-          checkMethod
-        } = checkboxOpts;
-        let selectRows = [];
-        const beforeSelection = treeConfig ? [] : selection.filter(row => $xetable.findRowIndexOf(afterFullData, row) === -1);
-        if (checkStrictly) {
-          reactData.isAllSelected = value;
-        } else {
-          /**
-           * 绑定属性方式（高性能，有污染）
-           * 必须在行数据存在对应的属性，否则将不响应
-           */
-          if (checkField) {
-            const checkValFn = row => {
-              if (!checkMethod || checkMethod({
-                row
-              })) {
-                if (value) {
-                  selectRows.push(row);
-                }
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
-              }
-            };
-            // 如果存在选中方法
-            // 如果方法成立，则更新值，否则忽略该数据
-            if (treeConfig) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, checkValFn, treeOpts);
-            } else {
-              afterFullData.forEach(checkValFn);
-            }
-          } else {
-            /**
-             * 默认方式（低性能，无污染）
-             * 无需任何属性，直接绑定
-             */
-            if (treeConfig) {
-              if (value) {
-                /**
-                 * 如果是树勾选
-                 * 如果方法成立，则添加到临时集合中
-                 */
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
-                  if (!checkMethod || checkMethod({
-                    row
-                  })) {
-                    selectRows.push(row);
-                  }
-                }, treeOpts);
-              } else {
-                /**
-                 * 如果是树取消
-                 * 如果方法成立，则不添加到临时集合中
-                 */
-                if (checkMethod) {
-                  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
-                    if (checkMethod({
-                      row
-                    }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
-                      selectRows.push(row);
-                    }
-                  }, treeOpts);
-                }
-              }
-            } else {
-              if (value) {
-                /**
-                 * 如果是行勾选
-                 * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
-                 * 如果不存在选中方法，则添加所有数据到临时集合中
-                 */
-                if (checkMethod) {
-                  selectRows = afterFullData.filter(row => $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({
-                    row
-                  }));
-                } else {
-                  selectRows = afterFullData.slice(0);
-                }
-              } else {
-                /**
-                 * 如果是行取消
-                 * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
-                 * 如果不存在选中方法，无需处理，临时集合默认为空
-                 */
-                if (checkMethod) {
-                  selectRows = afterFullData.filter(row => checkMethod({
-                    row
-                  }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1);
-                }
-              }
-            }
-          }
-          if (reserve) {
-            if (value) {
-              selectRows.forEach(row => {
-                checkboxReserveRowMap[getRowid($xetable, row)] = row;
-              });
-            } else {
-              afterFullData.forEach(row => handleCheckboxReserveRow(row, false));
-            }
-          }
-          reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
-        }
-        reactData.treeIndeterminates = [];
-        tablePrivateMethods.checkSelectionStatus();
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleCheckedAllCheckboxRow(value, true);
       },
       /**
        * 获取单选框保留选中的行
@@ -28342,7 +28434,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         const rowOpts = computeRowOpts.value;
         const el = refElem.value;
         tableMethods.clearCurrentRow();
-        tableMethods.clearCurrentColumn();
+        // tableMethods.clearCurrentColumn()
         reactData.currentRow = row;
         if (rowOpts.isCurrent || props.highlightCurrentRow) {
           if (el) {
@@ -28359,17 +28451,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * @param {Row} row 行对象
        */
       setRadioRow(row) {
-        const radioOpts = computeRadioOpts.value;
-        const {
-          checkMethod
-        } = radioOpts;
-        if (row && (!checkMethod || checkMethod({
-          row
-        }))) {
-          reactData.selectRow = row;
-          handleRadioReserveRow(row);
-        }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleCheckedRadioRow(row, true);
       },
       /**
        * 用于当前行，手动清空当前高亮的状态
@@ -28444,7 +28526,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       setCurrentColumn(fieldOrColumn) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn);
         if (column) {
-          tableMethods.clearCurrentRow();
+          // tableMethods.clearCurrentRow()
           tableMethods.clearCurrentColumn();
           reactData.currentColumn = column;
         }
@@ -30200,7 +30282,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        */
       handleSelectRow({
         row
-      }, value) {
+      }, value, isForce) {
         const {
           treeConfig
         } = props;
@@ -30228,7 +30310,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             } else {
               // 更新子节点状态
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], item => {
-                if ($xetable.eqRow(item, row) || !checkMethod || checkMethod({
+                if ($xetable.eqRow(item, row) || isForce || !checkMethod || checkMethod({
                   row: item
                 })) {
                   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, value);
@@ -30241,7 +30323,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, item => $xetable.eqRow(item, row), treeOpts);
             if (matchObj && matchObj.parent) {
               let parentStatus;
-              const vItems = checkMethod ? matchObj.items.filter(item => checkMethod({
+              const vItems = !isForce && checkMethod ? matchObj.items.filter(item => checkMethod({
                 row: item
               })) : matchObj.items;
               const indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, item => $xetable.findRowIndexOf(treeIndeterminates, item) > -1);
@@ -30253,10 +30335,10 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               }
               return tablePrivateMethods.handleSelectRow({
                 row: matchObj.parent
-              }, parentStatus);
+              }, parentStatus, isForce);
             }
           } else {
-            if (!checkMethod || checkMethod({
+            if (isForce || !checkMethod || checkMethod({
               row
             })) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
@@ -30273,7 +30355,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             } else {
               // 更新子节点状态
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], item => {
-                if ($xetable.eqRow(item, row) || !checkMethod || checkMethod({
+                if ($xetable.eqRow(item, row) || isForce || !checkMethod || checkMethod({
                   row: item
                 })) {
                   if (value) {
@@ -30290,7 +30372,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, item => $xetable.eqRow(item, row), treeOpts);
             if (matchObj && matchObj.parent) {
               let parentStatus;
-              const vItems = checkMethod ? matchObj.items.filter(item => checkMethod({
+              const vItems = !isForce && checkMethod ? matchObj.items.filter(item => checkMethod({
                 row: item
               })) : matchObj.items;
               const indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, item => $xetable.findRowIndexOf(treeIndeterminates, item) > -1);
@@ -30302,10 +30384,10 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               }
               return tablePrivateMethods.handleSelectRow({
                 row: matchObj.parent
-              }, parentStatus);
+              }, parentStatus, isForce);
             }
           } else {
-            if (!checkMethod || checkMethod({
+            if (isForce || !checkMethod || checkMethod({
               row
             })) {
               if (value) {
@@ -30636,7 +30718,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 多选，选中所有事件
        */
       triggerCheckAllEvent(evnt, value) {
-        tableMethods.setAllCheckboxRow(value);
+        handleCheckedAllCheckboxRow(value);
         if (evnt) {
           tableMethods.dispatchEvent('checkbox-all', {
             records: tableMethods.getCheckboxRecords(),
@@ -30660,7 +30742,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         let newValue = row;
         let isChange = oldValue !== newValue;
         if (isChange) {
-          tableMethods.setRadioRow(newValue);
+          handleCheckedRadioRow(newValue);
         } else if (!radioOpts.strict) {
           isChange = oldValue === newValue;
           if (isChange) {