From 46a051cb05ce96e8019a5e051154e2134f133483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 28 May 2019 09:24:26 +0800
Subject: [PATCH] [new feature] Search: add clearable prop

---
 docs/markdown/changelog.zh-CN.md | 1 +
 packages/search/en-US.md         | 1 +
 packages/search/index.tsx        | 7 ++++++-
 packages/search/zh-CN.md         | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index 93b011162..62ab668ce 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -30,6 +30,7 @@
 
 ##### Search
 
+- 新增`clearable`属性
 - 新增`left-icon`属性
 - 新增`right-icon`属性
 - 新增`right-icon`插槽
diff --git a/packages/search/en-US.md b/packages/search/en-US.md
index af1e5b14d..cabb49595 100644
--- a/packages/search/en-US.md
+++ b/packages/search/en-US.md
@@ -70,6 +70,7 @@ Search support all native properties of input tag，such as `maxlength`、`place
 | label | Search label | `String` | - |
 | shape | Can be set to `round` | `String` | `square` |
 | background | Background color | `String` | `#f2f2f2` |
+| clearable | Whether to be clearable | `Boolean` | `true` |
 | show-action | Whether to show right button | `Boolean` | `false` |
 | disabled | Whether to disable field | `Boolean` | `false` |
 | readonly | Whether to be readonly | `Boolean` | `false` |
diff --git a/packages/search/index.tsx b/packages/search/index.tsx
index 76c8d8c1b..6b05a3d73 100644
--- a/packages/search/index.tsx
+++ b/packages/search/index.tsx
@@ -15,6 +15,7 @@ export type SearchProps = {
   label?: string;
   leftIcon: string;
   rightIcon?: string;
+  clearable: boolean;
   background: string;
   showAction?: boolean;
 };
@@ -92,12 +93,12 @@ function Search(
       <div class={bem('content', props.shape)}>
         {Label()}
         <Field
-          clearable
           type="search"
           border={false}
           value={props.value}
           leftIcon={props.leftIcon}
           rightIcon={props.rightIcon}
+          clearable={props.clearable}
           scopedSlots={{
             'left-icon': slots['left-icon'],
             'right-icon': slots['right-icon']
@@ -119,6 +120,10 @@ Search.props = {
     type: String,
     default: 'square'
   },
+  clearable: {
+    type: Boolean,
+    default: true
+  },
   background: {
     type: String,
     default: '#fff'
diff --git a/packages/search/zh-CN.md b/packages/search/zh-CN.md
index d203918dd..bd5b447c8 100644
--- a/packages/search/zh-CN.md
+++ b/packages/search/zh-CN.md
@@ -63,9 +63,10 @@ Search 默认支持 Input 标签所有的原生属性，比如 `maxlength`、`pl
 | label | 搜索框左侧文本 | `String` | - | 1.6.6 |
 | shape | 形状，可选值为 `round` | `String` | `square` | 1.6.6 |
 | background | 搜索框背景色 | `String` | `#f2f2f2` | - |
+| clearable | 是否启用清除控件 | `Boolean` | `true` | 2.0.0 |
 | show-action | 是否在搜索框右侧显示取消按钮 | `Boolean` | `false` | - |
 | disabled | 是否禁用输入框 | `Boolean` | `false` | - |
-| readonly | 是否只读 | `Boolean` | `false` | - |
+| readonly | 是否将输入框设为只读 | `Boolean` | `false` | - |
 | error | 是否将输入内容标红 | `Boolean` | `false` | - |
 | input-align | 输入框内容对齐方式，可选值为 `center` `right` | `String` | `left` | - |
 | left-icon | 输入框左侧图标名称或图片链接，可选值见 Icon 组件 | `String` | `search` | 2.0.0 |