guy 7 years ago
parent
commit
e434de4a1a
  1. 26
      dist/bundle.js
  2. 22
      dist/bundle.min.js
  3. 7
      dist/core.js
  4. 26
      dist/fineui.js
  5. 20
      dist/fineui.min.js
  6. 19
      dist/widget.js
  7. 7
      src/core/controller/controller.layer.js
  8. 6
      src/widget/month/combo.month.js
  9. 6
      src/widget/quarter/combo.quarter.js
  10. 6
      src/widget/year/combo.year.js
  11. 1
      src/widget/yearmonth/combo.yearmonth.js

26
dist/bundle.js vendored

@ -26599,10 +26599,9 @@ BI.LayerController = BI.inherit(BI.Controller, {
if (this.has(name)) { if (this.has(name)) {
return this.get(name); return this.get(name);
} }
var widget = BI.createWidget((op.render || {}), { var widget = BI.createWidget((op.render || {}), BI.extend({
type: "bi.layout", type: "bi.layout"
cls: op.cls }, op), context);
}, context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
@ -89152,7 +89151,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 +96805,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 +102323,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 +102587,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 () {

22
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/core.js vendored

@ -26599,10 +26599,9 @@ BI.LayerController = BI.inherit(BI.Controller, {
if (this.has(name)) { if (this.has(name)) {
return this.get(name); return this.get(name);
} }
var widget = BI.createWidget((op.render || {}), { var widget = BI.createWidget((op.render || {}), BI.extend({
type: "bi.layout", type: "bi.layout"
cls: op.cls }, op), context);
}, context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{

26
dist/fineui.js vendored

@ -26842,10 +26842,9 @@ BI.LayerController = BI.inherit(BI.Controller, {
if (this.has(name)) { if (this.has(name)) {
return this.get(name); return this.get(name);
} }
var widget = BI.createWidget((op.render || {}), { var widget = BI.createWidget((op.render || {}), BI.extend({
type: "bi.layout", type: "bi.layout"
cls: op.cls }, op), context);
}, context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
@ -90958,7 +90957,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 +98611,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 +104129,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 +104393,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 () {

20
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

19
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,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 () {

7
src/core/controller/controller.layer.js

@ -53,10 +53,9 @@ BI.LayerController = BI.inherit(BI.Controller, {
if (this.has(name)) { if (this.has(name)) {
return this.get(name); return this.get(name);
} }
var widget = BI.createWidget((op.render || {}), { var widget = BI.createWidget((op.render || {}), BI.extend({
type: "bi.layout", type: "bi.layout"
cls: op.cls }, op), context);
}, context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{

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

6
src/widget/quarter/combo.quarter.js

@ -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

@ -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

@ -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