Merge pull request #6158 from qburst/fix--6153
fix: prevent icon display when inline property is setpull/6171/head
commit
1336a4e0aa
|
@ -32,7 +32,7 @@
|
||||||
@keydown="onKeyDown"
|
@keydown="onKeyDown"
|
||||||
:pt="ptm('pcInput')"
|
:pt="ptm('pcInput')"
|
||||||
/>
|
/>
|
||||||
<slot v-if="showIcon && iconDisplay === 'button'" name="dropdownbutton">
|
<slot v-if="showIcon && iconDisplay === 'button' && !inline" name="dropdownbutton">
|
||||||
<button
|
<button
|
||||||
:class="cx('dropdown')"
|
:class="cx('dropdown')"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
</slot>
|
</slot>
|
||||||
</button>
|
</button>
|
||||||
</slot>
|
</slot>
|
||||||
<template v-else-if="showIcon && iconDisplay === 'input'">
|
<template v-else-if="showIcon && iconDisplay === 'input' && !inline">
|
||||||
<span v-if="$slots.inputicon || showIcon" :class="cx('inputIconContainer')" v-bind="ptm('inputIconContainer')">
|
<span v-if="$slots.inputicon || showIcon" :class="cx('inputIconContainer')" v-bind="ptm('inputIconContainer')">
|
||||||
<slot name="inputicon" :class="cx('inputIcon')" :clickCallback="onButtonClick">
|
<slot name="inputicon" :class="cx('inputIcon')" :clickCallback="onButtonClick">
|
||||||
<component :is="icon ? 'i' : 'CalendarIcon'" :class="[icon, cx('inputIcon')]" @click="onButtonClick" v-bind="ptm('inputicon')" />
|
<component :is="icon ? 'i' : 'CalendarIcon'" :class="[icon, cx('inputIcon')]" @click="onButtonClick" v-bind="ptm('inputicon')" />
|
||||||
|
|
Loading…
Reference in New Issue