From c863cd967c5890d3b8b821eeceb867e0014a8eb0 Mon Sep 17 00:00:00 2001 From: "Aeolus.Zhang" Date: Thu, 19 May 2022 20:08:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-105186:=E5=A4=8D=E9=80=89=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=85=A8=E9=80=89=E9=80=BB=E8=BE=91=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=94=99=E8=AF=AF,type:2=E8=AE=BE=E7=BD=AE=E5=85=A8?= =?UTF-8?q?=E9=80=89=E6=97=B6,=E5=88=A4=E6=96=AD=E5=85=A8=E9=80=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=80=89=E6=8B=A9=E7=8A=B6=E6=80=81=E9=9C=80?= =?UTF-8?q?=E8=80=83=E8=99=91=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/list/list.select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js index 12037b9a9..bab4a15af 100644 --- a/src/case/list/list.select.js +++ b/src/case/list/list.select.js @@ -94,7 +94,7 @@ BI.SelectList = BI.inherit(BI.Widget, { var hasNext = this.list.hasNext(); var isAlreadyAllSelected = this.toolbar.isSelected(); var isHalf = selectLength > 0 && notSelectLength > 0; - var allSelected = isAlreadyAllSelected; + var allSelected = selectLength > 0 && notSelectLength <= 0 && (!hasNext || isAlreadyAllSelected); if (this.isAllSelected() === false) { hasNext && (isHalf = selectLength > 0); From 1bb8913a1a853cb6bb6aca99a153e3b43ab6bd42 Mon Sep 17 00:00:00 2001 From: "Aeolus.Zhang" Date: Thu, 19 May 2022 20:14:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-105186:=E5=A4=8D=E9=80=89=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=85=A8=E9=80=89=E9=80=BB=E8=BE=91=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=94=99=E8=AF=AF,type:2=E8=AE=BE=E7=BD=AE=E5=85=A8?= =?UTF-8?q?=E9=80=89=E6=97=B6,=E5=88=A4=E6=96=AD=E5=85=A8=E9=80=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=80=89=E6=8B=A9=E7=8A=B6=E6=80=81=E9=9C=80?= =?UTF-8?q?=E8=80=83=E8=99=91=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/list/list.select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js index 12037b9a9..bab4a15af 100644 --- a/src/case/list/list.select.js +++ b/src/case/list/list.select.js @@ -94,7 +94,7 @@ BI.SelectList = BI.inherit(BI.Widget, { var hasNext = this.list.hasNext(); var isAlreadyAllSelected = this.toolbar.isSelected(); var isHalf = selectLength > 0 && notSelectLength > 0; - var allSelected = isAlreadyAllSelected; + var allSelected = selectLength > 0 && notSelectLength <= 0 && (!hasNext || isAlreadyAllSelected); if (this.isAllSelected() === false) { hasNext && (isHalf = selectLength > 0);