Browse Source

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

* commit 'fa2c40ba0bfd8cb63f4c55b1da229b4aa6856d39':
  BI-17886 日期控件的时分秒合法问题
es6
richie 6 years ago
parent
commit
2de218907b
  1. 2
      dist/_fineui.min.js
  2. 4
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 2
      dist/fineui.min.js
  5. 4
      dist/widget.js
  6. 4
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -91616,8 +91616,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = value.year + "-" + (value.month) + "-" + value.day + " " +
(value.hour || "00") + ":" + (value.minute || "00") + ":" + (value.second || "00");
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);
this.setTitle(dateStr);

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -5100,8 +5100,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = value.year + "-" + (value.month) + "-" + value.day + " " +
(value.hour || "00") + ":" + (value.minute || "00") + ":" + (value.second || "00");
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);
this.setTitle(dateStr);

4
src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@ -201,8 +201,8 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = value.year + "-" + (value.month) + "-" + value.day + " " +
(value.hour || "00") + ":" + (value.minute || "00") + ":" + (value.second || "00");
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);
this.setTitle(dateStr);

Loading…
Cancel
Save