vxe-table 3.4.14-beta.0 → 3.4.14-beta.1

package/lib/index.umd.js

@@ -12372,29 +12372,28 @@ var Cell = {
     var $table = params.$table,
         column = params.column,
         isHidden = params.isHidden;
-    var isAllCheckboxIndeterminate = $table.isIndeterminate,
+    var isAllCheckboxSelected = $table.isAllSelected,
+        isAllCheckboxIndeterminate = $table.isIndeterminate,
         isAllCheckboxDisabled = $table.isAllCheckboxDisabled;
     var slots = column.slots;
     var headerSlot = slots ? slots.header : null;
     var titleSlot = slots ? slots.title : null;
     var checkboxOpts = $table.checkboxOpts;
     var headerTitle = column.getTitle();
-    var isChecked = false;
     var on;
 
     if (!isHidden) {
-      isChecked = isAllCheckboxDisabled ? false : $table.isAllSelected;
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
-            $table.triggerCheckAllEvent(evnt, !isChecked);
+            $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
       };
     }
 
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
-      checked: isChecked,
+      checked: isAllCheckboxSelected,
       disabled: isAllCheckboxDisabled,
       indeterminate: isAllCheckboxIndeterminate
     });
@@ -12411,7 +12410,7 @@ var Cell = {
 
     return renderTitleContent(h, checkboxParams, [h('span', {
       class: ['vxe-cell--checkbox', {
-        'is--checked': isChecked,
+        'is--checked': isAllCheckboxSelected,
         'is--disabled': isAllCheckboxDisabled,
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
@@ -16812,17 +16811,31 @@ var Methods = {
         checkMethod = checkboxOpts.checkMethod;
 
     if (!checkStrictly) {
+      var disableRows = [];
+      var checkRows = [];
+      var isAllResolve = false;
       var isAllSelected = false;
       var isIndeterminate = false;
 
       if (checkField) {
-        isAllSelected = afterFullData.length && afterFullData.every(checkMethod ? function (row) {
-          return !checkMethod({
+        isAllResolve = afterFullData.every(checkMethod ? function (row) {
+          if (!checkMethod({
             row: row
-          }) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
+          })) {
+            disableRows.push(row);
+            return true;
+          }
+
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField)) {
+            checkRows.push(row);
+            return true;
+          }
+
+          return false;
         } : function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
         });
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
 
         if (treeConfig) {
           if (halfField) {
@@ -16846,13 +16859,24 @@ var Methods = {
           }
         }
       } else {
-        isAllSelected = afterFullData.length && afterFullData.every(checkMethod ? function (row) {
-          return !checkMethod({
+        isAllResolve = afterFullData.every(checkMethod ? function (row) {
+          if (!checkMethod({
             row: row
-          }) || selection.indexOf(row) > -1;
+          })) {
+            disableRows.push(row);
+            return true;
+          }
+
+          if (selection.indexOf(row) > -1) {
+            checkRows.push(row);
+            return true;
+          }
+
+          return false;
         } : function (row) {
           return selection.indexOf(row) > -1;
         });
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
 
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {