drip-public/iview
5
0
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-15 23:29:31 +08:00
parent f46ebc38dc
commit e1874103ad
4 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/date-picker/panel/date.vue
View file

@ -103,7 +103,6 @@
},
watch: {
value (newVal) {
console.log(12331)
if (!newVal) return;
newVal = new Date(newVal);
if (!isNaN(newVal)) {

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

@ -181,7 +181,6 @@
return {
prefixCls: prefixCls,
showClose: false,
visualValue: '',
visible: false,
picker: null,
internalValue: ''
@ -226,7 +225,6 @@
TYPE_VALUE_RESOLVER_MAP['default']
).parser;
const parsedValue = parser(value, this.format || DEFAULT_FORMATS[type]);
if (parsedValue) {
if (this.picker) this.picker.value = parsedValue;
}
@ -241,13 +239,36 @@
this.visible = false;
},
handleFocus () {
if (this.readonly) return;
this.visible = true;
},
handleBlur () {
},
handleInputChange (val) {
this.visualValue = val;
handleInputChange (event) {
const oldValue = this.visualValue;
const value = event.target.value;
let correctValue = '';
const format = this.format || DEFAULT_FORMATS[this.type];
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;
}
const correctDate = parseDate(correctValue, format);
this.visualValue = correctValue;
event.target.value = correctValue;
this.internalValue = correctDate;
},
handleInputMouseenter () {
if (this.readonly || this.disabled) return;
@ -277,9 +298,10 @@
}
this.picker.$on('on-pick', (date, visible = false) => {
this.$emit('on-change', date);
this.$emit('on-change', formatDate(date, this.format || DEFAULT_FORMATS[this.type]));
this.value = date;
this.visible = visible;
this.picker.value = date;
this.picker.resetView && this.picker.resetView();
});

4
src/components/input/input.vue
View file

@ -141,8 +141,8 @@
handleBlur () {
this.$emit('on-blur');
},
handleChange () {
this.$emit('on-change', this.value);
handleChange (event) {
this.$emit('on-change', event);
},
resizeTextarea () {
const autosize = this.autosize;

9
test/routers/date.vue
View file

@ -3,7 +3,14 @@
<br>
<row>
<i-col span="4">
<date-picker style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options" @on-change="change" @on-open-change="change2" :format="format"></date-picker>
<date-picker
style="width:200px"
placeholder="请选择日期"
:value.sync="value"
:options="options"
@on-change="change"
:format="format"
@on-open-change="change2"></date-picker>
</i-col>
<i-col span="4">
<date-picker type="year" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker>