[build] 0.5.18

dist/button/index.js

@@ -5,6 +5,7 @@ VantComponent({
     mixins: [button, openType],
     classes: ['hover-class', 'loading-class'],
     props: {
+        icon: String,
         plain: Boolean,
         block: Boolean,
         round: Boolean,

dist/button/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
+    "van-icon": "../icon/index",
     "van-loading": "../loading/index"
   }
-}
+}

dist/button/index.wxml

@@ -35,5 +35,16 @@
       {{ loadingText }}
     </view>
   </block>
-  <slot wx:else />
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
 </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;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{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:after{border-width:0}.van-button--active:before{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--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.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--info{color:#1989fa}.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}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}
+@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{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:after{border-width:0}.van-button--active:before{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--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.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--info{color:#1989fa}.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__text{display:inline}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}.van-button__icon{min-width:1em;line-height:inherit!important;vertical-align:top}.van-button__icon+.van-button__text:not(:empty){display:inline-block;margin-left:5px;vertical-align:top}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}

dist/checkbox-group/index.json

@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }

dist/collapse-item/index.js

@@ -35,7 +35,11 @@ VantComponent({
         this.updateExpanded()
             .then(nextTick)
             .then(() => {
-            this.set({ transition: true });
+            const data = { transition: true };
+            if (this.data.expanded) {
+                data.contentHeight = 'auto';
+            }
+            this.set(data);
         });
     },
     methods: {

dist/dialog/dialog.js

@@ -8,6 +8,7 @@ const Dialog = options => {
     return new Promise((resolve, reject) => {
         const context = options.context || getContext();
         const dialog = context.selectComponent(options.selector);
+        delete options.context;
         delete options.selector;
         if (dialog) {
             dialog.set(Object.assign({ onCancel: reject, onConfirm: resolve }, options));

dist/field/index.js

@@ -21,7 +21,6 @@ VantComponent({
         iconClass: String,
         clearable: Boolean,
         inputAlign: String,
-        customClass: String,
         customStyle: String,
         confirmType: String,
         confirmHold: Boolean,

dist/field/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
+@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--error{color:#f44}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}

dist/icon/index.wxml

@@ -13,6 +13,7 @@
   <image
     wx:if="{{ utils.isSrc(name) }}"
     src="{{ name }}"
+    mode="aspectFit"
     class="van-icon__image"
   />
 </view>

dist/notify/notify.js

@@ -14,6 +14,7 @@ export default function Notify(options) {
     options = Object.assign({}, defaultOptions, parseOptions(options));
     const context = options.context || getContext();
     const notify = context.selectComponent(options.selector);
+    delete options.context;
     delete options.selector;
     if (notify) {
         notify.set(options);

dist/radio-group/index.json

@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }

dist/search/index.json

@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
     "van-field": "../field/index"
   }
 }

dist/stepper/index.js

@@ -24,6 +24,14 @@ VantComponent({
         step: {
             type: null,
             value: 1
+        },
+        showPlus: {
+            type: Boolean,
+            value: true
+        },
+        showMinus: {
+            type: Boolean,
+            value: true
         }
     },
     computed: {
@@ -77,7 +85,7 @@ VantComponent({
                 return;
             }
             const diff = type === 'minus' ? -this.data.step : +this.data.step;
-            const value = Math.round((this.data.value + diff) * 100) / 100;
+            const value = Math.round((+this.data.value + diff) * 100) / 100;
             this.triggerInput(this.range(value));
             this.$emit(type);
         },

dist/stepper/index.wxml

@@ -3,6 +3,7 @@
 <view class="van-stepper custom-class">
   <view
     class="minus-class {{ utils.bem('stepper__minus', { disabled: minusDisabled }) }}"
+    style="{{ showMinus ? '' : 'display: none;' }}"
     hover-class="van-stepper__minus--hover"
     hover-stay-time="70"
     bind:tap="onMinus"
@@ -20,6 +21,7 @@
   />
   <view
     class="plus-class {{ utils.bem('stepper__plus', { disabled: plusDisabled }) }}"
+    style="{{ showPlus ? '' : 'display: none;' }}"
     hover-class="van-stepper__plus--hover"
     hover-stay-time="70"
     bind:tap="onPlus"

dist/tree-select/index.json

@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-cell": "../cell/index"
+    "van-icon": "../icon/index"
   }
 }

lib/button/index.js

@@ -7,6 +7,7 @@ component_1.VantComponent({
     mixins: [button_1.button, open_type_1.openType],
     classes: ['hover-class', 'loading-class'],
     props: {
+        icon: String,
         plain: Boolean,
         block: Boolean,
         round: Boolean,

lib/button/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
+    "van-icon": "../icon/index",
     "van-loading": "../loading/index"
   }
-}
+}

lib/button/index.wxml

@@ -35,5 +35,16 @@
       {{ loadingText }}
     </view>
   </block>
-  <slot wx:else />
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
 </button>

lib/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;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{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:after{border-width:0}.van-button--active:before{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--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.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--info{color:#1989fa}.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}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}
+@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{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:after{border-width:0}.van-button--active:before{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--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.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--info{color:#1989fa}.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__text{display:inline}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}.van-button__icon{min-width:1em;line-height:inherit!important;vertical-align:top}.van-button__icon+.van-button__text:not(:empty){display:inline-block;margin-left:5px;vertical-align:top}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}

lib/checkbox-group/index.json

@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }

lib/collapse-item/index.js

@@ -38,7 +38,11 @@ component_1.VantComponent({
         this.updateExpanded()
             .then(nextTick)
             .then(function () {
-            _this.set({ transition: true });
+            var data = { transition: true };
+            if (_this.data.expanded) {
+                data.contentHeight = 'auto';
+            }
+            _this.set(data);
         });
     },
     methods: {

lib/dialog/dialog.js

@@ -21,6 +21,7 @@ var Dialog = function (options) {
     return new Promise(function (resolve, reject) {
         var context = options.context || getContext();
         var dialog = context.selectComponent(options.selector);
+        delete options.context;
         delete options.selector;
         if (dialog) {
             dialog.set(__assign({ onCancel: reject, onConfirm: resolve }, options));

lib/field/index.js

@@ -23,7 +23,6 @@ component_1.VantComponent({
         iconClass: String,
         clearable: Boolean,
         inputAlign: String,
-        customClass: String,
         customStyle: String,
         confirmType: String,
         confirmHold: Boolean,

lib/field/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
+@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--error{color:#f44}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}

lib/icon/index.wxml

@@ -13,6 +13,7 @@
   <image
     wx:if="{{ utils.isSrc(name) }}"
     src="{{ name }}"
+    mode="aspectFit"
     class="van-icon__image"
   />
 </view>

lib/notify/notify.js

@@ -16,6 +16,7 @@ function Notify(options) {
     options = Object.assign({}, defaultOptions, parseOptions(options));
     var context = options.context || getContext();
     var notify = context.selectComponent(options.selector);
+    delete options.context;
     delete options.selector;
     if (notify) {
         notify.set(options);

lib/radio-group/index.json

@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }

lib/search/index.json

@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
     "van-field": "../field/index"
   }
 }

lib/stepper/index.js

@@ -26,6 +26,14 @@ component_1.VantComponent({
         step: {
             type: null,
             value: 1
+        },
+        showPlus: {
+            type: Boolean,
+            value: true
+        },
+        showMinus: {
+            type: Boolean,
+            value: true
         }
     },
     computed: {
@@ -79,7 +87,7 @@ component_1.VantComponent({
                 return;
             }
             var diff = type === 'minus' ? -this.data.step : +this.data.step;
-            var value = Math.round((this.data.value + diff) * 100) / 100;
+            var value = Math.round((+this.data.value + diff) * 100) / 100;
             this.triggerInput(this.range(value));
             this.$emit(type);
         },

lib/stepper/index.wxml

@@ -3,6 +3,7 @@
 <view class="van-stepper custom-class">
   <view
     class="minus-class {{ utils.bem('stepper__minus', { disabled: minusDisabled }) }}"
+    style="{{ showMinus ? '' : 'display: none;' }}"
     hover-class="van-stepper__minus--hover"
     hover-stay-time="70"
     bind:tap="onMinus"
@@ -20,6 +21,7 @@
   />
   <view
     class="plus-class {{ utils.bem('stepper__plus', { disabled: plusDisabled }) }}"
+    style="{{ showPlus ? '' : 'display: none;' }}"
     hover-class="van-stepper__plus--hover"
     hover-stay-time="70"
     bind:tap="onPlus"

lib/tree-select/index.json

@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-cell": "../cell/index"
+    "van-icon": "../icon/index"
   }
 }