mirror of https://github.com/ElemeFE/element
Select: fix clear value & remote label
parent
f67104f28e
commit
845d716e3f
|
@ -243,6 +243,10 @@
|
||||||
this.inputLength = 20;
|
this.inputLength = 20;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (this.selectedInit) {
|
||||||
|
this.selectedInit = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.valueChangeBySelected = true;
|
this.valueChangeBySelected = true;
|
||||||
this.$emit('input', val.value);
|
this.$emit('input', val.value);
|
||||||
this.$emit('change', val.value);
|
this.$emit('change', val.value);
|
||||||
|
@ -258,11 +262,9 @@
|
||||||
}
|
}
|
||||||
if (this.remote && typeof this.remoteMethod === 'function') {
|
if (this.remote && typeof this.remoteMethod === 'function') {
|
||||||
this.hoverIndex = -1;
|
this.hoverIndex = -1;
|
||||||
if (!this.multiple) {
|
|
||||||
this.selected = {};
|
|
||||||
}
|
|
||||||
this.remoteMethod(val);
|
this.remoteMethod(val);
|
||||||
this.voidRemoteQuery = val === '';
|
this.voidRemoteQuery = val === '';
|
||||||
|
this.broadcast('option', 'resetIndex');
|
||||||
} else if (typeof this.filterMethod === 'function') {
|
} else if (typeof this.filterMethod === 'function') {
|
||||||
this.filterMethod(val);
|
this.filterMethod(val);
|
||||||
} else {
|
} else {
|
||||||
|
@ -358,6 +360,7 @@
|
||||||
this.resetHoverIndex();
|
this.resetHoverIndex();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
this.selectedInit = !!init;
|
||||||
this.selected = option;
|
this.selected = option;
|
||||||
this.selectedLabel = option.currentLabel;
|
this.selectedLabel = option.currentLabel;
|
||||||
this.hoverIndex = option.index;
|
this.hoverIndex = option.index;
|
||||||
|
@ -424,9 +427,6 @@
|
||||||
}
|
}
|
||||||
if (!this.disabled) {
|
if (!this.disabled) {
|
||||||
this.visible = !this.visible;
|
this.visible = !this.visible;
|
||||||
if (this.remote && this.visible) {
|
|
||||||
this.selectedLabel = '';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -178,10 +178,12 @@ describe('Pagination', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(vm.trigger).to.false;
|
expect(vm.trigger).to.false;
|
||||||
vm.$el.querySelectorAll('li.el-select-dropdown__item')[1].click();
|
|
||||||
setTimeout(_ => {
|
setTimeout(_ => {
|
||||||
expect(vm.trigger).to.true;
|
vm.$el.querySelectorAll('li.el-select-dropdown__item')[1].click();
|
||||||
done();
|
setTimeout(_ => {
|
||||||
|
expect(vm.trigger).to.true;
|
||||||
|
done();
|
||||||
|
}, 50);
|
||||||
}, 50);
|
}, 50);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue