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

correct unchangedQuery and queryStringMatchesSelectedOption logic and

Browse source
This commit is contained in:
Sergio Crisostomo 2018-05-11 08:45:14 +02:00
parent 31788df30b
commit c3304bce34
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/select/select-head.vue
View file

@ -182,6 +182,7 @@
// #982 // #982
if (typeof value === 'undefined' || value === '' || value === null) this.query = ''; if (typeof value === 'undefined' || value === '' || value === null) this.query = '';
else this.query = value.label; else this.query = value.label;
this.$nextTick(() => this.preventRemoteCall = false); // this should be after the query change setter above
}, },
query (val) { query (val) {
if (this.preventRemoteCall) { if (this.preventRemoteCall) {

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

@ -266,7 +266,7 @@
}, },
queryStringMatchesSelectedOption(){ queryStringMatchesSelectedOption(){
const selectedOptions = this.values[0]; const selectedOptions = this.values[0];
return selectedOptions && !this.multiple && this.unchangedQuery && this.query === selectedOptions.value; return selectedOptions && !this.multiple && this.unchangedQuery && this.query === selectedOptions.label;
}, },
localeNotFoundText () { localeNotFoundText () {
if (typeof this.notFoundText === 'undefined') { if (typeof this.notFoundText === 'undefined') {
@ -391,6 +391,7 @@
}, },
clearSingleSelect(){ // PUBLIC API clearSingleSelect(){ // PUBLIC API
this.$emit('on-clear'); this.$emit('on-clear');
this.hideMenu();
if (this.clearable) this.values = []; if (this.clearable) this.values = [];
}, },
getOptionData(value){ getOptionData(value){
@ -437,7 +438,8 @@
const label = propsData.label || ''; const label = propsData.label || '';
const textContent = elm && elm.textContent || ''; const textContent = elm && elm.textContent || '';
const stringValues = JSON.stringify([value, label, textContent]); const stringValues = JSON.stringify([value, label, textContent]);
return stringValues.toLowerCase().includes(this.query.toLowerCase()); const query = this.query.toLowerCase();
return stringValues.toLowerCase().includes(query);
}, },
toggleMenu (e, force) { toggleMenu (e, force) {
@ -563,7 +565,7 @@
this.isFocused = true; // so we put back focus after clicking with mouse on option elements this.isFocused = true; // so we put back focus after clicking with mouse on option elements
} else { } else {
this.query = option.value; this.query = option.label;
this.values = [option]; this.values = [option];
this.lastRemoteQuery = ''; this.lastRemoteQuery = '';
this.hideMenu(); this.hideMenu();
@ -576,9 +578,9 @@
this.broadcast('Drop', 'on-update-popper'); this.broadcast('Drop', 'on-update-popper');
}, },
onQueryChange(query) { onQueryChange(query) {
this.unchangedQuery = false; if (query.length > 0 && query !== this.query) this.visible = true;
this.query = query; this.query = query;
if (this.query.length > 0) this.visible = true; this.unchangedQuery = this.visible;
}, },
toggleHeaderFocus({type}){ toggleHeaderFocus({type}){
if (this.disabled) { if (this.disabled) {