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

fixed #5216

Browse source
This commit is contained in:
mo.duan 2019-11-12 18:41:28 +08:00
parent 78e96edfdf
commit 5f04795b70
2 changed files with 55 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
examples/routers/select.vue
View file

@ -27,9 +27,20 @@
<Button @click="handleReset('formValidate')" style="margin-left: 8px">Reset</Button>
</FormItem>
</Form>
<!-- fix #6349 -->
<Select v-model='test' filterable clearable>
<Option v-for='item in list' :value='item.value' :label="item.name"></Option>
<Option v-for='item in list' :value='item.value' :label="item.name" :key="item.value"></Option>
</Select>
<h2 style="margin-top:20px">#5216</h2>
<Select v-model="model11" filterable clearable>
<OptionGroup label="分组">
<Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
</OptionGroup>
</Select>
<h2 style="margin-top:20px">Demo</h2>
<Select v-model="model12">
<OptionGroup label="分组">
<Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
</OptionGroup>
</Select>
</div>
</template>
@ -51,19 +62,47 @@
},
test:'',
list:[{
name:"测试测试2",
name: '测试测试2',
value:1
},{
name:"dddddd",
name: 'dddddd',
value:2
},{
name:"测试测试",
name:'测试测试',
value:8
},{
name:"\"年龄\"123",
name: '\"年龄\"123',
value:9
}]
}
}],
cityList: [
{
value: 'New York',
label: 'New York'
},
{
value: 'London',
label: 'London'
},
{
value: 'Sydney',
label: 'Sydney'
},
{
value: 'Ottawa',
label: 'Ottawa'
},
{
value: 'Paris',
label: 'Paris'
},
{
value: 'Canberra',
label: 'Canberra'
}
],
model11: '',
model12: ''
};
},
methods: {
handleSubmit (name) {
@ -73,11 +112,11 @@
} else {
this.$Message.error('Fail!');
}
})
});
},
handleReset (name) {
this.$refs[name].resetFields();
}
}
}
};
</script>

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

@ -413,7 +413,7 @@
if (!optionPassesFilter) continue;
}
optionCounter = optionCounter + 1;
selectOptions.push(this.processOption(option, selectedValues, this.focusIndex === optionCounter));
selectOptions.push(this.processOption(option, selectedValues, currentIndex === optionCounter));
}
}
@ -526,12 +526,10 @@
setTimeout(() =>{
this.unchangedQuery = true;
// resolve if we use filterable, dropItem not selected #6349
if(this.filterable){
this.hideMenuTimer = setTimeout(()=>{
this.updateFocusIndex();
this.hideMenuTimer = null;
});
}
this.hideMenuTimer = setTimeout(()=>{
this.updateFocusIndex();
this.hideMenuTimer = null;
});
}, ANIMATION_TIMEOUT);
},
onClickOutside(event){
@ -665,12 +663,9 @@
this.query = String(option.label).trim();
this.values = [option];
this.lastRemoteQuery = '';
this.query = '';
this.hideMenu();
}
this.focusIndex = this.flatOptions.findIndex((opt) => {
if (!opt || !opt.componentOptions) return false;
return opt.componentOptions.propsData.value === option.value;
});
if (this.filterable){
const inputField = this.$el.querySelector('input[type="text"]');
if (!this.autoComplete) this.$nextTick(() => inputField.focus());