From f47484a4c937145a64c712b4ad0a2da4c42ffccd Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 8 Mar 2018 15:43:47 +0800 Subject: [PATCH] update --- dist/bundle.js | 19 ++++++++++++++++--- dist/fineui.js | 19 ++++++++++++++++--- dist/widget.js | 19 ++++++++++++++++--- src/widget/month/combo.month.js | 6 +++++- src/widget/quarter/combo.quarter.js | 6 +++++- src/widget/year/combo.year.js | 6 +++++- src/widget/yearmonth/combo.yearmonth.js | 1 + 7 files changed, 64 insertions(+), 12 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index d6be42e8f3..3ec51dd9b0 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -89203,7 +89203,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() || ""; + } } }); @@ -96853,7 +96857,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() || ""; + } } }); @@ -102367,7 +102375,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"; @@ -102627,6 +102639,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 aba8589c85..693cd3ab0a 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -91009,7 +91009,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() || ""; + } } }); @@ -98659,7 +98663,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() || ""; + } } }); @@ -104173,7 +104181,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"; @@ -104433,6 +104445,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 93bcc3361a..0d39d10db5 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 9c2a9aa796..0d545ab425 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 aa2b64215a..d22a89c591 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 6de16ae168..94d82e5ee5 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 38410e0ac3..e69fa07361 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 () {