diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index e694ee8e3b..543d5fed73 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -515,7 +515,7 @@ populate: function (items) { this._assertPopupView(); this.popupView.populate.apply(this.popupView, arguments); - this.combo.populate.apply(this.combo, arguments); + this.combo.populate && this.combo.populate.apply(this.combo, arguments); }, _setEnable: function (arg) { diff --git a/src/base/combination/expander.js b/src/base/combination/expander.js index 58c3ed70bf..4e6ab7b58a 100644 --- a/src/base/combination/expander.js +++ b/src/base/combination/expander.js @@ -197,7 +197,7 @@ BI.Expander = BI.inherit(BI.Widget, { populate: function (items) { // this._assertPopupView(); this.popupView && this.popupView.populate.apply(this.popupView, arguments); - this.expander.populate.apply(this.expander, arguments); + this.expander.populate && this.expander.populate.apply(this.expander, arguments); }, _setEnable: function (arg) { diff --git a/src/base/combination/switcher.js b/src/base/combination/switcher.js index e3a73bcda5..cdaaf88dea 100644 --- a/src/base/combination/switcher.js +++ b/src/base/combination/switcher.js @@ -194,7 +194,7 @@ BI.Switcher = BI.inherit(BI.Widget, { populate: function (items) { this._assertPopupView(); this.popupView.populate.apply(this.popupView, arguments); - this.switcher.populate.apply(this.switcher, arguments); + this.switcher.populate && this.switcher.populate.apply(this.switcher, arguments); }, _setEnable: function (arg) { diff --git a/src/base/single/trigger/trigger.js b/src/base/single/trigger/trigger.js index 1652136ead..8c881bf6f5 100644 --- a/src/base/single/trigger/trigger.js +++ b/src/base/single/trigger/trigger.js @@ -23,5 +23,5 @@ BI.Trigger = BI.inherit(BI.Single, { getKey: function () { - } + }, }); \ No newline at end of file diff --git a/src/core/widget.js b/src/core/widget.js index 0af5b6d90a..42628f1d4a 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -565,7 +565,7 @@ }, // 默认的populate方法就是干掉重来 - populate: function () { + reset: function () { this.purgeListeners(); this.empty(); this._initCurrent();