vxe-table 4.3.9 → 4.3.10

package/lib/table/src/table.js

@@ -1769,7 +1769,7 @@ var _default = (0, _vue.defineComponent)({
         var checkAll = checkboxOpts.checkAll,
           checkRowKeys = checkboxOpts.checkRowKeys;
         if (checkAll) {
-          tableMethods.setAllCheckboxRow(true);
+          handleCheckedAllCheckboxRow(true, true);
         } else if (checkRowKeys) {
           var defSelection_1 = [];
           checkRowKeys.forEach(function (rowid) {
@@ -1777,7 +1777,7 @@ var _default = (0, _vue.defineComponent)({
               defSelection_1.push(fullDataRowIdData_1[rowid].row);
             }
           });
-          tableMethods.setCheckboxRow(defSelection_1, true);
+          handleCheckedCheckboxRow(defSelection_1, true, true);
         }
       }
     };
@@ -1794,7 +1794,7 @@ var _default = (0, _vue.defineComponent)({
           reserve = radioOpts.reserve;
         if (rowid) {
           if (fullDataRowIdData[rowid]) {
-            tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
+            handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
           }
           if (reserve) {
             var rowkey = (0, _util.getRowkey)($xetable);
@@ -1844,6 +1844,150 @@ var _default = (0, _vue.defineComponent)({
         }
       }
     };
+    var handleCheckedRadioRow = function (row, isForce) {
+      var radioOpts = computeRadioOpts.value;
+      var checkMethod = radioOpts.checkMethod;
+      if (row && (isForce || !checkMethod || checkMethod({
+        row: row
+      }))) {
+        reactData.selectRow = row;
+        handleRadioReserveRow(row);
+      }
+      return (0, _vue.nextTick)();
+    };
+    var handleCheckedCheckboxRow = function (rows, value, isForce) {
+      if (rows && !_xeUtils.default.isArray(rows)) {
+        rows = [rows];
+      }
+      rows.forEach(function (row) {
+        return tablePrivateMethods.handleSelectRow({
+          row: row
+        }, !!value, isForce);
+      });
+      return (0, _vue.nextTick)();
+    };
+    var handleCheckedAllCheckboxRow = function (value, isForce) {
+      var treeConfig = props.treeConfig;
+      var selection = reactData.selection;
+      var afterFullData = internalData.afterFullData,
+        checkboxReserveRowMap = internalData.checkboxReserveRowMap;
+      var treeOpts = computeTreeOpts.value;
+      var checkboxOpts = computeCheckboxOpts.value;
+      var checkField = checkboxOpts.checkField,
+        reserve = checkboxOpts.reserve,
+        checkStrictly = checkboxOpts.checkStrictly,
+        checkMethod = checkboxOpts.checkMethod;
+      var selectRows = [];
+      var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
+        return $xetable.findRowIndexOf(afterFullData, row) === -1;
+      });
+      if (checkStrictly) {
+        reactData.isAllSelected = value;
+      } else {
+        /**
+         * 绑定属性方式（高性能，有污染）
+         * 必须在行数据存在对应的属性，否则将不响应
+         */
+        if (checkField) {
+          var checkValFn = function (row) {
+            if (isForce || !checkMethod || checkMethod({
+              row: row
+            })) {
+              if (value) {
+                selectRows.push(row);
+              }
+              _xeUtils.default.set(row, checkField, value);
+            }
+          };
+          // 如果存在选中方法
+          // 如果方法成立，则更新值，否则忽略该数据
+          if (treeConfig) {
+            _xeUtils.default.eachTree(afterFullData, checkValFn, treeOpts);
+          } else {
+            afterFullData.forEach(checkValFn);
+          }
+        } else {
+          /**
+           * 默认方式（低性能，无污染）
+           * 无需任何属性，直接绑定
+           */
+          if (treeConfig) {
+            if (value) {
+              /**
+               * 如果是树勾选
+               * 如果方法成立，则添加到临时集合中
+               */
+              _xeUtils.default.eachTree(afterFullData, function (row) {
+                if (isForce || !checkMethod || checkMethod({
+                  row: row
+                })) {
+                  selectRows.push(row);
+                }
+              }, treeOpts);
+            } else {
+              /**
+               * 如果是树取消
+               * 如果方法成立，则不添加到临时集合中
+               */
+              if (!isForce && checkMethod) {
+                _xeUtils.default.eachTree(afterFullData, function (row) {
+                  if (checkMethod({
+                    row: row
+                  }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
+                    selectRows.push(row);
+                  }
+                }, treeOpts);
+              }
+            }
+          } else {
+            if (value) {
+              /**
+               * 如果是行勾选
+               * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
+               * 如果不存在选中方法，则添加所有数据到临时集合中
+               */
+              if (!isForce && checkMethod) {
+                selectRows = afterFullData.filter(function (row) {
+                  return $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({
+                    row: row
+                  });
+                });
+              } else {
+                selectRows = afterFullData.slice(0);
+              }
+            } else {
+              /**
+               * 如果是行取消
+               * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
+               * 如果不存在选中方法，无需处理，临时集合默认为空
+               */
+              if (!isForce && checkMethod) {
+                selectRows = afterFullData.filter(function (row) {
+                  return checkMethod({
+                    row: row
+                  }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1;
+                });
+              }
+            }
+          }
+        }
+        if (reserve) {
+          if (value) {
+            selectRows.forEach(function (row) {
+              checkboxReserveRowMap[(0, _util.getRowid)($xetable, row)] = row;
+            });
+          } else {
+            afterFullData.forEach(function (row) {
+              return handleCheckboxReserveRow(row, false);
+            });
+          }
+        }
+        reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
+      }
+      reactData.treeIndeterminates = [];
+      tablePrivateMethods.checkSelectionStatus();
+      return (0, _vue.nextTick)();
+    };
     // 还原展开、选中等相关状态
     var handleReserveStatus = function () {
       var treeConfig = props.treeConfig;
@@ -1868,14 +2012,14 @@ var _default = (0, _vue.defineComponent)({
       if (radioOpts.reserve && radioReserveRow) {
         var rowid = (0, _util.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[(0, _util.getRowid)($xetable, currentRow)]) {
         reactData.currentRow = null; // 刷新当前行状态
@@ -1950,7 +2094,7 @@ var _default = (0, _vue.defineComponent)({
                 }
                 // 如果当前节点已选中，则展开后子节点也被选中
                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
-                  tableMethods.setCheckboxRow(childRows, true);
+                  handleCheckedCheckboxRow(childRows, true);
                 }
                 return (0, _vue.nextTick)().then(function () {
                   if (transform) {
@@ -3342,15 +3486,7 @@ var _default = (0, _vue.defineComponent)({
        * @param {Boolean} value 是否选中
        */
       setCheckboxRow: function (rows, value) {
-        if (rows && !_xeUtils.default.isArray(rows)) {
-          rows = [rows];
-        }
-        rows.forEach(function (row) {
-          return tablePrivateMethods.handleSelectRow({
-            row: row
-          }, !!value);
-        });
-        return (0, _vue.nextTick)();
+        return handleCheckedCheckboxRow(rows, value, true);
       },
       isCheckedByCheckboxRow: function (row) {
         var selection = reactData.selection;
@@ -3369,9 +3505,13 @@ var _default = (0, _vue.defineComponent)({
        * 多选，切换某一行的选中状态
        */
       toggleCheckboxRow: function (row) {
-        tablePrivateMethods.handleToggleCheckRowEvent(null, {
+        var selection = reactData.selection;
+        var checkboxOpts = computeCheckboxOpts.value;
+        var checkField = checkboxOpts.checkField;
+        var value = checkField ? !_xeUtils.default.get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
+        tablePrivateMethods.handleSelectRow({
           row: row
-        });
+        }, value, true);
         return (0, _vue.nextTick)();
       },
       /**
@@ -3379,126 +3519,7 @@ var _default = (0, _vue.defineComponent)({
        * @param {Boolean} value 是否选中
        */
       setAllCheckboxRow: function (value) {
-        var treeConfig = props.treeConfig;
-        var selection = reactData.selection;
-        var afterFullData = internalData.afterFullData,
-          checkboxReserveRowMap = internalData.checkboxReserveRowMap;
-        var treeOpts = computeTreeOpts.value;
-        var checkboxOpts = computeCheckboxOpts.value;
-        var checkField = checkboxOpts.checkField,
-          reserve = checkboxOpts.reserve,
-          checkStrictly = checkboxOpts.checkStrictly,
-          checkMethod = checkboxOpts.checkMethod;
-        var selectRows = [];
-        var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
-          return $xetable.findRowIndexOf(afterFullData, row) === -1;
-        });
-        if (checkStrictly) {
-          reactData.isAllSelected = value;
-        } else {
-          /**
-           * 绑定属性方式（高性能，有污染）
-           * 必须在行数据存在对应的属性，否则将不响应
-           */
-          if (checkField) {
-            var checkValFn = function (row) {
-              if (!checkMethod || checkMethod({
-                row: row
-              })) {
-                if (value) {
-                  selectRows.push(row);
-                }
-                _xeUtils.default.set(row, checkField, value);
-              }
-            };
-            // 如果存在选中方法
-            // 如果方法成立，则更新值，否则忽略该数据
-            if (treeConfig) {
-              _xeUtils.default.eachTree(afterFullData, checkValFn, treeOpts);
-            } else {
-              afterFullData.forEach(checkValFn);
-            }
-          } else {
-            /**
-             * 默认方式（低性能，无污染）
-             * 无需任何属性，直接绑定
-             */
-            if (treeConfig) {
-              if (value) {
-                /**
-                 * 如果是树勾选
-                 * 如果方法成立，则添加到临时集合中
-                 */
-                _xeUtils.default.eachTree(afterFullData, function (row) {
-                  if (!checkMethod || checkMethod({
-                    row: row
-                  })) {
-                    selectRows.push(row);
-                  }
-                }, treeOpts);
-              } else {
-                /**
-                 * 如果是树取消
-                 * 如果方法成立，则不添加到临时集合中
-                 */
-                if (checkMethod) {
-                  _xeUtils.default.eachTree(afterFullData, function (row) {
-                    if (checkMethod({
-                      row: row
-                    }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
-                      selectRows.push(row);
-                    }
-                  }, treeOpts);
-                }
-              }
-            } else {
-              if (value) {
-                /**
-                 * 如果是行勾选
-                 * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
-                 * 如果不存在选中方法，则添加所有数据到临时集合中
-                 */
-                if (checkMethod) {
-                  selectRows = afterFullData.filter(function (row) {
-                    return $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({
-                      row: row
-                    });
-                  });
-                } else {
-                  selectRows = afterFullData.slice(0);
-                }
-              } else {
-                /**
-                 * 如果是行取消
-                 * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
-                 * 如果不存在选中方法，无需处理，临时集合默认为空
-                 */
-                if (checkMethod) {
-                  selectRows = afterFullData.filter(function (row) {
-                    return checkMethod({
-                      row: row
-                    }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1;
-                  });
-                }
-              }
-            }
-          }
-          if (reserve) {
-            if (value) {
-              selectRows.forEach(function (row) {
-                checkboxReserveRowMap[(0, _util.getRowid)($xetable, row)] = row;
-              });
-            } else {
-              afterFullData.forEach(function (row) {
-                return handleCheckboxReserveRow(row, false);
-              });
-            }
-          }
-          reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
-        }
-        reactData.treeIndeterminates = [];
-        tablePrivateMethods.checkSelectionStatus();
-        return (0, _vue.nextTick)();
+        return handleCheckedAllCheckboxRow(value, true);
       },
       /**
        * 获取单选框保留选中的行
@@ -3630,7 +3651,7 @@ var _default = (0, _vue.defineComponent)({
         var rowOpts = computeRowOpts.value;
         var el = refElem.value;
         tableMethods.clearCurrentRow();
-        tableMethods.clearCurrentColumn();
+        // tableMethods.clearCurrentColumn()
         reactData.currentRow = row;
         if (rowOpts.isCurrent || props.highlightCurrentRow) {
           if (el) {
@@ -3649,15 +3670,7 @@ var _default = (0, _vue.defineComponent)({
        * @param {Row} row 行对象
        */
       setRadioRow: function (row) {
-        var radioOpts = computeRadioOpts.value;
-        var checkMethod = radioOpts.checkMethod;
-        if (row && (!checkMethod || checkMethod({
-          row: row
-        }))) {
-          reactData.selectRow = row;
-          handleRadioReserveRow(row);
-        }
-        return (0, _vue.nextTick)();
+        return handleCheckedRadioRow(row, true);
       },
       /**
        * 用于当前行，手动清空当前高亮的状态
@@ -3730,7 +3743,7 @@ var _default = (0, _vue.defineComponent)({
       setCurrentColumn: function (fieldOrColumn) {
         var column = (0, _util.handleFieldOrColumn)($xetable, fieldOrColumn);
         if (column) {
-          tableMethods.clearCurrentRow();
+          // tableMethods.clearCurrentRow()
           tableMethods.clearCurrentColumn();
           reactData.currentColumn = column;
         }
@@ -5366,7 +5379,7 @@ var _default = (0, _vue.defineComponent)({
        * 多选，行选中事件
        * value 选中true 不选false 半选-1
        */
-      handleSelectRow: function (_a, value) {
+      handleSelectRow: function (_a, value, isForce) {
         var row = _a.row;
         var treeConfig = props.treeConfig;
         var selection = reactData.selection,
@@ -5387,7 +5400,7 @@ var _default = (0, _vue.defineComponent)({
             } else {
               // 更新子节点状态
               _xeUtils.default.eachTree([row], function (item) {
-                if ($xetable.eqRow(item, row) || !checkMethod || checkMethod({
+                if ($xetable.eqRow(item, row) || isForce || !checkMethod || checkMethod({
                   row: item
                 })) {
                   _xeUtils.default.set(item, checkField, value);
@@ -5404,7 +5417,7 @@ var _default = (0, _vue.defineComponent)({
             }, treeOpts);
             if (matchObj && matchObj.parent) {
               var parentStatus = void 0;
-              var vItems_1 = checkMethod ? matchObj.items.filter(function (item) {
+              var vItems_1 = !isForce && checkMethod ? matchObj.items.filter(function (item) {
                 return checkMethod({
                   row: item
                 });
@@ -5424,10 +5437,10 @@ var _default = (0, _vue.defineComponent)({
               }
               return tablePrivateMethods.handleSelectRow({
                 row: matchObj.parent
-              }, parentStatus);
+              }, parentStatus, isForce);
             }
           } else {
-            if (!checkMethod || checkMethod({
+            if (isForce || !checkMethod || checkMethod({
               row: row
             })) {
               _xeUtils.default.set(row, checkField, value);
@@ -5446,7 +5459,7 @@ var _default = (0, _vue.defineComponent)({
             } else {
               // 更新子节点状态
               _xeUtils.default.eachTree([row], function (item) {
-                if ($xetable.eqRow(item, row) || !checkMethod || checkMethod({
+                if ($xetable.eqRow(item, row) || isForce || !checkMethod || checkMethod({
                   row: item
                 })) {
                   if (value) {
@@ -5469,7 +5482,7 @@ var _default = (0, _vue.defineComponent)({
             }, treeOpts);
             if (matchObj && matchObj.parent) {
               var parentStatus = void 0;
-              var vItems_2 = checkMethod ? matchObj.items.filter(function (item) {
+              var vItems_2 = !isForce && checkMethod ? matchObj.items.filter(function (item) {
                 return checkMethod({
                   row: item
                 });
@@ -5489,10 +5502,10 @@ var _default = (0, _vue.defineComponent)({
               }
               return tablePrivateMethods.handleSelectRow({
                 row: matchObj.parent
-              }, parentStatus);
+              }, parentStatus, isForce);
             }
           } else {
-            if (!checkMethod || checkMethod({
+            if (isForce || !checkMethod || checkMethod({
               row: row
             })) {
               if (value) {
@@ -5784,7 +5797,7 @@ var _default = (0, _vue.defineComponent)({
        * 多选，选中所有事件
        */
       triggerCheckAllEvent: function (evnt, value) {
-        tableMethods.setAllCheckboxRow(value);
+        handleCheckedAllCheckboxRow(value);
         if (evnt) {
           tableMethods.dispatchEvent('checkbox-all', {
             records: tableMethods.getCheckboxRecords(),
@@ -5804,7 +5817,7 @@ var _default = (0, _vue.defineComponent)({
         var newValue = row;
         var isChange = oldValue !== newValue;
         if (isChange) {
-          tableMethods.setRadioRow(newValue);
+          handleCheckedRadioRow(newValue);
         } else if (!radioOpts.strict) {
           isChange = oldValue === newValue;
           if (isChange) {