Merge pull request #6085 from qburst/master
fix: #6084, SELECT: hide clear button when options is empty in Dropdownpull/6101/head
commit
c02defa960
|
@ -48,7 +48,7 @@
|
||||||
>
|
>
|
||||||
<slot name="value" :value="modelValue" :placeholder="placeholder">{{ label === 'p-emptylabel' ? ' ' : label || 'empty' }}</slot>
|
<slot name="value" :value="modelValue" :placeholder="placeholder">{{ label === 'p-emptylabel' ? ' ' : label || 'empty' }}</slot>
|
||||||
</span>
|
</span>
|
||||||
<slot v-if="showClear && modelValue != null" name="clearicon" :class="cx('clearIcon')" :clearCallback="onClearClick">
|
<slot v-if="isClearIconVisible()" name="clearicon" :class="cx('clearIcon')" :clearCallback="onClearClick">
|
||||||
<component :is="clearIcon ? 'i' : 'TimesIcon'" ref="clearIcon" :class="[cx('clearIcon'), clearIcon]" @click="onClearClick" v-bind="ptm('clearIcon')" data-pc-section="clearicon" />
|
<component :is="clearIcon ? 'i' : 'TimesIcon'" ref="clearIcon" :class="[cx('clearIcon'), clearIcon]" @click="onClearClick" v-bind="ptm('clearIcon')" data-pc-section="clearicon" />
|
||||||
</slot>
|
</slot>
|
||||||
<div :class="cx('dropdown')" v-bind="ptm('dropdown')">
|
<div :class="cx('dropdown')" v-bind="ptm('dropdown')">
|
||||||
|
@ -432,6 +432,9 @@ export default {
|
||||||
|
|
||||||
this.clicked = false;
|
this.clicked = false;
|
||||||
},
|
},
|
||||||
|
isClearIconVisible() {
|
||||||
|
return this.showClear && this.modelValue != null && isNotEmpty(this.options);
|
||||||
|
},
|
||||||
onEditableInput(event) {
|
onEditableInput(event) {
|
||||||
const value = event.target.value;
|
const value = event.target.value;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue