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

Merge branch '2.0' into 2.0

Browse source
This commit is contained in:
muei 2017-03-16 11:14:41 +08:00 • committed by GitHub
commit c86d77fcef
31 changed files with 804 additions and 726 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,8 +151,8 @@
this.$emit('on-focus', event);
},
handleBlur (event) {
this.$emit('on-blur', event);
if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) {
this.$emit('on-blur', envent);
if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader', 'Search'])) {
this.dispatch('FormItem', 'on-form-blur', this.currentValue);
}
},
@ -171,7 +171,7 @@
this.resizeTextarea();
});
this.currentValue = value;
if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) {
if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader', 'Search'])) {
this.dispatch('FormItem', 'on-form-change', value);
}
},