build: compile 1.6.2

dist/datetime-picker/index.js

@@ -20,6 +20,9 @@ function times(n, iteratee) {
   return result;
 }
 function getTrueValue(formattedValue) {
+  if (formattedValue === undefined) {
+    formattedValue = '1';
+  }
   while (isNaN(parseInt(formattedValue, 10))) {
     formattedValue = formattedValue.slice(1);
   }

dist/icon/computed.wxs

@@ -0,0 +1,50 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function isImage(name) {
+  return name.indexOf('/') !== -1;
+}
+
+function rootClass(data) {
+  var classes = ['custom-class'];
+
+  if (data.classPrefix != null) {
+    classes.push(data.classPrefix);
+  }
+
+  if (isImage(data.name)) {
+    classes.push('van-icon--image');
+  } else if (data.classPrefix != null) {
+    classes.push(data.classPrefix + '-' + data.name);
+  }
+
+  return classes.join(' ');
+}
+
+function rootStyle(data) {
+  var styles = [];
+
+  if (data.color) {
+    styles.push(['color', data.color]);
+  }
+
+  if (data.size) {
+    styles.push(['font-size', utils.addUnit(data.size)]);
+  }
+
+  if (data.customStyle) {
+    styles.push([data.customStyle]);
+  }
+
+  return styles
+    .map(function (pair) {
+      return pair.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  isImage: isImage,
+  rootClass: rootClass,
+  rootStyle: rootStyle,
+};

dist/icon/index.js

@@ -10,14 +10,7 @@ VantComponent({
       type: String,
       value: 'van-icon',
     },
-    name: {
-      type: String,
-      observer(val) {
-        this.setData({
-          isImageName: val.indexOf('/') !== -1,
-        });
-      },
-    },
+    name: String,
   },
   methods: {
     onClick() {

dist/icon/index.wxml

@@ -1,8 +1,9 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./computed.wxs" module="computed" />
 
 <view
-  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
-  style="color: {{ color }};font-size: {{ utils.addUnit(size) }};{{ customStyle }}"
+  class="{{ computed.rootClass({ classPrefix, name }) }}"
+  style="{{ computed.rootStyle({ customStyle, color, size }) }}"
   bind:tap="onClick"
 >
   <van-info
@@ -12,7 +13,7 @@
     custom-class="van-icon__info"
   />
   <image
-    wx:if="{{ isImageName }}"
+    wx:if="{{ computed.isImage(name) }}"
     src="{{ name }}"
     mode="aspectFit"
     class="van-icon__image"

dist/info/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;line-height:1.2;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:-apple-system-font,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,-apple-system-font,Helvetica Neue,Arial,sans-serif);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}
+@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;height:16px;height:var(--info-size,16px);min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:-apple-system-font,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,-apple-system-font,Helvetica Neue,Arial,sans-serif);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}

dist/notify/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-notify{text-align:center;word-wrap:break-word;padding:6px 15px;padding:var(--notify-padding,6px 15px);font-size:14px;font-size:var(--notify-font-size,14px);line-height:20px;line-height:var(--notify-line-height,20px)}.van-notify__container{position:fixed;top:0;box-sizing:border-box;width:100%}.van-notify--primary{background-color:#1989fa;background-color:var(--notify-primary-background-color,#1989fa)}.van-notify--success{background-color:#07c160;background-color:var(--notify-success-background-color,#07c160)}.van-notify--danger{background-color:#ee0a24;background-color:var(--notify-danger-background-color,#ee0a24)}.van-notify--warning{background-color:#ff976a;background-color:var(--notify-warning-background-color,#ff976a)}
+@import '../common/index.wxss';.van-notify{text-align:center;word-wrap:break-word;padding:6px 15px;padding:var(--notify-padding,6px 15px);font-size:14px;font-size:var(--notify-font-size,14px);line-height:20px;line-height:var(--notify-line-height,20px)}.van-notify__container{position:fixed;top:0;left:0;box-sizing:border-box;width:100%}.van-notify--primary{background-color:#1989fa;background-color:var(--notify-primary-background-color,#1989fa)}.van-notify--success{background-color:#07c160;background-color:var(--notify-success-background-color,#07c160)}.van-notify--danger{background-color:#ee0a24;background-color:var(--notify-danger-background-color,#ee0a24)}.van-notify--warning{background-color:#ff976a;background-color:var(--notify-warning-background-color,#ff976a)}

dist/tabbar-item/index.js

@@ -5,6 +5,10 @@ VantComponent({
     name: null,
     icon: String,
     dot: Boolean,
+    iconPrefix: {
+      type: String,
+      value: 'van-icon',
+    },
   },
   relation: {
     name: 'tabbar',
@@ -16,8 +20,13 @@ VantComponent({
   },
   methods: {
     onClick() {
-      if (this.parent) {
-        this.parent.onChange(this);
+      const { parent } = this;
+      if (parent) {
+        const index = parent.children.indexOf(this);
+        const active = this.data.name || index;
+        if (active !== this.data.active) {
+          parent.$emit('change', active);
+        }
       }
       this.$emit('click');
     },
@@ -40,9 +49,9 @@ VantComponent({
       if (parentData.inactiveColor !== data.inactiveColor) {
         patch.inactiveColor = parentData.inactiveColor;
       }
-      return Object.keys(patch).length > 0
-        ? this.set(patch)
-        : Promise.resolve();
+      if (Object.keys(patch).length > 0) {
+        this.setData(patch);
+      }
     },
   },
 });

dist/tabbar-item/index.wxml

@@ -3,19 +3,17 @@
 <view
   class="{{ utils.bem('tabbar-item', { active }) }} custom-class"
   style="color: {{ active ? activeColor : inactiveColor }}"
-  bind:tap="onClick"
+  bindtap="onClick"
 >
   <view class="van-tabbar-item__icon">
     <van-icon
       wx:if="{{ icon }}"
       name="{{ icon }}"
+      class-prefix="{{ iconPrefix }}"
       custom-class="van-tabbar-item__icon__inner"
     />
     <block wx:else>
-      <slot
-        wx:if="{{ active }}"
-        name="icon-active"
-      />
+      <slot wx:if="{{ active }}" name="icon-active" />
       <slot wx:else name="icon" />
     </block>
     <van-info

dist/tabbar/index.js

@@ -1,3 +1,4 @@
+import { getRect } from '../common/utils';
 import { VantComponent } from '../common/component';
 VantComponent({
   relation: {
@@ -28,6 +29,11 @@ VantComponent({
     fixed: {
       type: Boolean,
       value: true,
+      observer: 'setHeight',
+    },
+    placeholder: {
+      type: Boolean,
+      observer: 'setHeight',
     },
     border: {
       type: Boolean,
@@ -42,20 +48,26 @@ VantComponent({
       value: true,
     },
   },
+  data: {
+    height: 50,
+  },
   methods: {
     updateChildren() {
       const { children } = this;
       if (!Array.isArray(children) || !children.length) {
-        return Promise.resolve();
+        return;
       }
-      return Promise.all(children.map((child) => child.updateFromParent()));
+      children.forEach((child) => child.updateFromParent());
     },
-    onChange(child) {
-      const index = this.children.indexOf(child);
-      const active = child.data.name || index;
-      if (active !== this.data.active) {
-        this.$emit('change', active);
+    setHeight() {
+      if (!this.data.fixed || !this.data.placeholder) {
+        return;
       }
+      wx.nextTick(() => {
+        getRect.call(this, '.van-tabbar').then((res) => {
+          this.setData({ height: res.height });
+        });
+      });
     },
   },
 });

dist/tabbar/index.wxml

@@ -1,8 +1,10 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
 <view
-  class="custom-class {{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }}"
+  class="{{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }} custom-class"
   style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
 >
   <slot />
 </view>
+
+<view wx:if="{{ fixed && placeholder }}" style="height: {{ height }}px;"></view>

dist/tabs/index.js

@@ -193,7 +193,7 @@ VantComponent({
       if (this.data.type !== 'line') {
         return;
       }
-      const { currentIndex } = this.data;
+      const { currentIndex, ellipsis } = this.data;
       Promise.all([
         getAllRect.call(this, '.van-tab'),
         getRect.call(this, '.van-tabs__line'),
@@ -205,7 +205,8 @@ VantComponent({
         let lineOffsetLeft = rects
           .slice(0, currentIndex)
           .reduce((prev, curr) => prev + curr.width, 0);
-        lineOffsetLeft += (rect.width - lineRect.width) / 2;
+        lineOffsetLeft +=
+          (rect.width - lineRect.width) / 2 + (ellipsis ? 0 : 8);
         this.setData({
           lineOffsetLeft,
           skipTransition,

lib/datetime-picker/index.js

@@ -47,6 +47,9 @@ function times(n, iteratee) {
   return result;
 }
 function getTrueValue(formattedValue) {
+  if (formattedValue === undefined) {
+    formattedValue = '1';
+  }
   while (isNaN(parseInt(formattedValue, 10))) {
     formattedValue = formattedValue.slice(1);
   }

lib/icon/computed.wxs

@@ -0,0 +1,50 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function isImage(name) {
+  return name.indexOf('/') !== -1;
+}
+
+function rootClass(data) {
+  var classes = ['custom-class'];
+
+  if (data.classPrefix != null) {
+    classes.push(data.classPrefix);
+  }
+
+  if (isImage(data.name)) {
+    classes.push('van-icon--image');
+  } else if (data.classPrefix != null) {
+    classes.push(data.classPrefix + '-' + data.name);
+  }
+
+  return classes.join(' ');
+}
+
+function rootStyle(data) {
+  var styles = [];
+
+  if (data.color) {
+    styles.push(['color', data.color]);
+  }
+
+  if (data.size) {
+    styles.push(['font-size', utils.addUnit(data.size)]);
+  }
+
+  if (data.customStyle) {
+    styles.push([data.customStyle]);
+  }
+
+  return styles
+    .map(function (pair) {
+      return pair.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  isImage: isImage,
+  rootClass: rootClass,
+  rootStyle: rootStyle,
+};

lib/icon/index.js

@@ -12,14 +12,7 @@ component_1.VantComponent({
       type: String,
       value: 'van-icon',
     },
-    name: {
-      type: String,
-      observer: function (val) {
-        this.setData({
-          isImageName: val.indexOf('/') !== -1,
-        });
-      },
-    },
+    name: String,
   },
   methods: {
     onClick: function () {

lib/icon/index.wxml

@@ -1,8 +1,9 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./computed.wxs" module="computed" />
 
 <view
-  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
-  style="color: {{ color }};font-size: {{ utils.addUnit(size) }};{{ customStyle }}"
+  class="{{ computed.rootClass({ classPrefix, name }) }}"
+  style="{{ computed.rootStyle({ customStyle, color, size }) }}"
   bind:tap="onClick"
 >
   <van-info
@@ -12,7 +13,7 @@
     custom-class="van-icon__info"
   />
   <image
-    wx:if="{{ isImageName }}"
+    wx:if="{{ computed.isImage(name) }}"
     src="{{ name }}"
     mode="aspectFit"
     class="van-icon__image"

lib/info/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;line-height:1.2;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:-apple-system-font,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,-apple-system-font,Helvetica Neue,Arial,sans-serif);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}
+@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;height:16px;height:var(--info-size,16px);min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:-apple-system-font,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,-apple-system-font,Helvetica Neue,Arial,sans-serif);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}

lib/notify/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-notify{text-align:center;word-wrap:break-word;padding:6px 15px;padding:var(--notify-padding,6px 15px);font-size:14px;font-size:var(--notify-font-size,14px);line-height:20px;line-height:var(--notify-line-height,20px)}.van-notify__container{position:fixed;top:0;box-sizing:border-box;width:100%}.van-notify--primary{background-color:#1989fa;background-color:var(--notify-primary-background-color,#1989fa)}.van-notify--success{background-color:#07c160;background-color:var(--notify-success-background-color,#07c160)}.van-notify--danger{background-color:#ee0a24;background-color:var(--notify-danger-background-color,#ee0a24)}.van-notify--warning{background-color:#ff976a;background-color:var(--notify-warning-background-color,#ff976a)}
+@import '../common/index.wxss';.van-notify{text-align:center;word-wrap:break-word;padding:6px 15px;padding:var(--notify-padding,6px 15px);font-size:14px;font-size:var(--notify-font-size,14px);line-height:20px;line-height:var(--notify-line-height,20px)}.van-notify__container{position:fixed;top:0;left:0;box-sizing:border-box;width:100%}.van-notify--primary{background-color:#1989fa;background-color:var(--notify-primary-background-color,#1989fa)}.van-notify--success{background-color:#07c160;background-color:var(--notify-success-background-color,#07c160)}.van-notify--danger{background-color:#ee0a24;background-color:var(--notify-danger-background-color,#ee0a24)}.van-notify--warning{background-color:#ff976a;background-color:var(--notify-warning-background-color,#ff976a)}

lib/tabbar-item/index.js

@@ -7,6 +7,10 @@ component_1.VantComponent({
     name: null,
     icon: String,
     dot: Boolean,
+    iconPrefix: {
+      type: String,
+      value: 'van-icon',
+    },
   },
   relation: {
     name: 'tabbar',
@@ -18,8 +22,13 @@ component_1.VantComponent({
   },
   methods: {
     onClick: function () {
-      if (this.parent) {
-        this.parent.onChange(this);
+      var parent = this.parent;
+      if (parent) {
+        var index = parent.children.indexOf(this);
+        var active = this.data.name || index;
+        if (active !== this.data.active) {
+          parent.$emit('change', active);
+        }
       }
       this.$emit('click');
     },
@@ -42,9 +51,9 @@ component_1.VantComponent({
       if (parentData.inactiveColor !== data.inactiveColor) {
         patch.inactiveColor = parentData.inactiveColor;
       }
-      return Object.keys(patch).length > 0
-        ? this.set(patch)
-        : Promise.resolve();
+      if (Object.keys(patch).length > 0) {
+        this.setData(patch);
+      }
     },
   },
 });

lib/tabbar-item/index.wxml

@@ -3,19 +3,17 @@
 <view
   class="{{ utils.bem('tabbar-item', { active }) }} custom-class"
   style="color: {{ active ? activeColor : inactiveColor }}"
-  bind:tap="onClick"
+  bindtap="onClick"
 >
   <view class="van-tabbar-item__icon">
     <van-icon
       wx:if="{{ icon }}"
       name="{{ icon }}"
+      class-prefix="{{ iconPrefix }}"
       custom-class="van-tabbar-item__icon__inner"
     />
     <block wx:else>
-      <slot
-        wx:if="{{ active }}"
-        name="icon-active"
-      />
+      <slot wx:if="{{ active }}" name="icon-active" />
       <slot wx:else name="icon" />
     </block>
     <van-info

lib/tabbar/index.js

@@ -1,5 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
+var utils_1 = require('../common/utils');
 var component_1 = require('../common/component');
 component_1.VantComponent({
   relation: {
@@ -30,6 +31,11 @@ component_1.VantComponent({
     fixed: {
       type: Boolean,
       value: true,
+      observer: 'setHeight',
+    },
+    placeholder: {
+      type: Boolean,
+      observer: 'setHeight',
     },
     border: {
       type: Boolean,
@@ -44,24 +50,29 @@ component_1.VantComponent({
       value: true,
     },
   },
+  data: {
+    height: 50,
+  },
   methods: {
     updateChildren: function () {
       var children = this.children;
       if (!Array.isArray(children) || !children.length) {
-        return Promise.resolve();
+        return;
       }
-      return Promise.all(
-        children.map(function (child) {
-          return child.updateFromParent();
-        })
-      );
+      children.forEach(function (child) {
+        return child.updateFromParent();
+      });
     },
-    onChange: function (child) {
-      var index = this.children.indexOf(child);
-      var active = child.data.name || index;
-      if (active !== this.data.active) {
-        this.$emit('change', active);
+    setHeight: function () {
+      var _this = this;
+      if (!this.data.fixed || !this.data.placeholder) {
+        return;
       }
+      wx.nextTick(function () {
+        utils_1.getRect.call(_this, '.van-tabbar').then(function (res) {
+          _this.setData({ height: res.height });
+        });
+      });
     },
   },
 });

lib/tabbar/index.wxml

@@ -1,8 +1,10 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
 <view
-  class="custom-class {{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }}"
+  class="{{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }} custom-class"
   style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
 >
   <slot />
 </view>
+
+<view wx:if="{{ fixed && placeholder }}" style="height: {{ height }}px;"></view>

lib/tabs/index.js

@@ -215,7 +215,9 @@ component_1.VantComponent({
       if (this.data.type !== 'line') {
         return;
       }
-      var currentIndex = this.data.currentIndex;
+      var _a = this.data,
+        currentIndex = _a.currentIndex,
+        ellipsis = _a.ellipsis;
       Promise.all([
         utils_1.getAllRect.call(this, '.van-tab'),
         utils_1.getRect.call(this, '.van-tabs__line'),
@@ -232,7 +234,8 @@ component_1.VantComponent({
           .reduce(function (prev, curr) {
             return prev + curr.width;
           }, 0);
-        lineOffsetLeft += (rect.width - lineRect.width) / 2;
+        lineOffsetLeft +=
+          (rect.width - lineRect.width) / 2 + (ellipsis ? 0 : 8);
         _this.setData({
           lineOffsetLeft: lineOffsetLeft,
           skipTransition: skipTransition,