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

Merge pull request #3925 from losadaem/select-with-disable-clearable

Browse source 
select: don't allow to clear the selected option when disabled (fix #3924)
This commit is contained in:
Aresn 2018-08-09 16:51:57 +08:00 • committed by GitHub
commit 19b6c005b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/select/select.vue
View file

@ -328,7 +328,7 @@
}, },
canBeCleared(){ canBeCleared(){
const uiStateMatch = this.hasMouseHoverHead || this.active; const uiStateMatch = this.hasMouseHoverHead || this.active;
const qualifiesForClear = !this.multiple && this.clearable; const qualifiesForClear = !this.multiple && !this.disabled && this.clearable;
return uiStateMatch && qualifiesForClear && this.reset; // we return a function return uiStateMatch && qualifiesForClear && this.reset; // we return a function
}, },
selectOptions() { selectOptions() {