From 59efba991b4c27861b2bbb4a180c44d30dd91be8 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 13 Feb 2019 17:53:54 +0800
Subject: [PATCH] [new feature] Button: add loading-text prop (#1300)

---
 example/pages/button/index.wxml |  4 ++--
 example/pages/button/index.wxss |  4 ----
 packages/button/README.md       |  2 +-
 packages/button/index.less      |  6 ++++++
 packages/button/index.ts        |  1 +
 packages/button/index.wxml      | 19 +++++++++++++------
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/example/pages/button/index.wxml b/example/pages/button/index.wxml
index c91445c1..414d313d 100644
--- a/example/pages/button/index.wxml
+++ b/example/pages/button/index.wxml
@@ -19,8 +19,8 @@
   </demo-block>
 
   <demo-block title="加载状态" padding>
-    <van-button loading type="primary" class="demo-margin-right" loading-class="loading" />
-    <van-button loading type="danger" loading-class="loading" />
+    <van-button loading type="primary" class="demo-margin-right" />
+    <van-button loading type="danger" loading-text="加载中..." />
   </demo-block>
 
   <demo-block title="按钮形状" padding>
diff --git a/example/pages/button/index.wxss b/example/pages/button/index.wxss
index 86c2e512..a5c4a026 100644
--- a/example/pages/button/index.wxss
+++ b/example/pages/button/index.wxss
@@ -1,7 +1,3 @@
-.loading {
-  margin: 0 18px;
-}
-
 .row {
   height: 44px;
   margin-bottom: 15px;
diff --git a/packages/button/README.md b/packages/button/README.md
index adff5fe7..eccc8e1c 100644
--- a/packages/button/README.md
+++ b/packages/button/README.md
@@ -40,7 +40,7 @@
 
 ```html 
 <van-button loading type="primary" />
-<van-button loading type="danger" />
+<van-button loading type="danger" loading-text="加载中..." />
 ```
 
 #### 按钮形状
diff --git a/packages/button/index.less b/packages/button/index.less
index dc0e6015..4a098f85 100644
--- a/packages/button/index.less
+++ b/packages/button/index.less
@@ -125,4 +125,10 @@
   &--disabled {
     opacity: 0.5;
   }
+
+  &__loading-text {
+    margin-left: 5px;
+    display: inline-block;
+    vertical-align: middle;
+  }
 }
diff --git a/packages/button/index.ts b/packages/button/index.ts
index 6ecc9ae4..c8006755 100644
--- a/packages/button/index.ts
+++ b/packages/button/index.ts
@@ -14,6 +14,7 @@ VantComponent({
     square: Boolean,
     loading: Boolean,
     disabled: Boolean,
+    loadingText: String,
     type: {
       type: String,
       value: 'default'
diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index 3c18b206..4422220f 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -23,11 +23,18 @@
   bindlaunchapp="bindLaunchApp"
   bindopensetting="bindOpenSetting"
 >
-  <van-loading
-    wx:if="{{ loading }}"
-    custom-class="loading-class"
-    size="{{ size === 'mini' ? '14px' : '20px' }}"
-    color="{{ type === 'default' ? '#c9c9c9' : '' }}"
-  />
+  <block wx:if="{{ loading }}">
+    <van-loading
+      custom-class="loading-class"
+      size="{{ size === 'mini' ? '14px' : '20px' }}"
+      color="{{ type === 'default' ? '#c9c9c9' : '' }}"
+    />
+    <view
+      wx:if="{{ loadingText }}"
+      class="van-button__loading-text"
+    >
+      {{ loadingText }}
+    </view>
+  </block>
   <slot wx:else />
 </button>