drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update DatePicker

Browse source 
update DatePicker
This commit is contained in:
梁灏 2016-12-19 23:40:39 +08:00
parent f92ef70f46
commit 7c5ccdab4d
3 changed files with 73 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/date-picker/base/date-table.vue
View file

@ -73,8 +73,11 @@
}); });
} }
}, },
cells (cells) { cells: {
this.readCells = cells; handler (cells) {
this.readCells = cells;
},
immediate: true
} }
}, },
computed: { computed: {

48
src/components/date-picker/picker.vue
View file

@ -248,21 +248,47 @@
const value = event.target.value; const value = event.target.value;
let correctValue = ''; let correctValue = '';
const format = this.format || DEFAULT_FORMATS[this.type]; let correctDate = '';
const parsedDate = parseDate(value, format); const type = this.type;
const format = this.format || DEFAULT_FORMATS[type];
if (parsedDate instanceof Date) { if (type === 'daterange' || type === 'timerange' || type === 'datetimerange') {
const options = this.options; const parser = (
if (options.disabledDate && typeof options.disabledDate === 'function' && options.disabledDate(new Date(parsedDate))) { TYPE_VALUE_RESOLVER_MAP[type] ||
correctValue = oldValue; TYPE_VALUE_RESOLVER_MAP['default']
).parser;
const formatter = (
TYPE_VALUE_RESOLVER_MAP[type] ||
TYPE_VALUE_RESOLVER_MAP['default']
).formatter;
const parsedValue = parser(value, format);
if (parsedValue) {
// todo 判断disabledDate
correctValue = formatter(parsedValue, format);
} else { } else {
correctValue = formatDate(parsedDate, format); correctValue = oldValue;
} }
} else {
correctValue = oldValue;
}
const correctDate = parseDate(correctValue, format); correctDate = parsedValue;
} else {
const parsedDate = parseDate(value, format);
if (parsedDate instanceof Date) {
const options = this.options;
if (options.disabledDate && typeof options.disabledDate === 'function' && options.disabledDate(new Date(parsedDate))) {
correctValue = oldValue;
} else {
correctValue = formatDate(parsedDate, format);
}
} else {
correctValue = oldValue;
}
correctDate = parseDate(correctValue, format);
}
this.visualValue = correctValue; this.visualValue = correctValue;
event.target.value = correctValue; event.target.value = correctValue;

45
test/routers/date.vue
View file

@ -17,10 +17,12 @@
<i-col span="8"> <i-col span="8">
<date-picker <date-picker
type="daterange" type="daterange"
style="width:200px" style="width:300px"
placeholder="请选择日期" placeholder="请选择日期"
:value.sync="value2" :value.sync="value2"
align="right" align="right"
:editable="true"
:format="format"
:options="options2"></date-picker> :options="options2"></date-picker>
</i-col> </i-col>
</row> </row>
@ -34,37 +36,52 @@
value: '2016-12-25', value: '2016-12-25',
value2: ['2016-12-17', '2017-01-05'], value2: ['2016-12-17', '2017-01-05'],
options2: { options2: {
// disabledDate(time) {
//// console.log(time)
//// return time.getFullYear() < 2016;
//// return time.getTime() < Date.now() - 8.64e7;
//// return time && time.valueOf() < Date.now();
// if (time.getDate() === 22 || time.getDate() === 23) {
// return true;
// } else {
// return false;
// }
// },
shortcuts: [ shortcuts: [
{ {
text: '今天', text: '最近一周',
value () { value () {
// return new Date(); const end = new Date();
return '1/2/19' const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
}, },
onClick (picker) { onClick (picker) {
console.log('点击了今天'); console.log('点击了最近一周');
} }
}, },
{ {
text: '昨天', text: '最近一个月',
value () { value () {
const date = new Date(); const end = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24); const start = new Date();
return date; start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
}, },
onClick () { onClick () {
console.log('点击了昨天'); console.log('点击了最近一个月');
} }
}, },
{ {
text: '最近三个月', text: '最近三个月',
value () { value () {
const date = new Date(); const end = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7); const start = new Date();
return date; start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
}, },
onClick () { onClick () {
console.log('点击了一周前'); console.log('点击了最近三个月');
} }
} }
] ]