diff --git a/examples/routers/form.vue b/examples/routers/form.vue index 985a00cc..7ccaa60b 100644 --- a/examples/routers/form.vue +++ b/examples/routers/form.vue @@ -5,6 +5,9 @@ + + + @@ -20,7 +23,55 @@ return { formInline: { date: new Date(), - user: '' + user: '', + value2: [], + data: [{ + value: 'beijing', + label: '北京', + children: [ + { + value: 'gugong', + label: '故宫' + }, + { + value: 'tiantan', + label: '天坛' + }, + { + value: 'wangfujing', + label: '王府井' + } + ] + }, { + value: 'jiangsu', + label: '江苏', + children: [ + { + value: 'nanjing', + label: '南京', + children: [ + { + value: 'fuzimiao', + label: '夫子庙', + } + ] + }, + { + value: 'suzhou', + label: '苏州', + children: [ + { + value: 'zhuozhengyuan', + label: '拙政园', + }, + { + value: 'shizilin', + label: '狮子林', + } + ] + } + ], + }] }, ruleInline: { date: [ @@ -43,6 +94,14 @@ message: '请输入2', trigger: 'blur' } + ], + value2: [ + { + required: true, + type: 'array', + message: '请输入', + trigger: 'change' + } ] } } diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue index 6ee7e9f7..862b6f1b 100644 --- a/src/components/cascader/cascader.vue +++ b/src/components/cascader/cascader.vue @@ -198,15 +198,6 @@ } }); }, - // todo 事件 这是因为内部的input会触发,应该组织 -// events: { -// 'on-form-blur' () { -// return false; -// }, -// 'on-form-change' () { -// return false; -// } -// }, watch: { visible (val) { if (val) { diff --git a/src/components/input/input.vue b/src/components/input/input.vue index 0c6c9099..baab0e3f 100644 --- a/src/components/input/input.vue +++ b/src/components/input/input.vue @@ -152,7 +152,7 @@ }, handleBlur () { this.$emit('on-blur'); - if (!findComponentUpward(this, ['DatePicker', 'TimePicker'])) { + if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) { this.dispatch('FormItem', 'on-form-blur', this.currentValue); } }, @@ -171,7 +171,7 @@ this.resizeTextarea(); }); this.currentValue = value; - if (!findComponentUpward(this, ['DatePicker', 'TimePicker'])) { + if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) { this.dispatch('FormItem', 'on-form-change', value); } },