Skip to content

Commit ffe5369

Browse files
authored
Merge pull request #100 from Tobin1990/master
datePicker updata 时间戳转换兼容
2 parents 134db94 + 262fb78 commit ffe5369

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/fields/fieldDatePicker.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,19 @@ export default {
197197
options: {
198198
shortcuts: shortcuts,
199199
disabledDate: date => {
200+
let initdate = '';
200201
if (this.dates.length === 0) {
201202
return false;
202203
}
203204
if (this.dates.length === this.field.maxLength
204205
&& this.field.subtype === 'date'
205206
&& this.field.multiple) {
206207
return !this.dates.some(ret => {
207-
var initdate = new Date(ret.split(/\D+/));
208+
if (this.field.format === 'yyyyMMdd') {
209+
initdate = new Date(ret.split(/(\d{4})(\d{2})(\d{2})/));
210+
} else {
211+
initdate = new Date(ret.split(/\D+/));
212+
}
208213
return date && date.valueOf() === initdate.valueOf() ;
209214
});
210215
}

0 commit comments

Comments
 (0)