Skip to content
This repository has been archived by the owner on May 31, 2021. It is now read-only.

Fix bug about datetimepicker #186

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Fix bug about datetimepicker #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc4f7bf
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
xiaoyaojian Jun 15, 2016
e2d0980
Fix bug about set a default date for the situation that user does not…
xiaoyaojian Jun 15, 2016
fb22885
Fix bug about datetimepicker
xiaoyaojian Jun 18, 2016
14499ed
Revert "Fix bug about datetimepicker"
xiaoyaojian Jun 24, 2016
db9bccf
Merge remote-tracking branch 'refs/remotes/lihongxun945/dev' into dev
xiaoyaojian Jun 24, 2016
b93ce3e
Fix bug about datetimepicker
xiaoyaojian Jun 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/js/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@
if(!calendar) {
if(!params.value && $this.val()) params.value = [$this.val()];
//默认显示今天
if(!params.value) {
if(!params.value || new Date(params.value[0]).toString() == 'Invalid Date') {
var today = new Date();
params.value = [today.getFullYear() + "-" + format(today.getMonth() + 1) + "-" + format(today.getDate())];
}
Expand Down
28 changes: 27 additions & 1 deletion src/js/datetime-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,23 @@
var min = self.arrayToDate(self.stringToArray(typeof params.min === "function" ? params.min() : params.min));

if(current < +min) {
if (!lastValidValues) {
var minDate = [min.getFullYear(), self.formatNumber(min.getMonth() + 1), self.formatNumber(min.getDate()),
self.formatNumber(min.getHours()), self.formatNumber(min.getMinutes())];
lastValidValues = minDate;
}
picker.setValue(lastValidValues);
valid = false;
}
}
if(params.max) {
var max = self.arrayToDate(self.stringToArray(typeof params.max === "function" ? params.max() : params.max));
if(current > +max) {
if (!lastValidValues) {
var maxDate = [max.getFullYear(), self.formatNumber(max.getMonth() + 1), self.formatNumber(max.getDate()),
self.formatNumber(max.getHours()), self.formatNumber(max.getMinutes())];
lastValidValues = maxDate;
}
picker.setValue(lastValidValues);
valid = false;
}
Expand Down Expand Up @@ -152,7 +162,23 @@
};

var inputValue = this.input.val();
if(inputValue) config.value = this.stringToArray(inputValue);
if (inputValue) {
config.value = this.stringToArray(inputValue);
}
else {
if (params.min) {
var min = this.arrayToDate(self.stringToArray(typeof params.min === "function" ? params.min() : params.min));
if (min >= this.arrayToDate(config.value)) {
config.value = [min.getFullYear(), this.formatNumber(min.getMonth() + 1), this.formatNumber(min.getDate()), this.formatNumber(min.getHours()), this.formatNumber(min.getMinutes())];
}
}
if (params.max) {
var max = this.arrayToDate(self.stringToArray(typeof params.max === "function" ? params.max() : params.max));
if (max <= this.arrayToDate(config.value)) {
config.value = [max.getFullYear(), this.formatNumber(max.getMonth() + 1), this.formatNumber(max.getDate()), this.formatNumber(max.getHours()), this.formatNumber(max.getMinutes())];
}
}
}

return config;
}
Expand Down