From 285c0ec6f743eb6bbf9c29d2c89a5f01b379b3d5 Mon Sep 17 00:00:00 2001
From: Guyi <Guyi@fanruan.com>
Date: Sun, 1 Aug 2021 17:02:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?JSY-8352=20fix=EF=BC=9ADownListGroupItem?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=AD=97=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/widget/downlist/popup.downlist.less |  4 ++++
 src/widget/downlist/item.downlistgroup.js    | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/less/widget/downlist/popup.downlist.less b/src/less/widget/downlist/popup.downlist.less
index cdddf37da..3d323dffb 100644
--- a/src/less/widget/downlist/popup.downlist.less
+++ b/src/less/widget/downlist/popup.downlist.less
@@ -3,6 +3,10 @@
 .bi-down-list-popup {
   & .list-group-item-text {
     max-width: 203px;
+
+    &.active {
+      color: @color-bi-text-highlight;
+    }
   }
   & .bi-down-list-item {
     & .list-item-text {
diff --git a/src/widget/downlist/item.downlistgroup.js b/src/widget/downlist/item.downlistgroup.js
index d89132f47..6fc079c73 100644
--- a/src/widget/downlist/item.downlistgroup.js
+++ b/src/widget/downlist/item.downlistgroup.js
@@ -16,12 +16,14 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
         var o = this.options;
         var self = this;
         this.text = BI.createWidget({
-            type: "bi.label",
+            type: "bi.text_button",
             cls: "list-group-item-text",
             textAlign: "left",
             text: o.text,
             value: o.value,
-            height: o.height
+            height: o.height,
+            disableSelected: true,
+            selected: this._digest(o.value)
         });
 
         this.icon1 = BI.createWidget({
@@ -114,7 +116,9 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
     },
 
     setValue: function (v) {
-        this.icon1.setSelected(this._digest(v));
+        const selected = this._digest(v);
+        this.icon1.setSelected(selected);
+        this.text.setSelected(selected);
     }
 });
 BI.DownListGroupItem.EVENT_CHANGE = "EVENT_CHANGE";

From 7145f6261ad274728b2c07e587dbff7ee9466467 Mon Sep 17 00:00:00 2001
From: Guyi <Guyi@fanruan.com>
Date: Mon, 2 Aug 2021 10:31:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"JSY-8352=20fix=EF=BC=9ADownListGr?=
 =?UTF-8?q?oupItem=E4=B8=AD=E6=96=87=E5=AD=97=E9=AB=98=E4=BA=AE"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 285c0ec6f743eb6bbf9c29d2c89a5f01b379b3d5.
---
 src/less/widget/downlist/popup.downlist.less |  4 ----
 src/widget/downlist/item.downlistgroup.js    | 10 +++-------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/less/widget/downlist/popup.downlist.less b/src/less/widget/downlist/popup.downlist.less
index 3d323dffb..cdddf37da 100644
--- a/src/less/widget/downlist/popup.downlist.less
+++ b/src/less/widget/downlist/popup.downlist.less
@@ -3,10 +3,6 @@
 .bi-down-list-popup {
   & .list-group-item-text {
     max-width: 203px;
-
-    &.active {
-      color: @color-bi-text-highlight;
-    }
   }
   & .bi-down-list-item {
     & .list-item-text {
diff --git a/src/widget/downlist/item.downlistgroup.js b/src/widget/downlist/item.downlistgroup.js
index 6fc079c73..d89132f47 100644
--- a/src/widget/downlist/item.downlistgroup.js
+++ b/src/widget/downlist/item.downlistgroup.js
@@ -16,14 +16,12 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
         var o = this.options;
         var self = this;
         this.text = BI.createWidget({
-            type: "bi.text_button",
+            type: "bi.label",
             cls: "list-group-item-text",
             textAlign: "left",
             text: o.text,
             value: o.value,
-            height: o.height,
-            disableSelected: true,
-            selected: this._digest(o.value)
+            height: o.height
         });
 
         this.icon1 = BI.createWidget({
@@ -116,9 +114,7 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
     },
 
     setValue: function (v) {
-        const selected = this._digest(v);
-        this.icon1.setSelected(selected);
-        this.text.setSelected(selected);
+        this.icon1.setSelected(this._digest(v));
     }
 });
 BI.DownListGroupItem.EVENT_CHANGE = "EVENT_CHANGE";

From d448a3fb49e1bafe63f73a87b1676c2f87f7cc1e Mon Sep 17 00:00:00 2001
From: Guyi <Guyi@fanruan.com>
Date: Thu, 5 Aug 2021 14:23:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/controller/controller.popover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/controller/controller.popover.js b/src/core/controller/controller.popover.js
index 6c88a3e56..fbe7e29d9 100644
--- a/src/core/controller/controller.popover.js
+++ b/src/core/controller/controller.popover.js
@@ -138,7 +138,7 @@ BI.PopoverController = BI.inherit(BI.Controller, {
     },
 
     remove: function (name) {
-        if (!this._check(name)) {
+        if (!this.has(name)) {
             return this;
         }
         this.floatContainer[name].destroy();