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-20 09:35:23 +08:00
parent 3602b78df8
commit 699a9dc8dd
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -269,9 +269,9 @@
if (parsedValue[0].getTime() > parsedValue[1].getTime()) {
correctValue = oldValue;
} else {
// todo 判断disabledDate
correctValue = formatter(parsedValue, format);
}
// todo 判断disabledDate
} else {
correctValue = oldValue;
}
@ -345,7 +345,13 @@
this.picker.resetView && this.picker.resetView();
},
emitChange (date) {
this.$emit('on-change', formatDate(date, this.format || DEFAULT_FORMATS[this.type]));
const format = this.format || DEFAULT_FORMATS[type];
const formatter = (
TYPE_VALUE_RESOLVER_MAP[this.type] ||
TYPE_VALUE_RESOLVER_MAP['default']
).formatter;
this.$emit('on-change', formatter(date, format));
}
},
watch: {

2
test/routers/date.vue
View file

@ -135,7 +135,7 @@
computed: {},
methods: {
change (date) {
// console.log(date)
console.log(date)
},
change2 (s) {
// console.log(s)