From 6e7dafb4edb1327509a973aeb62003902e1b8b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Dec 2018 16:13:02 +0800 Subject: [PATCH] [build] 0.4.9 --- dist/action-sheet/index.js | 4 + dist/action-sheet/index.wxml | 1 + dist/area/index.js | 4 +- dist/badge/index.js | 2 +- dist/checkbox-group/index.js | 6 +- dist/col/index.js | 2 +- dist/collapse-item/index.js | 6 +- dist/collapse-item/index.wxml | 1 - dist/collapse/index.js | 2 +- dist/common/utils.js | 6 +- dist/common/utils.wxs | 5 ++ dist/datetime-picker/index.js | 16 ++-- dist/dialog/dialog.js | 2 +- dist/dialog/index.js | 6 +- dist/field/index.js | 8 +- dist/goods-action/index.js | 19 ++++- dist/goods-action/index.wxml | 2 +- dist/goods-action/index.wxss | 2 +- dist/icon/index.js | 6 -- dist/icon/index.wxml | 6 +- dist/mixins/basic.js | 22 +++++- dist/mixins/observer/behavior.js | 26 ++++--- dist/mixins/observer/index.js | 2 +- dist/mixins/observer/props.js | 2 +- dist/mixins/transition.js | 34 +++++++-- dist/notice-bar/index.js | 16 ++-- dist/notify/index.js | 4 +- dist/notify/notify.js | 2 +- dist/popup/index.js | 16 ++++ dist/popup/index.wxml | 4 +- dist/popup/index.wxss | 2 +- dist/progress/index.js | 4 +- dist/radio-group/index.js | 6 +- dist/rate/index.js | 5 +- dist/rate/index.wxml | 1 + dist/row/index.js | 2 +- dist/search/index.js | 4 +- dist/slider/index.js | 2 +- dist/stepper/index.js | 12 ++- dist/steps/index.js | 2 +- dist/steps/index.wxss | 2 +- dist/submit-bar/index.js | 12 +++ dist/submit-bar/index.wxml | 2 +- dist/submit-bar/index.wxss | 2 +- dist/swipe-cell/index.js | 8 +- dist/switch-cell/index.js | 4 +- dist/switch/index.js | 4 +- dist/tabbar-item/index.js | 2 +- dist/tabbar/index.js | 22 +++++- dist/tabbar/index.wxml | 2 +- dist/tabbar/index.wxss | 2 +- dist/tabs/index.js | 127 ++++++++++++++++++++++++++++--- dist/tabs/index.wxml | 14 +++- dist/toast/index.js | 2 +- dist/toast/toast.js | 2 +- dist/transition/index.wxml | 2 +- dist/tree-select/index.js | 6 +- 57 files changed, 357 insertions(+), 132 deletions(-) create mode 100644 dist/common/utils.wxs diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js index 2f1d455e..534fc458 100644 --- a/dist/action-sheet/index.js +++ b/dist/action-sheet/index.js @@ -19,6 +19,10 @@ VantComponent({ closeOnClickOverlay: { type: Boolean, value: true + }, + safeAreaInsetBottom: { + type: Boolean, + value: true } }, methods: { diff --git a/dist/action-sheet/index.wxml b/dist/action-sheet/index.wxml index 5bfe879d..2435c5c1 100644 --- a/dist/action-sheet/index.wxml +++ b/dist/action-sheet/index.wxml @@ -4,6 +4,7 @@ z-index="{{ zIndex }}" overlay="{{ overlay }}" custom-class="van-action-sheet" + safe-area-inset-bottom="{{ safeAreaInsetBottom }}" close-on-click-overlay="{{ closeOnClickOverlay }}" bind:close="onClose" > diff --git a/dist/area/index.js b/dist/area/index.js index d14bef91..7bab3e4c 100644 --- a/dist/area/index.js +++ b/dist/area/index.js @@ -128,7 +128,7 @@ VantComponent({ var code = this.code || this.data.areaList && Object.keys(this.data.areaList.county_list || {})[0] || ''; var province = this.getList('province'); var city = this.getList('city', code.slice(0, 2)); - this.setData({ + this.set({ 'columns[0]': province, 'columns[1]': city }); @@ -137,7 +137,7 @@ VantComponent({ code = city[0].code; } - this.setData({ + this.set({ 'columns[2]': this.getList('county', code.slice(0, 4)), pickerValue: [this.getIndex('province', code), this.getIndex('city', code), this.getIndex('county', code)] }); diff --git a/dist/badge/index.js b/dist/badge/index.js index 512370ad..e9d52988 100644 --- a/dist/badge/index.js +++ b/dist/badge/index.js @@ -17,7 +17,7 @@ VantComponent({ } }, setActive: function setActive(active) { - this.setData({ + this.set({ active: active }); } diff --git a/dist/checkbox-group/index.js b/dist/checkbox-group/index.js index 31030eb2..21bc5225 100644 --- a/dist/checkbox-group/index.js +++ b/dist/checkbox-group/index.js @@ -8,7 +8,7 @@ VantComponent({ var _this$data = this.data, value = _this$data.value, disabled = _this$data.disabled; - target.setData({ + target.set({ value: value.indexOf(target.data.name) !== -1, disabled: disabled || target.data.disabled }); @@ -23,7 +23,7 @@ VantComponent({ value: function value(_value) { var children = this.getRelationNodes('../checkbox/index'); children.forEach(function (child) { - child.setData({ + child.set({ value: _value.indexOf(child.data.name) !== -1 }); }); @@ -31,7 +31,7 @@ VantComponent({ disabled: function disabled(_disabled) { var children = this.getRelationNodes('../checkbox/index'); children.forEach(function (child) { - child.setData({ + child.set({ disabled: _disabled || child.data.disabled }); }); diff --git a/dist/col/index.js b/dist/col/index.js index 0a6e7b28..13a890c9 100644 --- a/dist/col/index.js +++ b/dist/col/index.js @@ -28,7 +28,7 @@ VantComponent({ var style = gutter ? "padding-left: " + padding + "; padding-right: " + padding + ";" : ''; if (style !== this.data.style) { - this.setData({ + this.set({ style: style }); } diff --git a/dist/collapse-item/index.js b/dist/collapse-item/index.js index 7416abfa..594e4a9e 100644 --- a/dist/collapse-item/index.js +++ b/dist/collapse-item/index.js @@ -60,7 +60,7 @@ VantComponent({ this.updateStyle(expanded); } - this.setData({ + this.set({ expanded: expanded }); }, @@ -69,12 +69,12 @@ VantComponent({ if (expanded) { this.getRect('.van-collapse-item__content').then(function (res) { - _this.setData({ + _this.set({ contentHeight: res.height ? res.height + 'px' : null }); }); } else { - this.setData({ + this.set({ contentHeight: 0 }); } diff --git a/dist/collapse-item/index.wxml b/dist/collapse-item/index.wxml index f1fc9d3c..6bf5ff10 100644 --- a/dist/collapse-item/index.wxml +++ b/dist/collapse-item/index.wxml @@ -9,7 +9,6 @@ class="{{ titleClass }}" right-icon-class="van-cell__right-icon" custom-class="van-cell" - arrow-direction="{{ expanded ? 'up' : 'down' }}" bind:click="onClick" > + diff --git a/dist/goods-action/index.wxss b/dist/goods-action/index.wxss index 1bb72e55..ce8200ce 100644 --- a/dist/goods-action/index.wxss +++ b/dist/goods-action/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-goods-action{left:0;right:0;bottom:0;display:-webkit-flex;display:flex;position:fixed} \ No newline at end of file +@import '../common/index.wxss';.van-goods-action{position:fixed;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;background-color:#fff}.van-goods-action--safe{padding-bottom:34px} \ No newline at end of file diff --git a/dist/icon/index.js b/dist/icon/index.js index e6b9663c..b31a3003 100644 --- a/dist/icon/index.js +++ b/dist/icon/index.js @@ -1,4 +1,3 @@ -import { isSrc as _isSrc } from '../common/utils'; import { VantComponent } from '../common/component'; VantComponent({ props: { @@ -12,11 +11,6 @@ VantComponent({ value: 'van-icon' } }, - computed: { - isSrc: function isSrc() { - return _isSrc(this.data.name); - } - }, methods: { onClick: function onClick() { this.$emit('click'); diff --git a/dist/icon/index.wxml b/dist/icon/index.wxml index 48075534..aefcdebf 100644 --- a/dist/icon/index.wxml +++ b/dist/icon/index.wxml @@ -1,5 +1,5 @@ @@ -10,7 +10,9 @@ {{ info }} + + diff --git a/dist/mixins/basic.js b/dist/mixins/basic.js index 1c8b37b4..1f92000c 100644 --- a/dist/mixins/basic.js +++ b/dist/mixins/basic.js @@ -1,15 +1,33 @@ import { classNames } from '../common/class-names'; export var basic = Behavior({ + created: function created() { + var _this = this; + + wx.getSystemInfo({ + success: function success(_ref) { + var model = _ref.model, + screenHeight = _ref.screenHeight; + var isIphoneX = /iphone x/i.test(model); + var isIphoneNew = /iPhone11/i.test(model) && screenHeight === 812; + + if (isIphoneX || isIphoneNew) { + _this.set({ + isIPhoneX: true + }); + } + } + }); + }, methods: { classNames: classNames, $emit: function $emit() { this.triggerEvent.apply(this, arguments); }, getRect: function getRect(selector, all) { - var _this = this; + var _this2 = this; return new Promise(function (resolve) { - wx.createSelectorQuery().in(_this)[all ? 'selectAll' : 'select'](selector).boundingClientRect(function (rect) { + wx.createSelectorQuery().in(_this2)[all ? 'selectAll' : 'select'](selector).boundingClientRect(function (rect) { if (all && Array.isArray(rect) && rect.length) { resolve(rect); } diff --git a/dist/mixins/observer/behavior.js b/dist/mixins/observer/behavior.js index df389b5a..1df073fa 100644 --- a/dist/mixins/observer/behavior.js +++ b/dist/mixins/observer/behavior.js @@ -7,14 +7,13 @@ export var behavior = Behavior({ } var cache = {}; - var setData = this.setData; var _this$$options = this.$options(), computed = _this$$options.computed; var keys = Object.keys(computed); - var calcComputed = function calcComputed() { + this.calcComputed = function () { var needUpdate = {}; keys.forEach(function (key) { var value = computed[key].call(_this); @@ -25,17 +24,20 @@ export var behavior = Behavior({ }); return needUpdate; }; - - Object.defineProperty(this, 'setData', { - writable: true - }); - - this.setData = function (data, callback) { - data && setData.call(_this, data, callback); - setData.call(_this, calcComputed()); - }; }, attached: function attached() { - this.setData(); + this.set(); + }, + methods: { + // set data and set computed data + set: function set(data, callback) { + if (data) { + this.setData(data, callback); + } + + if (this.calcComputed) { + this.setData(this.calcComputed()); + } + } } }); \ No newline at end of file diff --git a/dist/mixins/observer/index.js b/dist/mixins/observer/index.js index c74a6c37..c878fd09 100644 --- a/dist/mixins/observer/index.js +++ b/dist/mixins/observer/index.js @@ -3,6 +3,7 @@ import { observeProps } from './props'; export function observe(vantOptions, options) { var watch = vantOptions.watch, computed = vantOptions.computed; + options.behaviors.push(behavior); if (watch) { var props = options.properties || {}; @@ -24,7 +25,6 @@ export function observe(vantOptions, options) { } if (computed) { - options.behaviors.push(behavior); options.methods = options.methods || {}; options.methods.$options = function () { diff --git a/dist/mixins/observer/props.js b/dist/mixins/observer/props.js index 4d71776f..57706daf 100644 --- a/dist/mixins/observer/props.js +++ b/dist/mixins/observer/props.js @@ -24,7 +24,7 @@ export function observeProps(props) { observer.apply(this, arguments); } - this.setData(); + this.set(); }; props[key] = prop; diff --git a/dist/mixins/transition.js b/dist/mixins/transition.js index 4c43bb48..3723eb12 100644 --- a/dist/mixins/transition.js +++ b/dist/mixins/transition.js @@ -15,25 +15,47 @@ export var transition = function transition(showDefaultValue) { data: { type: '', inited: false, - display: false + display: false, + supportAnimation: true }, attached: function attached() { if (this.data.show) { this.show(); } + + this.detectSupport(); }, methods: { + detectSupport: function detectSupport() { + var _this = this; + + wx.getSystemInfo({ + success: function success(info) { + if (info && info.system && info.system.indexOf('iOS 8') === 0) { + _this.set({ + supportAnimation: false + }); + } + } + }); + }, observeShow: function observeShow(value) { if (value) { this.show(); } else { - this.setData({ - type: 'leave' - }); + if (this.data.supportAnimation) { + this.set({ + type: 'leave' + }); + } else { + this.set({ + display: false + }); + } } }, show: function show() { - this.setData({ + this.set({ inited: true, display: true, type: 'enter' @@ -41,7 +63,7 @@ export var transition = function transition(showDefaultValue) { }, onAnimationEnd: function onAnimationEnd() { if (!this.data.show) { - this.setData({ + this.set({ display: false }); } diff --git a/dist/notice-bar/index.js b/dist/notice-bar/index.js index 872ccb53..fd35c5bd 100644 --- a/dist/notice-bar/index.js +++ b/dist/notice-bar/index.js @@ -56,12 +56,12 @@ VantComponent({ }, watch: { text: function text() { - this.setData({}, this.init); + this.set({}, this.init); } }, created: function created() { if (this.data.mode) { - this.setData({ + this.set({ hasRightIcon: true }); } @@ -79,7 +79,7 @@ VantComponent({ return; } - _this.setData({ + _this.set({ width: rect.width }); @@ -107,7 +107,7 @@ VantComponent({ timeingFunction: 'linear' }); - _this.setData({ + _this.set({ elapse: elapse, wrapWidth: wrapWidth, animation: animation, @@ -130,25 +130,25 @@ VantComponent({ speed = _this$data2.speed; resetAnimation.translateX(wrapWidth).step(); var animationData = animation.translateX(-(elapse * speed) / 1000).step(); - this.setData({ + this.set({ animationData: resetAnimation.export() }); setTimeout(function () { - _this2.setData({ + _this2.set({ animationData: animationData.export() }); }, 100); var timer = setTimeout(function () { _this2.scroll(); }, elapse); - this.setData({ + this.set({ timer: timer }); }, onClickIcon: function onClickIcon() { var timer = this.data.timer; timer && clearTimeout(timer); - this.setData({ + this.set({ show: false, timer: null }); diff --git a/dist/notify/index.js b/dist/notify/index.js index dff18893..f0d60a55 100644 --- a/dist/notify/index.js +++ b/dist/notify/index.js @@ -22,7 +22,7 @@ VantComponent({ var duration = this.data.duration; clearTimeout(this.timer); - this.setData({ + this.set({ show: true }); @@ -34,7 +34,7 @@ VantComponent({ }, hide: function hide() { clearTimeout(this.timer); - this.setData({ + this.set({ show: false }); } diff --git a/dist/notify/notify.js b/dist/notify/notify.js index 450fc34e..ec1f1bda 100644 --- a/dist/notify/notify.js +++ b/dist/notify/notify.js @@ -26,7 +26,7 @@ export default function Notify(options) { delete options.selector; if (notify) { - notify.setData(options); + notify.set(options); notify.show(); } else { console.warn('未找到 van-notify 节点，请确认 selector 及 context 是否正确'); diff --git a/dist/popup/index.js b/dist/popup/index.js index 4da92679..a814b4cb 100644 --- a/dist/popup/index.js +++ b/dist/popup/index.js @@ -21,6 +21,22 @@ VantComponent({ position: { type: String, value: 'center' + }, + safeAreaInsetBottom: { + type: Boolean, + value: true + } + }, + computed: { + popupClass: function popupClass() { + var _this$data = this.data, + position = _this$data.position, + safeAreaInsetBottom = _this$data.safeAreaInsetBottom, + isIPhoneX = _this$data.isIPhoneX; + return this.classNames('custom-class', 'van-popup', { + ["van-popup--" + position]: position, + ["van-popup--safe"]: isIPhoneX && safeAreaInsetBottom && position === 'bottom' + }); } }, methods: { diff --git a/dist/popup/index.wxml b/dist/popup/index.wxml index 4707d8ac..07bd1ae1 100644 --- a/dist/popup/index.wxml +++ b/dist/popup/index.wxml @@ -8,8 +8,8 @@ /> diff --git a/dist/popup/index.wxss b/dist/popup/index.wxss index e1e84c94..9413da11 100644 --- a/dist/popup/index.wxss +++ b/dist/popup/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-popup{top:50%;left:50%;position:fixed;max-height:100%;overflow-y:auto;box-sizing:border-box;background-color:#fff;-webkit-overflow-scrolling:touch;-webkit-animation:ease both;animation:ease both}.van-popup--center{-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--top{width:100%;top:0;right:auto;bottom:auto;left:50%}.van-popup--right{top:50%;right:0;bottom:auto;left:auto}.van-popup--bottom{width:100%;top:auto;bottom:0;right:auto;left:50%}.van-popup--left{top:50%;right:auto;bottom:auto;left:0}@-webkit-keyframes van-center-enter{from{opacity:0}}@keyframes van-center-enter{from{opacity:0}}@-webkit-keyframes van-center-leave{to{opacity:0}}@keyframes van-center-leave{to{opacity:0}}@-webkit-keyframes van-scale-enter{from{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@keyframes van-scale-enter{from{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@-webkit-keyframes van-scale-leave{to{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@keyframes van-scale-leave{to{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@-webkit-keyframes van-bottom-enter{from{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@keyframes van-bottom-enter{from{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@-webkit-keyframes van-bottom-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}}@keyframes van-bottom-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}}@-webkit-keyframes van-top-enter{from{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@keyframes van-top-enter{from{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@-webkit-keyframes van-top-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}}@keyframes van-top-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}}@-webkit-keyframes van-left-enter{from{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@keyframes van-left-enter{from{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@-webkit-keyframes van-left-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}}@keyframes van-left-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}}@-webkit-keyframes van-right-enter{from{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@keyframes van-right-enter{from{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@-webkit-keyframes van-right-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}}@keyframes van-right-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}} \ No newline at end of file +@import '../common/index.wxss';.van-popup{top:50%;left:50%;position:fixed;max-height:100%;overflow-y:auto;box-sizing:border-box;background-color:#fff;-webkit-overflow-scrolling:touch;-webkit-animation:ease both;animation:ease both}.van-popup--center{-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--top{width:100%;top:0;right:auto;bottom:auto;left:50%}.van-popup--right{top:50%;right:0;bottom:auto;left:auto}.van-popup--bottom{width:100%;top:auto;bottom:0;right:auto;left:50%}.van-popup--left{top:50%;right:auto;bottom:auto;left:0}.van-popup--safe{padding-bottom:34px}@-webkit-keyframes van-center-enter{from{opacity:0}}@keyframes van-center-enter{from{opacity:0}}@-webkit-keyframes van-center-leave{to{opacity:0}}@keyframes van-center-leave{to{opacity:0}}@-webkit-keyframes van-scale-enter{from{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@keyframes van-scale-enter{from{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@-webkit-keyframes van-scale-leave{to{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@keyframes van-scale-leave{to{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}}@-webkit-keyframes van-bottom-enter{from{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@keyframes van-bottom-enter{from{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@-webkit-keyframes van-bottom-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}}@keyframes van-bottom-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}}@-webkit-keyframes van-top-enter{from{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@keyframes van-top-enter{from{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}to{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}}@-webkit-keyframes van-top-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}}@keyframes van-top-leave{from{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}}@-webkit-keyframes van-left-enter{from{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@keyframes van-left-enter{from{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@-webkit-keyframes van-left-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}}@keyframes van-left-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}}@-webkit-keyframes van-right-enter{from{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@keyframes van-right-enter{from{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}to{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}}@-webkit-keyframes van-right-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}}@keyframes van-right-leave{from{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}} \ No newline at end of file diff --git a/dist/progress/index.js b/dist/progress/index.js index c875ae61..2eb9e99d 100644 --- a/dist/progress/index.js +++ b/dist/progress/index.js @@ -53,12 +53,12 @@ VantComponent({ var _this = this; this.getRect('.van-progress').then(function (rect) { - _this.setData({ + _this.set({ progressWidth: rect.width }); }); this.getRect('.van-progress__pivot').then(function (rect) { - _this.setData({ + _this.set({ pivotWidth: rect.width || 0 }); }); diff --git a/dist/radio-group/index.js b/dist/radio-group/index.js index 66e86e22..e1ef1e0a 100644 --- a/dist/radio-group/index.js +++ b/dist/radio-group/index.js @@ -8,7 +8,7 @@ VantComponent({ var _this$data = this.data, value = _this$data.value, disabled = _this$data.disabled; - target.setData({ + target.set({ value: value, disabled: disabled || target.data.disabled }); @@ -22,7 +22,7 @@ VantComponent({ value: function value(_value) { var children = this.getRelationNodes('../radio/index'); children.forEach(function (child) { - child.setData({ + child.set({ value: _value }); }); @@ -30,7 +30,7 @@ VantComponent({ disabled: function disabled(_disabled) { var children = this.getRelationNodes('../radio/index'); children.forEach(function (child) { - child.setData({ + child.set({ disabled: _disabled || child.data.disabled }); }); diff --git a/dist/rate/index.js b/dist/rate/index.js index 18b0cff9..873ba6b7 100644 --- a/dist/rate/index.js +++ b/dist/rate/index.js @@ -3,6 +3,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i import { VantComponent } from '../common/component'; VantComponent({ field: true, + classes: ['icon-class'], props: { readonly: Boolean, disabled: Boolean, @@ -45,7 +46,7 @@ VantComponent({ watch: { value: function value(_value) { if (_value !== this.data.innerValue) { - this.setData({ + this.set({ innerValue: _value }); } @@ -69,7 +70,7 @@ VantComponent({ var index = event.currentTarget.dataset.index; if (!data.disabled && !data.readonly) { - this.setData({ + this.set({ innerValue: index + 1 }); this.$emit('input', index + 1); diff --git a/dist/rate/index.wxml b/dist/rate/index.wxml index 401075e7..248ac8c5 100644 --- a/dist/rate/index.wxml +++ b/dist/rate/index.wxml @@ -6,6 +6,7 @@ wx:for="{{ list }}" wx:key="index" class="van-rate__item" + custom-class="icon-class" size="{{ size }}px" data-index="{{ index }}" name="{{ item ? icon : voidIcon }}" diff --git a/dist/row/index.js b/dist/row/index.js index 3c8d9aa7..365b294d 100644 --- a/dist/row/index.js +++ b/dist/row/index.js @@ -27,7 +27,7 @@ VantComponent({ var gutter = this.data.gutter; var margin = "-" + Number(gutter) / 2 + "px"; var style = gutter ? "margin-right: " + margin + "; margin-left: " + margin + ";" : ''; - this.setData({ + this.set({ style: style }); this.getRelationNodes('../col/index').forEach(function (col) { diff --git a/dist/search/index.js b/dist/search/index.js index 90c8c81d..2c8ebaa1 100644 --- a/dist/search/index.js +++ b/dist/search/index.js @@ -23,13 +23,13 @@ VantComponent({ }, methods: { onChange: function onChange(event) { - this.setData({ + this.set({ value: event.detail }); this.$emit('change', event.detail); }, onCancel: function onCancel() { - this.setData({ + this.set({ value: '' }); this.$emit('cancel'); diff --git a/dist/slider/index.js b/dist/slider/index.js index 1c5da79e..1cc858b3 100644 --- a/dist/slider/index.js +++ b/dist/slider/index.js @@ -66,7 +66,7 @@ VantComponent({ }, updateValue: function updateValue(value, end) { value = this.format(value); - this.setData({ + this.set({ value: value, barStyle: "width: " + value + "%; height: " + this.data.barHeight + ";" }); diff --git a/dist/stepper/index.js b/dist/stepper/index.js index f467c529..2230ff74 100644 --- a/dist/stepper/index.js +++ b/dist/stepper/index.js @@ -6,6 +6,7 @@ VantComponent({ field: true, classes: ['input-class', 'plus-class', 'minus-class'], props: { + value: Number, integer: Boolean, disabled: Boolean, disableInput: Boolean, @@ -30,8 +31,15 @@ VantComponent({ return this.data.disabled || this.data.value >= this.data.max; } }, + watch: { + value: function value(_value) { + this.set({ + value: this.range(_value) + }); + } + }, created: function created() { - this.setData({ + this.set({ value: this.range(this.data.value) }); }, @@ -70,7 +78,7 @@ VantComponent({ this.onChange('plus'); }, triggerInput: function triggerInput(value) { - this.setData({ + this.set({ value: value }); this.$emit('change', value); diff --git a/dist/steps/index.js b/dist/steps/index.js index 72a748e4..cc712c46 100644 --- a/dist/steps/index.js +++ b/dist/steps/index.js @@ -29,7 +29,7 @@ VantComponent({ steps.forEach(function (step, index) { step.status = _this.getStatus(index); }); - this.setData({ + this.set({ steps: steps }); }, diff --git a/dist/steps/index.wxss b/dist/steps/index.wxss index 6faf74bd..bf8a9a0d 100644 --- a/dist/steps/index.wxss +++ b/dist/steps/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;color:#999}.van-step--finish{color:#333}.van-step__circle{width:5px;height:5px;border-radius:50%;background-color:#999}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{-webkit-transform:none;transform:none;text-align:right}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;padding:0 8px;background-color:#fff;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0)}.van-step--horizontal .van-step__title{display:inline-block;font-size:12px;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-step--horizontal .van-step__line{position:absolute;left:0;right:0;bottom:6px;height:1px;background-color:#eee;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal.van-step--process{color:#333}.van-step--horizontal.van-step--process .van-step__active{display:block;font-size:12px;color:#4b0;line-height:1}.van-step--vertical{font-size:14px;line-height:18px;padding:10px 10px 10px 0}.van-step--vertical:not(:last-child)::after{border-bottom-width:1px}.van-step--vertical:first-child::before{content:'';position:absolute;width:1px;height:20px;background-color:#fff;top:0;left:-15px;z-index:1}.van-step--vertical .van-step__active,.van-step--vertical .van-step__circle,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__active{font-size:12px;line-height:1}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;background-color:#eee;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)} \ No newline at end of file +@import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;color:#999}.van-step--finish{color:#333}.van-step__circle{width:5px;height:5px;border-radius:50%;background-color:#999}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{-webkit-transform:none;transform:none;text-align:right}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;padding:0 8px;background-color:#fff;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0)}.van-step--horizontal .van-step__title{display:inline-block;font-size:12px;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-step--horizontal .van-step__line{position:absolute;left:0;right:0;bottom:6px;height:1px;background-color:#eee;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal.van-step--process{color:#333}.van-step--horizontal.van-step--process .van-step__active{display:block;font-size:12px;color:#4b0;line-height:1}.van-step--vertical{font-size:14px;line-height:18px;padding:10px 10px 10px 0}.van-step--vertical::after{border-bottom-width:1px}.van-step--vertical:last-child::after{border-bottom-width:none}.van-step--vertical:first-child::before{content:'';position:absolute;width:1px;height:20px;background-color:#fff;top:0;left:-15px;z-index:1}.van-step--vertical .van-step__active,.van-step--vertical .van-step__circle,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__active{font-size:12px;line-height:1}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;background-color:#eee;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)} \ No newline at end of file diff --git a/dist/submit-bar/index.js b/dist/submit-bar/index.js index 1ce43365..738eecd5 100644 --- a/dist/submit-bar/index.js +++ b/dist/submit-bar/index.js @@ -16,6 +16,10 @@ VantComponent({ buttonType: { type: String, value: 'danger' + }, + safeAreaInsetBottom: { + type: Boolean, + value: true } }, computed: { @@ -28,6 +32,14 @@ VantComponent({ tipStr: function tipStr() { var tip = this.data.tip; return typeof tip === 'string' ? tip : ''; + }, + barClass: function barClass() { + var _this$data = this.data, + isIPhoneX = _this$data.isIPhoneX, + safeAreaInsetBottom = _this$data.safeAreaInsetBottom; + return this.classNames('van-submit-bar__bar', 'bar-class', { + 'van-submit-bar__bar--safe': safeAreaInsetBottom && isIPhoneX + }); } }, methods: { diff --git a/dist/submit-bar/index.wxml b/dist/submit-bar/index.wxml index 53ae8335..a2bc998d 100644 --- a/dist/submit-bar/index.wxml +++ b/dist/submit-bar/index.wxml @@ -5,7 +5,7 @@ {{ tipStr }} - + diff --git a/dist/submit-bar/index.wxss b/dist/submit-bar/index.wxss index bf85cf97..a8e83b49 100644 --- a/dist/submit-bar/index.wxss +++ b/dist/submit-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;color:#f56723;font-size:12px;line-height:18px;background-color:#fff7cc}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__text{-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{color:#f44;font-size:18px;padding-right:12px}.van-submit-bar__currency{font-size:14px}.van-submit-bar__button button{width:110px} \ No newline at end of file +@import '../common/index.wxss';.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;color:#f56723;font-size:12px;line-height:18px;background-color:#fff7cc}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__bar--safe{padding-bottom:34px}.van-submit-bar__text{-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{color:#f44;font-size:18px;padding-right:12px}.van-submit-bar__currency{font-size:14px}.van-submit-bar__button button{width:110px} \ No newline at end of file diff --git a/dist/swipe-cell/index.js b/dist/swipe-cell/index.js index 29b0adf1..eb6f8c90 100644 --- a/dist/swipe-cell/index.js +++ b/dist/swipe-cell/index.js @@ -42,7 +42,7 @@ VantComponent({ this.resetSwipeStatus(); }, close: function close() { - this.setData({ + this.set({ offset: 0 }); }, @@ -55,7 +55,7 @@ VantComponent({ offset = 0; } - this.setData({ + this.set({ offset: offset }); offset && (this.swiping = true); @@ -81,7 +81,7 @@ VantComponent({ return; } - this.setData({ + this.set({ draging: true }); this.touchStart(event); @@ -114,7 +114,7 @@ VantComponent({ return; } - this.setData({ + this.set({ draging: false }); diff --git a/dist/switch-cell/index.js b/dist/switch-cell/index.js index 4da58634..a8bb6c41 100644 --- a/dist/switch-cell/index.js +++ b/dist/switch-cell/index.js @@ -14,13 +14,13 @@ VantComponent({ }, watch: { checked: function checked(value) { - this.setData({ + this.set({ value: value }); } }, created: function created() { - this.setData({ + this.set({ value: this.data.checked }); }, diff --git a/dist/switch/index.js b/dist/switch/index.js index c8fbb3de..3e74eacc 100644 --- a/dist/switch/index.js +++ b/dist/switch/index.js @@ -15,7 +15,7 @@ VantComponent({ }, watch: { checked: function checked(value) { - this.setData({ + this.set({ value: value }); } @@ -33,7 +33,7 @@ VantComponent({ } }, created: function created() { - this.setData({ + this.set({ value: this.data.checked }); }, diff --git a/dist/tabbar-item/index.js b/dist/tabbar-item/index.js index 553e91ae..7e6a375d 100644 --- a/dist/tabbar-item/index.js +++ b/dist/tabbar-item/index.js @@ -24,7 +24,7 @@ VantComponent({ }, setActive: function setActive(active) { if (this.data.active !== active) { - this.setData({ + this.set({ active: active }); } diff --git a/dist/tabbar/index.js b/dist/tabbar/index.js index bc4d3f6e..aed91f0a 100644 --- a/dist/tabbar/index.js +++ b/dist/tabbar/index.js @@ -31,22 +31,38 @@ VantComponent({ zIndex: { type: Number, value: 1 + }, + safeAreaInsetBottom: { + type: Boolean, + value: true } }, data: { items: [], currentActive: -1 }, + computed: { + tabbarClass: function tabbarClass() { + var _this$data = this.data, + fixed = _this$data.fixed, + isIPhoneX = _this$data.isIPhoneX, + safeAreaInsetBottom = _this$data.safeAreaInsetBottom; + return this.classNames('custom-class', 'van-tabbar', 'van-hairline--top-bottom', { + 'van-tabbar--fixed': fixed, + 'van-tabbar--safe': isIPhoneX && safeAreaInsetBottom + }); + } + }, watch: { active: function active(_active) { - this.setData({ + this.set({ currentActive: _active }); this.setActiveItem(); } }, created: function created() { - this.setData({ + this.set({ currentActive: this.data.active }); }, @@ -63,7 +79,7 @@ VantComponent({ if (active !== this.data.currentActive && active !== -1) { this.$emit('change', active); - this.setData({ + this.set({ currentActive: active }); this.setActiveItem(); diff --git a/dist/tabbar/index.wxml b/dist/tabbar/index.wxml index 76b1b46b..b8eb8e47 100644 --- a/dist/tabbar/index.wxml +++ b/dist/tabbar/index.wxml @@ -1,5 +1,5 @@ diff --git a/dist/tabbar/index.wxss b/dist/tabbar/index.wxss index f3e18c85..b07814c2 100644 --- a/dist/tabbar/index.wxss +++ b/dist/tabbar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-tabbar{width:100%;height:50px;display:-webkit-flex;display:flex;background-color:#fff}.van-tabbar--fixed{left:0;bottom:0;position:fixed} \ No newline at end of file +@import '../common/index.wxss';.van-tabbar{display:-webkit-flex;display:flex;width:100%;height:50px;background-color:#fff}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--safe{padding-bottom:34px} \ No newline at end of file diff --git a/dist/tabs/index.js b/dist/tabs/index.js index 0cd69c4a..8a41f2bc 100644 --- a/dist/tabs/index.js +++ b/dist/tabs/index.js @@ -1,5 +1,7 @@ import { VantComponent } from '../common/component'; +import { touch } from '../mixins/touch'; VantComponent({ + mixins: [touch], relation: { name: 'tab', type: 'descendant', @@ -45,25 +47,39 @@ VantComponent({ type: Number, value: 4 }, - animated: Boolean + animated: Boolean, + sticky: Boolean, + offsetTop: { + type: Number, + value: 0 + }, + swipeable: Boolean, + scrollTop: { + type: Number, + value: 0 + } }, data: { tabs: [], lineStyle: '', scrollLeft: 0, scrollable: false, - trackStyle: '' + trackStyle: '', + wrapStyle: '', + position: '' }, watch: { swipeThreshold: function swipeThreshold() { - this.setData({ + this.set({ scrollable: this.child.length > this.data.swipeThreshold }); }, color: 'setLine', lineWidth: 'setLine', active: 'setActiveTab', - animated: 'setTrack' + animated: 'setTrack', + scrollTop: 'onScroll', + offsetTop: 'setWrapStyle' }, beforeCreate: function beforeCreate() { this.child = []; @@ -76,7 +92,7 @@ VantComponent({ methods: { updateTabs: function updateTabs(tabs) { tabs = tabs || this.data.tabs; - this.setData({ + this.set({ tabs: tabs, scrollable: tabs.length > this.data.swipeThreshold }); @@ -101,7 +117,7 @@ VantComponent({ setActive: function setActive(active) { if (active !== this.data.active) { this.trigger('change', active); - this.setData({ + this.set({ active: active }); this.setActiveTab(); @@ -127,7 +143,7 @@ VantComponent({ }, 0); left += (rect.width - width) / 2; - _this.setData({ + _this.set({ lineStyle: "\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 " }); }); @@ -143,7 +159,7 @@ VantComponent({ this.getRect('.van-tabs__content').then(function (rect) { var width = rect.width; - _this2.setData({ + _this2.set({ trackStyle: "\n width: " + width * _this2.child.length + "px;\n transform: translateX(" + -1 * active * width + "px);\n transition-duration: " + duration + "s;\n " }); @@ -155,7 +171,7 @@ VantComponent({ }, setTabsProps: function setTabsProps(props) { this.child.forEach(function (item) { - item.setData(props); + item.set(props); }); }, setActiveTab: function setActiveTab() { @@ -171,10 +187,10 @@ VantComponent({ } if (data.active !== item.data.active) { - item.setData(data); + item.set(data); } }); - this.setData({}, function () { + this.set({}, function () { _this3.setLine(); _this3.setTrack(); @@ -200,11 +216,98 @@ VantComponent({ _this4.getRect('.van-tabs__nav').then(function (navRect) { var navWidth = navRect.width; - _this4.setData({ + _this4.set({ scrollLeft: offsetLeft - (navWidth - tabWidth) / 2 }); }); }); + }, + onTouchStart: function onTouchStart(event) { + if (!this.data.swipeable) return; + this.touchStart(event); + }, + onTouchMove: function onTouchMove(event) { + if (!this.data.swipeable) return; + this.touchMove(event); + }, + // watch swipe touch end + onTouchEnd: function onTouchEnd() { + if (!this.data.swipeable) return; + var _this$data3 = this.data, + active = _this$data3.active, + tabs = _this$data3.tabs; + var direction = this.direction, + deltaX = this.deltaX, + offsetX = this.offsetX; + var minSwipeDistance = 50; + + if (direction === 'horizontal' && offsetX >= minSwipeDistance) { + if (deltaX > 0 && active !== 0) { + this.setActive(active - 1); + } else if (deltaX < 0 && active !== tabs.length - 1) { + this.setActive(active + 1); + } + } + }, + setWrapStyle: function setWrapStyle() { + var _this$data4 = this.data, + offsetTop = _this$data4.offsetTop, + position = _this$data4.position; + var wrapStyle; + + switch (position) { + case 'top': + wrapStyle = "\n top: " + offsetTop + "px;\n position: fixed;\n "; + break; + + case 'bottom': + wrapStyle = "\n top: auto;\n bottom: 0;\n "; + break; + + default: + wrapStyle = ''; + } // cut down `set` + + + if (wrapStyle === this.data.wrapStyle) return; + this.set({ + wrapStyle: wrapStyle + }); + }, + // adjust tab position + onScroll: function onScroll(scrollTop) { + var _this5 = this; + + if (!this.data.sticky) return; + var offsetTop = this.data.offsetTop; + this.getRect('.van-tabs').then(function (rect) { + var top = rect.top, + height = rect.height; + + _this5.getRect('.van-tabs__wrap').then(function (rect) { + var wrapHeight = rect.height; + var position = ''; + + if (offsetTop > top + height - wrapHeight) { + position = 'bottom'; + } else if (offsetTop > top) { + position = 'top'; + } + + _this5.$emit('scroll', { + scrollTop: scrollTop + offsetTop, + isFixed: position === 'top' + }); + + if (position !== _this5.data.position) { + _this5.set({ + position: position + }, function () { + _this5.setWrapStyle(); + }); + } + }); + }); } } }); \ No newline at end of file diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml index 6f9a5a36..f377e4bf 100644 --- a/dist/tabs/index.wxml +++ b/dist/tabs/index.wxml @@ -1,5 +1,5 @@ - + - {{ item.title }} + + {{ item.title }} + - + diff --git a/dist/toast/index.js b/dist/toast/index.js index e3cc3072..288be8ea 100644 --- a/dist/toast/index.js +++ b/dist/toast/index.js @@ -24,7 +24,7 @@ VantComponent({ }, methods: { clear: function clear() { - this.setData({ + this.set({ show: false }); }, diff --git a/dist/toast/toast.js b/dist/toast/toast.js index 45ef94a7..e42c9142 100644 --- a/dist/toast/toast.js +++ b/dist/toast/toast.js @@ -45,7 +45,7 @@ var Toast = function Toast(options) { delete options.context; delete options.selector; queue.push(toast); - toast.setData(options); + toast.set(options); clearTimeout(toast.timer); if (options.duration > 0) { diff --git a/dist/transition/index.wxml b/dist/transition/index.wxml index f66cbdf0..f6deb0d3 100644 --- a/dist/transition/index.wxml +++ b/dist/transition/index.wxml @@ -1,7 +1,7 @@ diff --git a/dist/tree-select/index.js b/dist/tree-select/index.js index 56cd5467..da1dbdd0 100644 --- a/dist/tree-select/index.js +++ b/dist/tree-select/index.js @@ -51,7 +51,7 @@ VantComponent({ // 更新子项列表 updateSubItems: function updateSubItems() { var selectedItem = this.data.items[this.data.mainActiveIndex] || {}; - this.setData({ + this.set({ subItems: selectedItem.children || [] }); this.updateItemHeight(); @@ -59,13 +59,13 @@ VantComponent({ // 更新组件整体高度，根据最大高度和当前组件需要展示的高度来决定 updateMainHeight: function updateMainHeight() { var maxHeight = Math.max(this.data.items.length * ITEM_HEIGHT, this.data.subItems.length * ITEM_HEIGHT); - this.setData({ + this.set({ mainHeight: Math.min(maxHeight, this.data.maxHeight) }); }, // 更新子项列表高度，根据可展示的最大高度和当前子项列表的高度决定 updateItemHeight: function updateItemHeight() { - this.setData({ + this.set({ itemHeight: Math.min(this.data.subItems.length * ITEM_HEIGHT, this.data.maxHeight) }); }