From 686b497c5815cabb6c4d66f42748a7502cc6ccd1 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Fri, 18 Aug 2017 11:15:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?field=20=E5=A2=9E=E5=8A=A0icon=20slot?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20(#76)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* field 增加icon slot支持
---
 docs/examples-docs/field.md     | 16 +++++++++++++++-
 packages/field/src/field.vue    | 20 ++++++++++++++++++--
 packages/vant-css/src/field.css |  6 ++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/docs/examples-docs/field.md b/docs/examples-docs/field.md
index 560722d85..f8789446d 100644
--- a/docs/examples-docs/field.md
+++ b/docs/examples-docs/field.md
@@ -47,7 +47,15 @@ export default {
     :on-icon-click="onIconClick"
     @blur="onFieldBlur"
     required></van-field>
-  <van-field type="password" label="密码：" placeholder="请输入密码" required></van-field>
+  <van-field
+    type="password"
+    label="密码："
+    placeholder="请输入密码"
+    required>
+    <template slot="icon">
+      <van-icon name="search"></van-icon>
+    </template>
+  </van-field>
   <van-field type="textarea" label="个人介绍：" placeholder="请输入个人介绍" required></van-field>
 </van-cell-group>
 ```
@@ -132,3 +140,9 @@ export default {
 | icon | 输入框尾部图标 | `string`  |  |  icon中支持的类型 |
 | onIconClick | 点击图标的回调函数 | `function`  |  |  |
 
+### Slot
+
+| name       | 描述      |
+|-----------|-----------|
+| icon | 自定义icon |
+
diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue
index 7517345dd..4faedd9c9 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/src/field.vue
@@ -9,7 +9,8 @@
       'van-field--disabled': disabled,
       'van-field--error': error,
       'van-field--border': border,
-      'van-field--autosize': autosize
+      'van-field--autosize': autosize,
+      'van-field--has-icon': showIcon
     }">
     <textarea
       v-if="type === 'textarea'"
@@ -37,7 +38,11 @@
       :maxlength="maxlength"
       :disabled="disabled"
       :readonly="readonly">
-    <van-icon v-if="icon && currentValue" :name="icon" class="van-field__icon" @click="onIconClick"></van-icon>
+    <div v-if="showIcon" class="van-field__icon" @click="onIconClick">
+      <slot name="icon">
+        <van-icon :name="icon"></van-icon>
+      </slot>
+    </div>
   </van-cell>
 </template>
 
@@ -101,6 +106,17 @@ export default {
     }
   },
 
+  computed: {
+    showIcon() {
+      // 有icon的slot，就认为一直展示
+      if (this.$slots.icon) {
+        return true;
+      }
+
+      return this.icon && this.currentValue;
+    }
+  },
+
   methods: {
     handleInput(event) {
       this.currentValue = event.target.value;
diff --git a/packages/vant-css/src/field.css b/packages/vant-css/src/field.css
index e40d6aaa3..6bc7cac56 100644
--- a/packages/vant-css/src/field.css
+++ b/packages/vant-css/src/field.css
@@ -78,6 +78,12 @@
     }
   }
 
+  &--has-icon {
+    .van-field__control {
+      width: 90%;
+    }
+  }
+
   &__control {
     border: 0;
     font-size: 14px;

From dd6fd650774f704d3c67a440df1e8be97155f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 11:17:27 +0800
Subject: [PATCH 2/3] [build] 0.8.1

---
 docs/examples-docs/changelog.md | 7 +++++++
 packages/index.js               | 2 +-
 packages/vant-css/package.json  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 4bbe62f87..b7995333c 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,12 @@
 ## 更新日志
 
+## [v0.8.0](https://github.com/youzan/vant/tree/v0.8.0) (2017-08-17)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.7.10...v0.8.0)
+
+**合并的 Pull Request (可能有不兼容改动):**
+
+- Optimize component building, reduce dist file size  [\#74](https://github.com/youzan/vant/pull/74) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.7.10](https://github.com/youzan/vant/tree/v0.7.10) (2017-08-16)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.8...v0.7.10)
 
diff --git a/packages/index.js b/packages/index.js
index a8e6dc253..cb65c9f82 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.8.0';
+const version = '0.8.1';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index fe2e3f4f5..4a60011c0 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From 4a55f341ab320a3e636221d8e1f72e7f13a26272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 11:17:27 +0800
Subject: [PATCH 3/3] [release] 0.8.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4e7ff63d..0eac4d48d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",