Merge pull request #3106 from rex-zsd/feat/search_20200501

feat(Search): support model value

example/pages/search/index.wxml

@@ -1,18 +1,16 @@
 <demo-block title="基本用法">
   <van-search
-    value="{{ value }}"
+    model:value="{{ value }}"
     placeholder="请输入搜索关键词"
-    bind:change="onChange"
     bind:search="onSearch"
   />
 </demo-block>
 
 <demo-block title="事件监听">
   <van-search
-    value="{{ value }}"
+    model:value="{{ value }}"
     show-action
     placeholder="请输入搜索关键词"
-    bind:change="onChange"
     bind:search="onSearch"
     bind:cancel="onCancel"
     bind:clear="onClear"
@@ -21,7 +19,7 @@
 
 <demo-block title="搜索框内容对齐">
   <van-search
-    value="{{ value }}"
+    model:value="{{ value }}"
     input-align="center"
     placeholder="请输入搜索关键词"
   />
@@ -30,14 +28,14 @@
 <demo-block title="禁用搜索框">
   <van-search
     disabled
-    value="{{ value }}"
+    model:value="{{ value }}"
     placeholder="请输入搜索关键词"
   />
 </demo-block>
 
 <demo-block title="自定义背景色">
   <van-search
-    value="{{ value }}"
+    model:value="{{ value }}"
     shape="round"
     background="#4fc08d"
     placeholder="请输入搜索关键词"
@@ -46,12 +44,11 @@
 
 <demo-block title="自定义按钮">
   <van-search
-    value="{{ value }}"
+    model:value="{{ value }}"
     label="地址"
     shape="round"
     placeholder="请输入搜索关键词"
     use-action-slot
-    bind:change="onChange"
     bind:search="onSearch"
   >
     <view slot="action" bind:tap="onClick">搜索</view>

packages/search/index.ts

@@ -1,5 +1,6 @@
 import { VantComponent } from '../common/component';
 import { Weapp } from 'definitions/weapp';
+import { canIUseModel } from '../common/version';
 
 VantComponent({
   field: true,
@@ -48,7 +49,9 @@ VantComponent({
 
   methods: {
     onChange(event: Weapp.Event) {
+      if (canIUseModel()) {
         this.setData({ value: event.detail });
+      }
       this.$emit('change', event.detail);
     },
 
@@ -58,26 +61,28 @@ VantComponent({
        * https://github.com/youzan/@vant/weapp/issues/1768
        */
       setTimeout(() => {
+        if (canIUseModel()) {
           this.setData({ value: '' });
+        }
         this.$emit('cancel');
         this.$emit('change', '');
       }, 200);
     },
 
-    onSearch() {
+    onSearch(event) {
-      this.$emit('search', this.data.value);
+      this.$emit('search', event.detail);
     },
 
-    onFocus() {
+    onFocus(event) {
-      this.$emit('focus');
+      this.$emit('focus', event.detail);
     },
 
-    onBlur() {
+    onBlur(event) {
-      this.$emit('blur');
+      this.$emit('blur', event.detail);
     },
 
-    onClear() {
+    onClear(event) {
-      this.$emit('clear');
+      this.$emit('clear', event.detail);
     },
   },
 });

tsconfig.json

@@ -9,7 +9,8 @@
     "baseUrl": ".",
     "types": ["miniprogram-api-typings"],
     "paths": {
-      "definitions/*": ["./packages/definitions/*"]
+      "definitions/*": ["./packages/definitions/*"],
+      "packages/*": ["./packages/*"]
     },
     "skipLibCheck": true
   },