diff --git a/dist/bundle.js b/dist/bundle.js index c4a7af24d..96a29949c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -89152,7 +89152,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); @@ -96802,7 +96806,11 @@ BI.QuarterCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue() || ""; + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); @@ -102316,7 +102324,11 @@ BI.YearCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value; + } else { + return this.popup.getValue(); + } } }); BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; @@ -102576,6 +102588,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, { }); this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { + self.getValue(); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); }); this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { diff --git a/dist/fineui.js b/dist/fineui.js index d991a7230..1aa142ac5 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -90958,7 +90958,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); @@ -98608,7 +98612,11 @@ BI.QuarterCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue() || ""; + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); @@ -104122,7 +104130,11 @@ BI.YearCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value; + } else { + return this.popup.getValue(); + } } }); BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; @@ -104382,6 +104394,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, { }); this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { + self.getValue(); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); }); this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { diff --git a/dist/widget.js b/dist/widget.js index 93bcc3361..0d39d10db 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -4307,7 +4307,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); @@ -11957,7 +11961,11 @@ BI.QuarterCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue() || ""; + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); @@ -17471,7 +17479,11 @@ BI.YearCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value; + } else { + return this.popup.getValue(); + } } }); BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; @@ -17731,6 +17743,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, { }); this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { + self.getValue(); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); }); this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { diff --git a/src/widget/month/combo.month.js b/src/widget/month/combo.month.js index 9c2a9aa79..0d545ab42 100644 --- a/src/widget/month/combo.month.js +++ b/src/widget/month/combo.month.js @@ -78,7 +78,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); diff --git a/src/widget/quarter/combo.quarter.js b/src/widget/quarter/combo.quarter.js index aa2b64215..d22a89c59 100644 --- a/src/widget/quarter/combo.quarter.js +++ b/src/widget/quarter/combo.quarter.js @@ -78,7 +78,11 @@ BI.QuarterCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue() || ""; + if (BI.isNull(this.popup)) { + return this.options.value || ""; + } else { + return this.popup.getValue() || ""; + } } }); diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index 6de16ae16..94d82e5ee 100644 --- a/src/widget/year/combo.year.js +++ b/src/widget/year/combo.year.js @@ -97,7 +97,11 @@ BI.YearCombo = BI.inherit(BI.Widget, { }, getValue: function () { - return this.popup.getValue(); + if (BI.isNull(this.popup)) { + return this.options.value; + } else { + return this.popup.getValue(); + } } }); BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index 38410e0ac..e69fa0736 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -39,6 +39,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, { }); this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { + self.getValue(); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); }); this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {