From 5305303cb593bab2620dc5bef83472d1964589be Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 4 Jun 2021 10:50:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=85=A8?=
 =?UTF-8?q?=E9=80=89=E5=90=8E=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E5=B7=B2?=
 =?UTF-8?q?=E9=80=89=E5=A4=9A=E5=8F=91=E4=BA=86=E4=B8=80=E6=AC=A1=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/combination/switcher.js                         | 6 +++++-
 src/widget/multiselect/trigger/switcher.checkselected.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/base/combination/switcher.js b/src/base/combination/switcher.js
index cdaaf88de..77dc78752 100644
--- a/src/base/combination/switcher.js
+++ b/src/base/combination/switcher.js
@@ -191,9 +191,13 @@ BI.Switcher = BI.inherit(BI.Widget, {
         }, this.getName());
     },
 
-    populate: function (items) {
+    _populate: function () {
         this._assertPopupView();
         this.popupView.populate.apply(this.popupView, arguments);
+    },
+
+    populate: function (items) {
+        this._populate.apply(this, arguments);
         this.switcher.populate && this.switcher.populate.apply(this.switcher, arguments);
     },
 
diff --git a/src/widget/multiselect/trigger/switcher.checkselected.js b/src/widget/multiselect/trigger/switcher.checkselected.js
index 33be0de04..6804c2c5e 100644
--- a/src/widget/multiselect/trigger/switcher.checkselected.js
+++ b/src/widget/multiselect/trigger/switcher.checkselected.js
@@ -62,7 +62,7 @@ BI.MultiSelectCheckSelectedSwitcher = BI.inherit(BI.Widget, {
         this.switcher.on(BI.Switcher.EVENT_AFTER_POPUPVIEW, function () {
             var me = this;
             BI.nextTick(function () {
-                me.populate();
+                me._populate();
             });
         });
     },

From 128f58ce4846e80c359ada29cca8802eeea2497a Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 4 Jun 2021 14:03:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?JSY-7060=20fix:=20stopEditor=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/editor/editor.search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/editor/editor.search.js b/src/widget/editor/editor.search.js
index b2ae7cb02..5ab35b31e 100644
--- a/src/widget/editor/editor.search.js
+++ b/src/widget/editor/editor.search.js
@@ -35,7 +35,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         });
         this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
             self.setValue("");
-            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.STOPEDIT);
+            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.STOPEDIT, self.getValue());
             // 从有内容到无内容的清空也是一次change
             self.fireEvent(BI.SearchEditor.EVENT_CHANGE);
             self.fireEvent(BI.SearchEditor.EVENT_CLEAR);