From 1aba12d4b30b22c99b66926c26658750b48a9941 Mon Sep 17 00:00:00 2001
From: rex-zsd <rexkaneki@gmail.com>
Date: Thu, 28 Feb 2019 10:30:31 +0800
Subject: [PATCH] [build] 0.5.6

---
 dist/area/index.js      |  7 +++++--
 dist/button/index.js    |  4 ++++
 dist/button/index.wxml  |  4 +---
 dist/stepper/index.js   | 23 ++++++++++++++---------
 dist/stepper/index.wxml |  3 ++-
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/dist/area/index.js b/dist/area/index.js
index c0d24a11..9c942050 100644
--- a/dist/area/index.js
+++ b/dist/area/index.js
@@ -138,6 +138,8 @@ VantComponent({
       return 0;
     },
     setValues: function setValues() {
+      var _this2 = this;
+
       var county = this.getConfig('county');
       var code = this.code || Object.keys(county)[0] || '';
       var province = this.getList('province');
@@ -158,8 +160,9 @@ VantComponent({
       }
 
       stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false));
-      stack.push(picker.setIndexes([this.getIndex('province', code), this.getIndex('city', code), this.getIndex('county', code)]));
-      return Promise.all(stack).catch(function () {});
+      return Promise.all(stack).then(function () {
+        return picker.setIndexes([_this2.getIndex('province', code), _this2.getIndex('city', code), _this2.getIndex('county', code)]);
+      }).catch(function () {});
     },
     getValues: function getValues() {
       var picker = this.getPicker();
diff --git a/dist/button/index.js b/dist/button/index.js
index 0c94ae0d..32cc3486 100644
--- a/dist/button/index.js
+++ b/dist/button/index.js
@@ -19,6 +19,10 @@ VantComponent({
     size: {
       type: String,
       value: 'normal'
+    },
+    loadingSize: {
+      type: String,
+      value: '20px'
     }
   },
   methods: {
diff --git a/dist/button/index.wxml b/dist/button/index.wxml
index 7c6a59fe..3d56d448 100644
--- a/dist/button/index.wxml
+++ b/dist/button/index.wxml
@@ -3,7 +3,6 @@
 <button
   id="{{ id }}"
   class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, unclickable: disabled || loading }]) }}"
-
   open-type="{{ openType }}"
   hover-class="van-button--active hover-class"
   lang="{{ lang }}"
@@ -15,7 +14,6 @@
   show-message-card="{{ showMessageCard }}"
   app-parameter="{{ appParameter }}"
   aria-label="{{ ariaLabel }}"
-
   bindtap="onClick"
   bindgetuserinfo="bindGetUserInfo"
   bindcontact="bindContact"
@@ -27,7 +25,7 @@
   <block wx:if="{{ loading }}">
     <van-loading
       custom-class="loading-class"
-      size="{{ size === 'mini' ? '14px' : '20px' }}"
+      size="{{ loadingSize }}"
       color="{{ type === 'default' ? '#c9c9c9' : '' }}"
     />
     <view
diff --git a/dist/stepper/index.js b/dist/stepper/index.js
index 6323341d..1f17b0d8 100644
--- a/dist/stepper/index.js
+++ b/dist/stepper/index.js
@@ -50,10 +50,20 @@ VantComponent({
     });
   },
   methods: {
-    onFocus: function onFocus() {
-      this.setData({
-        focus: true
-      });
+    onClickWrapper: function onClickWrapper() {
+      if (!this.data.focus) {
+        this.setData({
+          focus: true
+        });
+      }
+    },
+    onFocus: function onFocus(event) {
+      this.$emit('focus', event.detail);
+    },
+    onBlur: function onBlur(event) {
+      var value = this.range(this.data.value);
+      this.triggerInput(value);
+      this.$emit('blur', event.detail);
     },
     // limit value range
     range: function range(value) {
@@ -77,11 +87,6 @@ VantComponent({
       this.triggerInput(this.range(value));
       this.$emit(type);
     },
-    onBlur: function onBlur(event) {
-      var value = this.range(this.data.value);
-      this.triggerInput(value);
-      this.$emit('blur', event);
-    },
     onMinus: function onMinus() {
       this.onChange('minus');
     },
diff --git a/dist/stepper/index.wxml b/dist/stepper/index.wxml
index a98f9e25..b14e1fc4 100644
--- a/dist/stepper/index.wxml
+++ b/dist/stepper/index.wxml
@@ -5,7 +5,7 @@
     hover-stay-time="70"
     bind:tap="onMinus"
   />
-  <view class="input-class van-stepper__input-wrapper {{ disabled || disableInput ? 'van-stepper__input-wrapper--disabled' : '' }}" bindtap="onFocus">
+  <view class="input-class van-stepper__input-wrapper {{ disabled || disableInput ? 'van-stepper__input-wrapper--disabled' : '' }}" bindtap="onClickWrapper">
     <input
       type="{{ integer ? 'number' : 'digit' }}"
       class="van-stepper__input"
@@ -13,6 +13,7 @@
       focus="{{ focus }}"
       disabled="{{ disabled || disableInput }}"
       bindinput="onInput"
+      bind:focus="onFocus"
       bind:blur="onBlur"
     />
   </view>