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/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); 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(); }); }); },