fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit 'a2aae9275f4927eda11f9822f672d086d71433c4':
  BI-18228 date_time_combo
es6
guy 6 years ago
parent
2539cf74d5 a2aae9275f
commit
5c9912bc78
10 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

@ -14,7 +14,7 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
eventName: BI.DateTimeCombo.EVENT_CONFIRM,
action: function () {
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");
BI.Msg.alert("日期", dateStr);
}

2
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored
Unescape View File

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

2
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js vendored
Unescape View File

@ -12257,7 +12257,7 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
eventName: BI.DateTimeCombo.EVENT_CONFIRM,
action: function () {
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");
BI.Msg.alert("日期", dateStr);
}

6
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/widget.js vendored
Unescape View File

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

2
src/widget/datetime/datetime.combo.js
Unescape View File

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

2
src/widget/datetime/datetime.popup.js
Unescape View File

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

2
src/widget/datetime/datetime.trigger.js
Unescape View File

@ -50,7 +50,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
value = BI.getDate();
dateStr = value.print("%Y-%X-%d %H:%M:%S");
} 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");
}

Write Preview
Loading…
Cancel
Save