Commit 67033d3bf9e70611d3166c61639724c9ea40cdec
Committed by
GitHub
GitHub
Merge pull request #3260 from leonlianght/2.0
Fix a confliction in Input component
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/components/input/input.vue
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <div :class="wrapClasses"> |
| 3 | 3 | <template v-if="type !== 'textarea'"> |
| 4 | 4 | <div :class="[prefixCls + '-group-prepend']" v-if="prepend" v-show="slotReady"><slot name="prepend"></slot></div> |
| 5 | - <i class="ivu-icon" :class="['ivu-icon-ios-close', prefixCls + '-icon', prefixCls + '-icon-clear' , prefixCls + '-icon-normal']" v-if="clearable" @click="handleClear"></i> | |
| 5 | + <i class="ivu-icon" :class="['ivu-icon-ios-close', prefixCls + '-icon', prefixCls + '-icon-clear' , prefixCls + '-icon-normal']" v-if="clearable && currentValue" @click="handleClear"></i> | |
| 6 | 6 | <i class="ivu-icon" :class="['ivu-icon-' + icon, prefixCls + '-icon', prefixCls + '-icon-normal']" v-else-if="icon" @click="handleIconClick"></i> |
| 7 | 7 | <transition name="fade"> |
| 8 | 8 | <i class="ivu-icon ivu-icon-load-c ivu-load-loop" :class="[prefixCls + '-icon', prefixCls + '-icon-validate']" v-if="!icon"></i> | ... | ... |