Browse Source

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

* commit '2e0619c9c8eeffe76b353880666bc63bef168a46':
  bug
es6
guy 7 years ago
parent
commit
64444cc2c0
  1. 28
      dist/_fineui.min.js
  2. 10
      dist/base.js
  3. 14
      dist/bundle.js
  4. 30
      dist/bundle.min.js
  5. 38
      dist/fineui.min.js
  6. 4
      dist/widget.js
  7. 10
      src/base/formula/formulaeditor.js
  8. 4
      src/widget/datetime/datetime.combo.js

28
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/base.js vendored

@ -14563,11 +14563,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
if (BI.isKey(o.value)) {
self.setValue(o.value);
}
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -14606,6 +14601,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}

14
dist/bundle.js vendored

@ -49820,11 +49820,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
if (BI.isKey(o.value)) {
self.setValue(o.value);
}
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -49863,6 +49858,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
@ -88409,10 +88409,6 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
});
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue());
self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,

30
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

38
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -1775,10 +1775,6 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
});
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue());
self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,

10
src/base/formula/formulaeditor.js

@ -45,11 +45,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
if (BI.isKey(o.value)) {
self.setValue(o.value);
}
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -88,6 +83,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}

4
src/widget/datetime/datetime.combo.js

@ -55,10 +55,6 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
});
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue());
self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,

Loading…
Cancel
Save