Table: update selection isAllSelected (#9634)

896cbb63 · 杨奕 · GitHub · b68f18aa · 896cbb63
Commit 896cbb63 authored Feb 03, 2018 by 杨奕 Committed by GitHub Feb 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 14 deletions

packages/table/src/table-store.js packages/table/src/table-store.js +5 -14

No files found.
--- a/packages/table/src/table-store.js
+++ b/packages/table/src/table-store.js
@@ -502,23 +502,14 @@ TableStore.prototype.updateAllSelected = function() {
  let selectedCount = 0;
  for (let i = 0, j = data.length; i < j; i++) {
    const item = data[i];
-    if (selectable) {
-      const isRowSelectable = selectable.call(null, item, i);
-      if (isRowSelectable) {
-        if (!isSelected(item)) {
-          isAllSelected = false;
-          break;
-        } else {
-          selectedCount++;
-        }
-      }
-    } else {
-      if (!isSelected(item)) {
+    const isRowSelectable = selectable && selectable.call(null, item, i);
+    if (!isSelected(item)) {
+      if (!selectable || isRowSelectable) {
        isAllSelected = false;
        break;
-      } else {
-        selectedCount++;
      }
+    } else {
+      selectedCount++;
    }
  }