[build] 0.5.4

dist/action-sheet/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-action-sheet{max-height:90%!important;color:#333}.van-action-sheet__cancel{height:60px}.van-action-sheet__cancel::before{display:block;height:10px;background-color:#f8f8f8;content:' '}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;font-size:16px;line-height:50px;text-align:center;background-color:#fff}.van-action-sheet__cancel--hover,.van-action-sheet__item--hover{background-color:#e8e8e8}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled.van-action-sheet__item--hover{background-color:#fff}.van-action-sheet__subname{margin-left:5px;font-size:12px;color:#7d7e80}.van-action-sheet__header{font-size:16px;font-weight:500;line-height:44px;text-align:center}.van-action-sheet__close{position:absolute!important;top:0;right:0;padding:0 15px;font-size:18px!important;line-height:inherit!important;color:#999}
+@import '../common/index.wxss';.van-action-sheet{max-height:90%!important;color:#333}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;font-size:16px;line-height:50px;text-align:center;background-color:#fff}.van-action-sheet__cancel--hover,.van-action-sheet__item--hover{background-color:#e8e8e8}.van-action-sheet__cancel{height:60px}.van-action-sheet__cancel::before{display:block;height:10px;background-color:#f8f8f8;content:' '}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled.van-action-sheet__item--hover{background-color:#fff}.van-action-sheet__subname{margin-left:5px;font-size:12px;color:#7d7e80}.van-action-sheet__header{font-size:16px;font-weight:500;line-height:44px;text-align:center}.van-action-sheet__close{position:absolute!important;top:0;right:0;padding:0 15px;font-size:18px!important;line-height:inherit!important;color:#999}

dist/area/index.js

@@ -5,6 +5,8 @@ VantComponent({
     title: String,
     value: String,
     loading: Boolean,
+    cancelButtonText: String,
+    confirmButtonText: String,
     itemHeight: {
       type: Number,
       value: 44
@@ -136,8 +138,6 @@ 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');
@@ -149,18 +149,17 @@ VantComponent({
       }
 
       var stack = [];
-      stack.push(picker.setColumnValues(0, province));
+      stack.push(picker.setColumnValues(0, province, false));
-      stack.push(picker.setColumnValues(1, city));
+      stack.push(picker.setColumnValues(1, city, false));
 
       if (city.length && code.slice(2, 4) === '00') {
         ;
         code = city[0].code;
       }
 
-      stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4))));
+      stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false));
-      return Promise.all(stack).then(function () {
+      stack.push(picker.setIndexes([this.getIndex('province', code), this.getIndex('city', code), this.getIndex('county', code)]));
-        return picker.setIndexes([_this2.getIndex('province', code), _this2.getIndex('city', code), _this2.getIndex('county', code)]);
+      return Promise.all(stack).catch(function () {});
-      }).catch(function () {});
     },
     getValues: function getValues() {
       var picker = this.getPicker();

dist/area/index.wxml

@@ -10,6 +10,8 @@
   columns="{{ displayColumns }}"
   item-height="{{ itemHeight }}"
   visible-item-count="{{ visibleItemCount }}"
+  cancel-button-text="{{ cancelButtonText }}"
+  confirm-button-text="{{ confirmButtonText }}"
   bind:change="onChange"
   bind:confirm="onConfirm"
   bind:cancel="onCancel"

dist/button/index.js

@@ -11,6 +11,7 @@ VantComponent({
     square: Boolean,
     loading: Boolean,
     disabled: Boolean,
+    loadingText: String,
     type: {
       type: String,
       value: 'default'

dist/button/index.wxml

@@ -7,6 +7,7 @@
   open-type="{{ openType }}"
   hover-class="van-button--active hover-class"
   lang="{{ lang }}"
+  business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   send-message-title="{{ sendMessageTitle }}"
   send-message-path="{{ sendMessagePath }}"
@@ -23,11 +24,18 @@
   bindlaunchapp="bindLaunchApp"
   bindopensetting="bindOpenSetting"
 >
+  <block wx:if="{{ loading }}">
     <van-loading
-    wx:if="{{ 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>

dist/button/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;-webkit-text-size-adjust:100%;vertical-align:middle;border-radius:2px;box-sizing:border-box;-webkit-appearance:none}.van-button::after{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:' ';opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button--active::after{opacity:.15}.van-button--unclickable::after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#07c160;border:1px solid #07c160}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#07c160}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;min-width:60px;padding:0 8px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;font-size:10px;line-height:20px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:block;width:100%}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}
+@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;-webkit-text-size-adjust:100%;vertical-align:middle;border-radius:2px;box-sizing:border-box;-webkit-appearance:none}.van-button::after{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:' ';opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button--active::after{opacity:.15}.van-button--unclickable::after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#07c160;border:1px solid #07c160}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#07c160}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;min-width:60px;padding:0 8px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;font-size:10px;line-height:20px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:block;width:100%}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}

dist/dialog/index.js

@@ -1,7 +1,8 @@
 import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
 import { openType } from '../mixins/open-type';
 VantComponent({
-  mixins: [openType],
+  mixins: [button, openType],
   props: {
     show: Boolean,
     title: String,

dist/dialog/index.wxml

@@ -39,13 +39,24 @@
       class="van-dialog__button"
       loading="{{ loading.confirm }}"
       custom-class="van-dialog__confirm"
+
       open-type="{{ confirmButtonOpenType }}"
+      lang="{{ lang }}"
+      business-id="{{ businessId }}"
+      session-from="{{ sessionFrom }}"
+      send-message-title="{{ sendMessageTitle }}"
+      send-message-path="{{ sendMessagePath }}"
+      send-message-img="{{ sendMessageImg }}"
+      show-message-card="{{ showMessageCard }}"
+      app-parameter="{{ appParameter }}"
+
       bind:click="onConfirm"
-      binderror="bindError"
-      bindcontact="bindContact"
-      bindopensetting="bindOpenSetting"
       bindgetuserinfo="bindGetUserInfo"
+      bindcontact="bindContact"
       bindgetphonenumber="bindGetPhoneNumber"
+      binderror="bindError"
+      bindlaunchapp="bindLaunchApp"
+      bindopensetting="bindOpenSetting"
     >
       {{ confirmButtonText }}
     </van-button>

dist/mixins/button.js

@@ -6,11 +6,12 @@ export var button = Behavior({
       type: String,
       value: 'en'
     },
+    businessId: Number,
     sessionFrom: String,
     sendMessageTitle: String,
     sendMessagePath: String,
     sendMessageImg: String,
-    showMessageCard: String,
+    showMessageCard: Boolean,
     appParameter: String,
     ariaLabel: String
   }

dist/switch-cell/index.js

@@ -2,6 +2,7 @@ import { VantComponent } from '../common/component';
 VantComponent({
   field: true,
   props: {
+    value: null,
     title: String,
     border: Boolean,
     checked: Boolean,
@@ -12,6 +13,14 @@ VantComponent({
     size: {
       type: String,
       value: '24px'
+    },
+    activeValue: {
+      type: null,
+      value: true
+    },
+    inactiveValue: {
+      type: null,
+      value: false
     }
   },
   watch: {

dist/switch-cell/index.wxml

@@ -11,6 +11,8 @@
     disabled="{{ disabled }}"
     active-color="{{ activeColor }}"
     inactive-color="{{ inactiveColor }}"
+    active-value="{{ activeValue }}"
+    inactive-value="{{ inactiveValue }}"
     custom-class="van-switch-cell__switch"
     bind:change="onChange"
   />

dist/switch/index.js

@@ -3,7 +3,7 @@ VantComponent({
   field: true,
   classes: ['node-class'],
   props: {
-    checked: Boolean,
+    checked: null,
     loading: Boolean,
     disabled: Boolean,
     activeColor: String,
@@ -11,6 +11,14 @@ VantComponent({
     size: {
       type: String,
       value: '30px'
+    },
+    activeValue: {
+      type: null,
+      value: true
+    },
+    inactiveValue: {
+      type: null,
+      value: false
     }
   },
   watch: {
@@ -27,10 +35,15 @@ VantComponent({
   },
   methods: {
     onClick: function onClick() {
+      var _this$data = this.data,
+          activeValue = _this$data.activeValue,
+          inactiveValue = _this$data.inactiveValue;
+
       if (!this.data.disabled && !this.data.loading) {
-        var checked = !this.data.checked;
+        var checked = this.data.checked === activeValue;
-        this.$emit('input', checked);
+        var value = checked ? inactiveValue : activeValue;
-        this.$emit('change', checked);
+        this.$emit('input', value);
+        this.$emit('change', value);
       }
     }
   }

dist/switch/index.wxml

@@ -1,7 +1,7 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
 <view
-  class="custom-class {{ utils.bem('switch', { on: checked, disabled }) }}"
+  class="custom-class {{ utils.bem('switch', { on: value === activeValue, disabled }) }}"
   style="font-size: {{ size }}; {{ (checked ? activeColor : inactiveColor) ? 'background-color: ' + (checked ? activeColor : inactiveColor ) : '' }}"
   bind:tap="onClick"
 >

dist/tabs/index.js

@@ -90,7 +90,7 @@ VantComponent({
     this.child = [];
   },
   mounted: function mounted() {
-    this.setLine();
+    this.setLine(true);
     this.setTrack();
     this.scrollIntoView();
   },
@@ -131,7 +131,7 @@ VantComponent({
         this.setActiveTab();
       }
     },
-    setLine: function setLine() {
+    setLine: function setLine(skipTransition) {
       var _this = this;
 
       if (this.data.type !== 'line') {
@@ -152,9 +152,10 @@ VantComponent({
           return prev + curr.width;
         }, 0);
         left += (rect.width - width) / 2;
+        var transition = skipTransition ? '' : "transition-duration: " + duration + "s; -webkit-transition-duration: " + duration + "s;";
 
         _this.set({
-          lineStyle: "\n            " + height + "\n            width: " + width + "px;\n            background-color: " + color + ";\n            -webkit-transform: translateX(" + left + "px);\n            -webkit-transition-duration: " + duration + "s;\n            transform: translateX(" + left + "px);\n            transition-duration: " + duration + "s;\n          "
+          lineStyle: "\n            " + height + "\n            width: " + width + "px;\n            background-color: " + color + ";\n            -webkit-transform: translateX(" + left + "px);\n            transform: translateX(" + left + "px);\n            " + transition + "\n          "
         });
       });
     },