From 896cbb6323dc4bf1c0d704dd0856c099462a61cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?= Date: Sat, 3 Feb 2018 16:08:13 +0800 Subject: [PATCH] Table: update selection isAllSelected (#9634) --- packages/table/src/table-store.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/table/src/table-store.js b/packages/table/src/table-store.js index e25e4ab10..f3451d848 100644 --- 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++; } }