Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #278 in FUI/fineui from ~WINDY/fui:master to master 

* commit '577b345837bca74993be535f300df70cf5eb7435':
  update
es6
guy 7 years ago
parent
123ff18922 577b345837
commit
758f21752f
7 changed files with 64 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      dist/bundle.js
  2. 19
      dist/fineui.js
  3. 19
      dist/widget.js
  4. 6
      src/widget/month/combo.month.js
  5. 6
      src/widget/quarter/combo.quarter.js
  6. 6
      src/widget/year/combo.year.js
  7. 1
      src/widget/yearmonth/combo.yearmonth.js

19
dist/bundle.js vendored
Unescape View File

@ -89152,7 +89152,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() || "";
}
} }
}); });
@ -96802,7 +96806,11 @@ BI.QuarterCombo = 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() || "";
}
} }
}); });
@ -102316,7 +102324,11 @@ BI.YearCombo = 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();
}
} }
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@ -102576,6 +102588,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 () {

19
dist/fineui.js vendored
Unescape View File

@ -90958,7 +90958,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() || "";
}
} }
}); });
@ -98608,7 +98612,11 @@ BI.QuarterCombo = 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() || "";
}
} }
}); });
@ -104122,7 +104130,11 @@ BI.YearCombo = 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();
}
} }
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@ -104382,6 +104394,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 () {

19
dist/widget.js vendored
Unescape View File

@ -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,7 +11961,11 @@ BI.QuarterCombo = 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() || "";
}
} }
}); });
@ -17471,7 +17479,11 @@ BI.YearCombo = 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();
}
} }
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@ -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
Unescape View File

@ -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() || "";
}
} }
}); });

6
src/widget/quarter/combo.quarter.js
Unescape View File

@ -78,7 +78,11 @@ BI.QuarterCombo = 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() || "";
}
} }
}); });

6
src/widget/year/combo.year.js
Unescape View File

@ -97,7 +97,11 @@ BI.YearCombo = 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();
}
} }
}); });
BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";

1
src/widget/yearmonth/combo.yearmonth.js
Unescape View File

@ -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 () {

Write Preview
Loading…
Cancel
Save