bug fixed #6338

iview · Dec 2, 2019 · 389579b · 389579b
1 parent 9a9a95e
commit 389579b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 37 deletions.
diff --git a/examples/routers/input.vue b/examples/routers/input.vue
@@ -139,8 +139,9 @@
         <!--<br><br>-->
         <!--<Input v-model="value" search enter-button="Search" style="width: 300px" @on-search="hs" />-->
     <!--</div>-->
+    <!--#6338-->
     <div style="width: 200px">
-        <Input v-model="value7" type="textarea" :autosize="true" placeholder="Enter something..."></Input>
+        <Input search enter-button="搜索" clearable placeholder="Enter something..." />
     </div>
 </template>
 <script>
@@ -154,8 +155,8 @@
                 select1: 'http',
                 select2: 'com',
                 select3: 'day',
-                value7: ``
-            }
+                value7: ''
+            };
         },
         methods: {
             hs (val) {

diff --git a/src/components/input/input.vue b/src/components/input/input.vue
@@ -2,39 +2,41 @@
     <div :class="wrapClasses">
         <template v-if="type !== 'textarea'">
             <div :class="[prefixCls + '-group-prepend']" v-if="prepend" v-show="slotReady"><slot name="prepend"></slot></div>
-            <i class="ivu-icon" :class="['ivu-icon-ios-close-circle', prefixCls + '-icon', prefixCls + '-icon-clear' , prefixCls + '-icon-normal']" v-if="clearable && currentValue && !disabled" @click="handleClear"></i>
-            <i class="ivu-icon" :class="['ivu-icon-' + icon, prefixCls + '-icon', prefixCls + '-icon-normal']" v-else-if="icon" @click="handleIconClick"></i>
-            <i class="ivu-icon ivu-icon-ios-search" :class="[prefixCls + '-icon', prefixCls + '-icon-normal', prefixCls + '-search-icon']" v-else-if="search && enterButton === false" @click="handleSearch"></i>
-            <span class="ivu-input-suffix" v-else-if="showSuffix"><slot name="suffix"><i class="ivu-icon" :class="['ivu-icon-' + suffix]" v-if="suffix"></i></slot></span>
-            <transition name="fade">
-                <i class="ivu-icon ivu-icon-ios-loading ivu-load-loop" :class="[prefixCls + '-icon', prefixCls + '-icon-validate']" v-if="!icon"></i>
-            </transition>
-            <input
-                :id="elementId"
-                :autocomplete="autocomplete"
-                :spellcheck="spellcheck"
-                ref="input"
-                :type="type"
-                :class="inputClasses"
-                :placeholder="placeholder"
-                :disabled="disabled"
-                :maxlength="maxlength"
-                :readonly="readonly"
-                :name="name"
-                :value="currentValue"
-                :number="number"
-                :autofocus="autofocus"
-                @keyup.enter="handleEnter"
-                @keyup="handleKeyup"
-                @keypress="handleKeypress"
-                @keydown="handleKeydown"
-                @focus="handleFocus"
-                @blur="handleBlur"
-                @compositionstart="handleComposition"
-                @compositionupdate="handleComposition"
-                @compositionend="handleComposition"
-                @input="handleInput"
-                @change="handleChange">
+            <div :class="[prefixCls + '-inner-container']">
+                <i class="ivu-icon" :class="['ivu-icon-ios-close-circle', prefixCls + '-icon', prefixCls + '-icon-clear' , prefixCls + '-icon-normal']" v-if="clearable && currentValue && !disabled" @click="handleClear"></i>
+                <i class="ivu-icon" :class="['ivu-icon-' + icon, prefixCls + '-icon', prefixCls + '-icon-normal']" v-else-if="icon" @click="handleIconClick"></i>
+                <i class="ivu-icon ivu-icon-ios-search" :class="[prefixCls + '-icon', prefixCls + '-icon-normal', prefixCls + '-search-icon']" v-else-if="search && enterButton === false" @click="handleSearch"></i>
+                <span class="ivu-input-suffix" v-else-if="showSuffix"><slot name="suffix"><i class="ivu-icon" :class="['ivu-icon-' + suffix]" v-if="suffix"></i></slot></span>
+                <transition name="fade">
+                    <i class="ivu-icon ivu-icon-ios-loading ivu-load-loop" :class="[prefixCls + '-icon', prefixCls + '-icon-validate']" v-if="!icon"></i>
+                </transition>
+                <input
+                    :id="elementId"
+                    :autocomplete="autocomplete"
+                    :spellcheck="spellcheck"
+                    ref="input"
+                    :type="type"
+                    :class="inputClasses"
+                    :placeholder="placeholder"
+                    :disabled="disabled"
+                    :maxlength="maxlength"
+                    :readonly="readonly"
+                    :name="name"
+                    :value="currentValue"
+                    :number="number"
+                    :autofocus="autofocus"
+                    @keyup.enter="handleEnter"
+                    @keyup="handleKeyup"
+                    @keypress="handleKeypress"
+                    @keydown="handleKeydown"
+                    @focus="handleFocus"
+                    @blur="handleBlur"
+                    @compositionstart="handleComposition"
+                    @compositionupdate="handleComposition"
+                    @compositionend="handleComposition"
+                    @input="handleInput"
+                    @change="handleChange">
+            </div>
             <div :class="[prefixCls + '-group-append']" v-if="append" v-show="slotReady"><slot name="append"></slot></div>
             <div :class="[prefixCls + '-group-append', prefixCls + '-search']" v-else-if="search && enterButton" @click="handleSearch">
                 <i class="ivu-icon ivu-icon-ios-search" v-if="enterButton === true"></i>

diff --git a/src/styles/mixins/input.less b/src/styles/mixins/input.less
@@ -159,7 +159,8 @@
         vertical-align: middle;
     }
 
-    .@{inputClass} {
+    .@{inputClass},
+    .@{inputClass}-inner-container {
         width: 100%;
         float: left;
         margin-bottom: 0;