diff --git a/src/widget/multiselect/trigger/button.checkselected.js b/src/widget/multiselect/trigger/button.checkselected.js index 15d302a32..47a5ca995 100644 --- a/src/widget/multiselect/trigger/button.checkselected.js +++ b/src/widget/multiselect/trigger/button.checkselected.js @@ -51,6 +51,14 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, { o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH }, function (res) { + if (BI.isNotEmptyString(res.count)) { + BI.nextTick(function () { + self.numberCounter.setText(res.count); + self.setVisible(true); + }); + + return; + } var length = res.count - ob.value.length; BI.nextTick(function () { self.numberCounter.setText(length); @@ -88,4 +96,4 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, { }); BI.MultiSelectCheckSelectedButton.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.multi_select_check_selected_button", BI.MultiSelectCheckSelectedButton); \ No newline at end of file +BI.shortcut("bi.multi_select_check_selected_button", BI.MultiSelectCheckSelectedButton); diff --git a/src/widget/timeinterval/dateinterval.js b/src/widget/timeinterval/dateinterval.js index 894898e32..38f080d7e 100644 --- a/src/widget/timeinterval/dateinterval.js +++ b/src/widget/timeinterval/dateinterval.js @@ -71,6 +71,12 @@ BI.DateInterval = BI.inherit(BI.Single, { behaviors: o.behaviors, value: v, height: o.height, + listeners: [{ + eventName: BI.DynamicDateCombo.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW, + action: function () { + self.fireEvent(BI.DateInterval.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW); + } + }] }); combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () { self._clearTitle(); @@ -180,4 +186,5 @@ BI.DateInterval = BI.inherit(BI.Single, { BI.DateInterval.EVENT_VALID = "EVENT_VALID"; BI.DateInterval.EVENT_ERROR = "EVENT_ERROR"; BI.DateInterval.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.date_interval", BI.DateInterval); \ No newline at end of file +BI.DateInterval.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; +BI.shortcut("bi.date_interval", BI.DateInterval);