Browse Source

BI-17924 formulaeditor支持默认value

master
windy 7 years ago
parent
commit
059b675f18
  1. 3
      dist/base.js
  2. 5
      dist/bundle.js
  3. 66
      dist/bundle.min.js
  4. 3
      dist/fineui.min.js
  5. 2
      dist/widget.js
  6. 3
      src/base/formula/formulaeditor.js
  7. 2
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js

3
dist/base.js vendored

@ -14606,6 +14606,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {

5
dist/bundle.js vendored

@ -49860,6 +49860,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {
@ -91614,7 +91617,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour|| 0, value.minute || 0,
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour || 0, value.minute || 0,
value.second || 0).print("%Y-%X-%d %H:%M:%S");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);

66
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/fineui.min.js vendored

@ -140,6 +140,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {

2
dist/widget.js vendored

@ -5098,7 +5098,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour|| 0, value.minute || 0,
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour || 0, value.minute || 0,
value.second || 0).print("%Y-%X-%d %H:%M:%S");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);

3
src/base/formula/formulaeditor.js

@ -88,6 +88,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {

2
src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@ -201,7 +201,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour|| 0, value.minute || 0,
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour || 0, value.minute || 0,
value.second || 0).print("%Y-%X-%d %H:%M:%S");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);

Loading…
Cancel
Save