windy 7 years ago
parent
commit
f47484a4c9
  1. 15
      dist/bundle.js
  2. 15
      dist/fineui.js
  3. 15
      dist/widget.js
  4. 6
      src/widget/month/combo.month.js
  5. 4
      src/widget/quarter/combo.quarter.js
  6. 4
      src/widget/year/combo.year.js
  7. 1
      src/widget/yearmonth/combo.yearmonth.js

15
dist/bundle.js vendored

@ -89203,7 +89203,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
return this.popup.getValue(); if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || "";
}
} }
}); });
@ -96853,8 +96857,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || ""; return this.popup.getValue() || "";
} }
}
}); });
BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@ -102367,8 +102375,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value;
} else {
return this.popup.getValue(); return this.popup.getValue();
} }
}
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
@ -102627,6 +102639,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
}); });
this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
self.getValue();
self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
}); });
this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

15
dist/fineui.js vendored

@ -91009,7 +91009,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
return this.popup.getValue(); if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || "";
}
} }
}); });
@ -98659,8 +98663,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || ""; return this.popup.getValue() || "";
} }
}
}); });
BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@ -104173,8 +104181,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value;
} else {
return this.popup.getValue(); return this.popup.getValue();
} }
}
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
@ -104433,6 +104445,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
}); });
this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
self.getValue();
self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
}); });
this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

15
dist/widget.js vendored

@ -4307,7 +4307,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
return this.popup.getValue(); if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || "";
}
} }
}); });
@ -11957,8 +11961,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || ""; return this.popup.getValue() || "";
} }
}
}); });
BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@ -17471,8 +17479,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value;
} else {
return this.popup.getValue(); return this.popup.getValue();
} }
}
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
@ -17731,6 +17743,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
}); });
this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
self.getValue();
self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
}); });
this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

6
src/widget/month/combo.month.js

@ -78,7 +78,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
return this.popup.getValue(); if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || "";
}
} }
}); });

4
src/widget/quarter/combo.quarter.js

@ -78,8 +78,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value || "";
} else {
return this.popup.getValue() || ""; return this.popup.getValue() || "";
} }
}
}); });
BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";

4
src/widget/year/combo.year.js

@ -97,8 +97,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
if (BI.isNull(this.popup)) {
return this.options.value;
} else {
return this.popup.getValue(); return this.popup.getValue();
} }
}
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

1
src/widget/yearmonth/combo.yearmonth.js

@ -39,6 +39,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
}); });
this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () { this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
self.getValue();
self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM); self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
}); });
this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () { this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

Loading…
Cancel
Save