Browse Source

BI-18228 date_time_combo

es6
windy 7 years ago
parent
commit
a2aae9275f
  1. 2
      demo/js/widget/datetime/demo.datetime.js
  2. 2
      dist/_fineui.min.js
  3. 6
      dist/bundle.js
  4. 2
      dist/bundle.min.js
  5. 2
      dist/demo.js
  6. 6
      dist/fineui.min.js
  7. 6
      dist/widget.js
  8. 2
      src/widget/datetime/datetime.combo.js
  9. 2
      src/widget/datetime/datetime.popup.js
  10. 2
      src/widget/datetime/datetime.trigger.js

2
demo/js/widget/datetime/demo.datetime.js

@ -14,7 +14,7 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
eventName: BI.DateTimeCombo.EVENT_CONFIRM, eventName: BI.DateTimeCombo.EVENT_CONFIRM,
action: function () { action: function () {
var value = this.getValue(); var value = this.getValue();
var date = new Date(value.year, value.month, value.day, value.hour, value.minute, value.second); var date = new Date(value.year, value.month - 1, value.day, value.hour, value.minute, value.second);
var dateStr = date.print("%Y-%X-%d %H:%M:%S"); var dateStr = date.print("%Y-%X-%d %H:%M:%S");
BI.Msg.alert("日期", dateStr); BI.Msg.alert("日期", dateStr);
} }

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored

@ -88374,7 +88374,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = BI.isNotNull(opts.value) ? opts.value : { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth() + 1,
day: date.getDate(), day: date.getDate(),
hour: date.getHours(), hour: date.getHours(),
minute: date.getMinutes(), minute: date.getMinutes(),
@ -88616,7 +88616,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
date = BI.getDate(); date = BI.getDate();
this.dateCombo.setValue({ this.dateCombo.setValue({
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth() + 1,
day: date.getDate() day: date.getDate()
}); });
this.hour.setValue(date.getHours()); this.hour.setValue(date.getHours());
@ -88807,7 +88807,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
value = BI.getDate(); value = BI.getDate();
dateStr = value.print("%Y-%X-%d %H:%M:%S"); dateStr = value.print("%Y-%X-%d %H:%M:%S");
} else { } else {
var date = BI.getDate(value.year, value.month, value.day, value.hour, value.minute, value.second); var date = BI.getDate(value.year, value.month - 1, value.day, value.hour, value.minute, value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S"); dateStr = date.print("%Y-%X-%d %H:%M:%S");
} }

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js vendored

@ -12257,7 +12257,7 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
eventName: BI.DateTimeCombo.EVENT_CONFIRM, eventName: BI.DateTimeCombo.EVENT_CONFIRM,
action: function () { action: function () {
var value = this.getValue(); var value = this.getValue();
var date = new Date(value.year, value.month, value.day, value.hour, value.minute, value.second); var date = new Date(value.year, value.month - 1, value.day, value.hour, value.minute, value.second);
var dateStr = date.print("%Y-%X-%d %H:%M:%S"); var dateStr = date.print("%Y-%X-%d %H:%M:%S");
BI.Msg.alert("日期", dateStr); BI.Msg.alert("日期", dateStr);
} }

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/widget.js vendored

@ -1743,7 +1743,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = BI.isNotNull(opts.value) ? opts.value : { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth() + 1,
day: date.getDate(), day: date.getDate(),
hour: date.getHours(), hour: date.getHours(),
minute: date.getMinutes(), minute: date.getMinutes(),
@ -1985,7 +1985,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
date = BI.getDate(); date = BI.getDate();
this.dateCombo.setValue({ this.dateCombo.setValue({
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth() + 1,
day: date.getDate() day: date.getDate()
}); });
this.hour.setValue(date.getHours()); this.hour.setValue(date.getHours());
@ -2176,7 +2176,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
value = BI.getDate(); value = BI.getDate();
dateStr = value.print("%Y-%X-%d %H:%M:%S"); dateStr = value.print("%Y-%X-%d %H:%M:%S");
} else { } else {
var date = BI.getDate(value.year, value.month, value.day, value.hour, value.minute, value.second); var date = BI.getDate(value.year, value.month - 1, value.day, value.hour, value.minute, value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S"); dateStr = date.print("%Y-%X-%d %H:%M:%S");
} }

2
src/widget/datetime/datetime.combo.js

@ -23,7 +23,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = BI.isNotNull(opts.value) ? opts.value : { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth() + 1,
day: date.getDate(), day: date.getDate(),
hour: date.getHours(), hour: date.getHours(),
minute: date.getMinutes(), minute: date.getMinutes(),

2
src/widget/datetime/datetime.popup.js

@ -133,7 +133,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
date = BI.getDate(); date = BI.getDate();
this.dateCombo.setValue({ this.dateCombo.setValue({
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth() + 1,
day: date.getDate() day: date.getDate()
}); });
this.hour.setValue(date.getHours()); this.hour.setValue(date.getHours());

2
src/widget/datetime/datetime.trigger.js

@ -50,7 +50,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
value = BI.getDate(); value = BI.getDate();
dateStr = value.print("%Y-%X-%d %H:%M:%S"); dateStr = value.print("%Y-%X-%d %H:%M:%S");
} else { } else {
var date = BI.getDate(value.year, value.month, value.day, value.hour, value.minute, value.second); var date = BI.getDate(value.year, value.month - 1, value.day, value.hour, value.minute, value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S"); dateStr = date.print("%Y-%X-%d %H:%M:%S");
} }

Loading…
Cancel
Save