Browse Source

Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

jerry 5 years ago
parent
commit
d197fdc578

+ 1 - 0
src/packages/searchbar/demo.vue

@@ -36,6 +36,7 @@
             <nut-searchbar
             <nut-searchbar
 		        placeText="请输入自定义文案"
 		        placeText="请输入自定义文案"
 		        @submit="search"
 		        @submit="search"
+				@focus="focusFun"
 				ref="myInput"
 				ref="myInput"
 	        ></nut-searchbar>
 	        ></nut-searchbar>
         </div>
         </div>

+ 1 - 0
src/packages/searchbar/doc.md

@@ -51,6 +51,7 @@
 <nut-searchbar
 <nut-searchbar
     placeText="请输入自定义文案"
     placeText="请输入自定义文案"
     @submit="search"
     @submit="search"
+    @focus="focusFun"
     ref="myInput"
     ref="myInput"
 ></nut-searchbar>
 ></nut-searchbar>
 ```
 ```

+ 3 - 0
src/packages/searchbar/searchbar.vue

@@ -10,6 +10,7 @@
 					@keyup.enter="submitFun"
 					@keyup.enter="submitFun"
 					@input="inputFun"
 					@input="inputFun"
 					@blur="blurFun"
 					@blur="blurFun"
+					@focus="focusFun"
 					ref="searchInput"
 					ref="searchInput"
 	    		>
 	    		>
 	    		<span class="close-icon" :class="hasCloseIcon ? 'show':''"
 	    		<span class="close-icon" :class="hasCloseIcon ? 'show':''"
@@ -102,6 +103,7 @@ export default {
     		this.hasCloseIcon = false;
     		this.hasCloseIcon = false;
     	},
     	},
     	focusFun() {
     	focusFun() {
+			
     		this.inputFocusAnimation = true;
     		this.inputFocusAnimation = true;
     		this.$emit('focus');
     		this.$emit('focus');
     	},
     	},
@@ -122,6 +124,7 @@ export default {
 		},
 		},
 		//js控制获取焦点
 		//js控制获取焦点
 		focus() {
 		focus() {
+		
 			this.$nextTick(function() {
 			this.$nextTick(function() {
 				this.$refs.searchInput.focus()
 				this.$refs.searchInput.focus()
 			})
 			})