diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js index 49b4e96b..667cdfc5 100644 --- a/dist/action-sheet/index.js +++ b/dist/action-sheet/index.js @@ -1,11 +1,13 @@ import { VantComponent } from '../common/component'; -import { safeArea } from '../mixins/safe-area'; VantComponent({ - mixins: [safeArea()], props: { show: Boolean, title: String, cancelText: String, + round: { + type: Boolean, + value: true + }, zIndex: { type: Number, value: 100 @@ -25,6 +27,10 @@ VantComponent({ closeOnClickAction: { 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 2ddb8635..c5bbf685 100644 --- a/dist/action-sheet/index.wxml +++ b/dist/action-sheet/index.wxml @@ -3,6 +3,7 @@ - + item !== child); + } + }, + beforeCreate() { + this.children = []; + }, + props: { + safeAreaInsetBottom: { + type: Boolean, + value: true + } + } }); diff --git a/dist/goods-action/index.wxml b/dist/goods-action/index.wxml index 6e61cc9e..569450c7 100644 --- a/dist/goods-action/index.wxml +++ b/dist/goods-action/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/dist/goods-action/index.wxss b/dist/goods-action/index.wxss index a722fc23..b87836cb 100644 --- a/dist/goods-action/index.wxss +++ b/dist/goods-action/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-goods-action{position:fixed;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;background-color:#fff;background-color:var(--white,#fff)}.van-goods-action--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)} \ 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;-webkit-align-items:center;align-items:center;background-color:#fff;background-color:var(--white,#fff)}.van-goods-action--safe{padding-bottom:env(safe-area-inset-bottom)} \ No newline at end of file diff --git a/dist/grid-item/index.js b/dist/grid-item/index.js index 73b194f9..ac11e529 100644 --- a/dist/grid-item/index.js +++ b/dist/grid-item/index.js @@ -11,6 +11,8 @@ VantComponent({ mixins: [link], props: { icon: String, + dot: Boolean, + info: null, text: String, useSlot: Boolean }, diff --git a/dist/grid-item/index.wxml b/dist/grid-item/index.wxml index 46d52fdb..4f8bb75f 100644 --- a/dist/grid-item/index.wxml +++ b/dist/grid-item/index.wxml @@ -7,7 +7,7 @@ - + diff --git a/dist/mixins/safe-area.d.ts b/dist/mixins/safe-area.d.ts deleted file mode 100644 index 0686353e..00000000 --- a/dist/mixins/safe-area.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare const safeArea: ({ safeAreaInsetBottom, safeAreaInsetTop }?: { - safeAreaInsetBottom?: boolean; - safeAreaInsetTop?: boolean; -}) => string; diff --git a/dist/mixins/safe-area.js b/dist/mixins/safe-area.js deleted file mode 100644 index ff0c8ed0..00000000 --- a/dist/mixins/safe-area.js +++ /dev/null @@ -1,39 +0,0 @@ -let cache = null; -function getSafeArea() { - return new Promise((resolve, reject) => { - if (cache != null) { - resolve(cache); - } - else { - wx.getSystemInfo({ - success: ({ model, screenHeight, statusBarHeight }) => { - const iphoneX = /iphone x/i.test(model); - const iphoneNew = /iPhone11/i.test(model) && screenHeight === 812; - cache = { - isIPhoneX: iphoneX || iphoneNew, - statusBarHeight - }; - resolve(cache); - }, - fail: reject - }); - } - }); -} -export const safeArea = ({ safeAreaInsetBottom = true, safeAreaInsetTop = false } = {}) => Behavior({ - properties: { - safeAreaInsetTop: { - type: Boolean, - value: safeAreaInsetTop - }, - safeAreaInsetBottom: { - type: Boolean, - value: safeAreaInsetBottom - } - }, - created() { - getSafeArea().then(({ isIPhoneX, statusBarHeight }) => { - this.setData({ isIPhoneX, statusBarHeight }); - }); - } -}); diff --git a/dist/nav-bar/index.js b/dist/nav-bar/index.js index b86c9e05..c7f93202 100644 --- a/dist/nav-bar/index.js +++ b/dist/nav-bar/index.js @@ -1,7 +1,5 @@ import { VantComponent } from '../common/component'; -import { safeArea } from '../mixins/safe-area'; VantComponent({ - mixins: [safeArea({ safeAreaInsetTop: true })], classes: ['title-class'], props: { title: String, @@ -16,7 +14,11 @@ VantComponent({ zIndex: { type: Number, value: 1 - } + }, + safeAreaInsetTop: { + type: Boolean, + value: true + }, }, methods: { onClickLeft() { diff --git a/dist/nav-bar/index.wxml b/dist/nav-bar/index.wxml index 2f235b5a..b3690aeb 100644 --- a/dist/nav-bar/index.wxml +++ b/dist/nav-bar/index.wxml @@ -1,8 +1,8 @@ diff --git a/dist/nav-bar/index.wxss b/dist/nav-bar/index.wxss index 1ba28ea7..b3c344a5 100644 --- a/dist/nav-bar/index.wxss +++ b/dist/nav-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--white,#fff)}.van-nav-bar__text{display:inline-block;margin:0 -15px;padding:0 15px;vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;font-weight:500;font-size:16px}.van-nav-bar__left,.van-nav-bar__right{position:absolute;bottom:0;font-size:14px}.van-nav-bar__left{left:15px}.van-nav-bar__right{right:15px} \ No newline at end of file +@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--white,#fff)}.van-nav-bar--safe{padding-top:env(safe-area-inset-top)}.van-nav-bar__text{display:inline-block;margin:0 -15px;padding:0 15px;vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;font-weight:500;font-size:16px}.van-nav-bar__left,.van-nav-bar__right{position:absolute;bottom:0;font-size:14px}.van-nav-bar__left{left:15px}.van-nav-bar__right{right:15px} \ No newline at end of file diff --git a/dist/notify/index.js b/dist/notify/index.js index 56e273c2..471c189f 100644 --- a/dist/notify/index.js +++ b/dist/notify/index.js @@ -1,8 +1,6 @@ import { VantComponent } from '../common/component'; import { WHITE } from '../common/color'; -import { safeArea } from '../mixins/safe-area'; VantComponent({ - mixins: [safeArea()], props: { message: String, background: String, @@ -21,6 +19,10 @@ VantComponent({ zIndex: { type: Number, value: 110 + }, + safeAreaInsetTop: { + type: Boolean, + value: false } }, methods: { diff --git a/dist/notify/index.wxml b/dist/notify/index.wxml index d3f7366c..552b8e36 100644 --- a/dist/notify/index.wxml +++ b/dist/notify/index.wxml @@ -1,10 +1,15 @@ - - {{ message }} + + + {{ message }} + diff --git a/dist/notify/index.wxss b/dist/notify/index.wxss index 3a97c2b9..79ad59f9 100644 --- a/dist/notify/index.wxss +++ b/dist/notify/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-notify{position:fixed;top:0;box-sizing:border-box;width:100%;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--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)} \ No newline at end of file +@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__safe-area{height:constant(safe-area-inset-top);height:env(safe-area-inset-top)}.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)} \ No newline at end of file diff --git a/dist/popup/index.js b/dist/popup/index.js index 2725acbf..4a2e7af3 100644 --- a/dist/popup/index.js +++ b/dist/popup/index.js @@ -1,6 +1,5 @@ import { VantComponent } from '../common/component'; import { transition } from '../mixins/transition'; -import { safeArea } from '../mixins/safe-area'; VantComponent({ classes: [ 'enter-class', @@ -10,7 +9,7 @@ VantComponent({ 'leave-active-class', 'leave-to-class' ], - mixins: [transition(false), safeArea()], + mixins: [transition(false)], props: { round: Boolean, closeable: Boolean, @@ -44,6 +43,14 @@ VantComponent({ type: String, value: 'center', observer: 'observeClass' + }, + safeAreaInsetBottom: { + type: Boolean, + value: true + }, + safeAreaInsetTop: { + type: Boolean, + value: false } }, created() { diff --git a/dist/popup/index.wxml b/dist/popup/index.wxml index c257348a..a3846862 100644 --- a/dist/popup/index.wxml +++ b/dist/popup/index.wxml @@ -10,8 +10,8 @@ /> diff --git a/dist/popup/index.wxss b/dist/popup/index.wxss index 575a9cc0..4524c7fc 100644 --- a/dist/popup/index.wxss +++ b/dist/popup/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-popup{position:fixed;top:50%;left:50%;box-sizing:border-box;max-height:100%;overflow-y:auto;transition-timing-function:ease;-webkit-animation:ease both;animation:ease both;-webkit-overflow-scrolling:touch;background-color:#fff;background-color:var(--white,#fff)}.van-popup--center{-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:12px;border-radius:var(--popup-round-border-radius,12px)}.van-popup--top{top:0;right:auto;bottom:auto;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--top.van-popup--round{border-radius:0 0 12px 12px;border-radius:0 0 var(--popup-round-border-radius,12px) var(--popup-round-border-radius,12px)}.van-popup--right{top:50%;right:0;bottom:auto;left:auto;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:12px 0 0 12px;border-radius:var(--popup-round-border-radius,12px) 0 0 var(--popup-round-border-radius,12px)}.van-popup--bottom{top:auto;right:auto;bottom:0;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--bottom.van-popup--round{border-radius:12px 12px 0 0;border-radius:var(--popup-round-border-radius,12px) var(--popup-round-border-radius,12px) 0 0}.van-popup--left{top:50%;right:auto;bottom:auto;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 12px 12px 0;border-radius:0 var(--popup-round-border-radius,12px) var(--popup-round-border-radius,12px) 0}.van-popup--bottom.van-popup--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)}.van-popup__close-icon{position:absolute;z-index:1;z-index:var(--popup-close-icon-z-index,1);color:#999;color:var(--popup-close-icon-color,#999);font-size:18px;font-size:var(--popup-close-icon-size,18px)}.van-popup__close-icon--top-left{top:16px;top:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--top-right{top:16px;top:var(--popup-close-icon-margin,16px);right:16px;right:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-left{bottom:16px;bottom:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-right{right:16px;right:var(--popup-close-icon-margin,16px);bottom:16px;bottom:var(--popup-close-icon-margin,16px)}.van-popup__close-icon:active{opacity:.6}.van-scale-enter-active,.van-scale-leave-active{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.van-scale-enter,.van-scale-leave-to{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.van-fade-enter-active,.van-fade-leave-active{transition-property:opacity}.van-fade-enter,.van-fade-leave-to{opacity:0}.van-center-enter-active,.van-center-leave-active{transition-property:opacity}.van-center-enter,.van-center-leave-to{opacity:0}.van-bottom-enter-active,.van-bottom-leave-active,.van-left-enter-active,.van-left-leave-active,.van-right-enter-active,.van-right-leave-active,.van-top-enter-active,.van-top-leave-active{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-bottom-enter,.van-bottom-leave-to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}.van-top-enter,.van-top-leave-to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}.van-left-enter,.van-left-leave-to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.van-right-enter,.van-right-leave-to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)} \ No newline at end of file +@import '../common/index.wxss';.van-popup{position:fixed;top:50%;left:50%;box-sizing:border-box;max-height:100%;overflow-y:auto;transition-timing-function:ease;-webkit-animation:ease both;animation:ease both;-webkit-overflow-scrolling:touch;background-color:#fff;background-color:var(--white,#fff)}.van-popup--center{-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:20px;border-radius:var(--popup-round-border-radius,20px)}.van-popup--top{top:0;right:auto;bottom:auto;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--top.van-popup--round{border-radius:0 0 20px 20px;border-radius:0 0 var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px)}.van-popup--right{top:50%;right:0;bottom:auto;left:auto;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:20px 0 0 20px;border-radius:var(--popup-round-border-radius,20px) 0 0 var(--popup-round-border-radius,20px)}.van-popup--bottom{top:auto;right:auto;bottom:0;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--bottom.van-popup--round{border-radius:20px 20px 0 0;border-radius:var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px) 0 0}.van-popup--left{top:50%;right:auto;bottom:auto;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 20px 20px 0;border-radius:0 var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px) 0}.van-popup--bottom.van-popup--safe{padding-bottom:env(safe-area-inset-bottom)}.van-popup--safeTop{padding-top:env(safe-area-inset-top)}.van-popup__close-icon{position:absolute;z-index:1;z-index:var(--popup-close-icon-z-index,1);color:#999;color:var(--popup-close-icon-color,#999);font-size:18px;font-size:var(--popup-close-icon-size,18px)}.van-popup__close-icon--top-left{top:16px;top:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--top-right{top:16px;top:var(--popup-close-icon-margin,16px);right:16px;right:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-left{bottom:16px;bottom:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-right{right:16px;right:var(--popup-close-icon-margin,16px);bottom:16px;bottom:var(--popup-close-icon-margin,16px)}.van-popup__close-icon:active{opacity:.6}.van-scale-enter-active,.van-scale-leave-active{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.van-scale-enter,.van-scale-leave-to{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.van-fade-enter-active,.van-fade-leave-active{transition-property:opacity}.van-fade-enter,.van-fade-leave-to{opacity:0}.van-center-enter-active,.van-center-leave-active{transition-property:opacity}.van-center-enter,.van-center-leave-to{opacity:0}.van-bottom-enter-active,.van-bottom-leave-active,.van-left-enter-active,.van-left-leave-active,.van-right-enter-active,.van-right-leave-active,.van-top-enter-active,.van-top-leave-active{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-bottom-enter,.van-bottom-leave-to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}.van-top-enter,.van-top-leave-to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}.van-left-enter,.van-left-leave-to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.van-right-enter,.van-right-leave-to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)} \ No newline at end of file diff --git a/dist/rate/index.js b/dist/rate/index.js index f1098886..5e4988d2 100644 --- a/dist/rate/index.js +++ b/dist/rate/index.js @@ -81,14 +81,11 @@ VantComponent({ const { touchable } = this.data; if (!touchable) return; - const { clientX, clientY } = event.touches[0]; + const { clientX } = event.touches[0]; this.getRect('.van-rate__icon', true).then((list) => { const target = list .sort(item => item.right - item.left) - .find(item => clientX >= item.left && - clientX <= item.right && - clientY >= item.top && - clientY <= item.bottom); + .find(item => clientX >= item.left && clientX <= item.right); if (target != null) { this.onSelect(Object.assign(Object.assign({}, event), { currentTarget: target })); } diff --git a/dist/stepper/index.js b/dist/stepper/index.js index 5d8d53cf..f67c5b87 100644 --- a/dist/stepper/index.js +++ b/dist/stepper/index.js @@ -1,5 +1,5 @@ import { VantComponent } from '../common/component'; -import { addUnit } from '../common/utils'; +import { addUnit, isDef } from '../common/utils'; const LONG_PRESS_START_TIME = 600; const LONG_PRESS_INTERVAL = 200; VantComponent({ @@ -13,6 +13,7 @@ VantComponent({ buttonSize: null, asyncChange: Boolean, disableInput: Boolean, + decimalLength: Number, min: { type: null, value: 1 @@ -84,7 +85,14 @@ VantComponent({ // limit value range range(value) { value = String(value).replace(/[^0-9.-]/g, ''); - return Math.max(Math.min(this.data.max, value), this.data.min); + // format range + value = value === '' ? 0 : +value; + value = Math.max(Math.min(this.data.max, value), this.data.min); + // format decimal + if (isDef(this.data.decimalLength)) { + value = value.toFixed(this.data.decimalLength); + } + return value; }, onInput(event) { const { value = '' } = event.detail || {}; @@ -97,7 +105,10 @@ VantComponent({ return; } const diff = type === 'minus' ? -this.data.step : +this.data.step; - const value = Math.round((+this.data.value + diff) * 100) / 100; + let value = +this.data.value + diff; + if (!isDef(this.data.decimalLength)) { + value = Math.round(value * 100) / 100; + } this.triggerInput(this.range(value)); this.$emit(type); }, diff --git a/dist/submit-bar/index.js b/dist/submit-bar/index.js index b748f10f..23a34dae 100644 --- a/dist/submit-bar/index.js +++ b/dist/submit-bar/index.js @@ -1,7 +1,5 @@ import { VantComponent } from '../common/component'; -import { safeArea } from '../mixins/safe-area'; VantComponent({ - mixins: [safeArea()], classes: [ 'bar-class', 'price-class', @@ -35,7 +33,11 @@ VantComponent({ value: 2, observer: 'updatePrice' }, - suffixLabel: String + suffixLabel: String, + safeAreaInsetBottom: { + type: Boolean, + value: true + } }, methods: { updatePrice() { diff --git a/dist/submit-bar/index.wxml b/dist/submit-bar/index.wxml index a9c7f0e6..4cdbd18d 100644 --- a/dist/submit-bar/index.wxml +++ b/dist/submit-bar/index.wxml @@ -16,7 +16,7 @@ - + {{ label || '合计：' }} diff --git a/dist/submit-bar/index.wxss b/dist/submit-bar/index.wxss index 1660ffd3..b891fcb8 100644 --- a/dist/submit-bar/index.wxss +++ b/dist/submit-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-submit-bar{position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none;z-index:100;z-index:var(--submit-bar-z-index,100)}.van-submit-bar__tip{padding:10px;padding:var(--submit-bar-tip-padding,10px);color:#f56723;color:var(--submit-bar-tip-color,#f56723);font-size:12px;font-size:var(--submit-bar-tip-font-size,12px);line-height:1.5;line-height:var(--submit-bar-tip-line-height,1.5);background-color:#fff7cc;background-color:var(--submit-bar-tip-background-color,#fff7cc)}.van-submit-bar__tip:empty{display:none}.van-submit-bar__tip-icon{width:12px;height:12px;margin-right:4px;vertical-align:middle}.van-submit-bar__tip-text{display:inline;vertical-align:middle}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:flex-end;justify-content:flex-end;height:50px;height:var(--submit-bar-height,50px);font-size:14px;font-size:var(--submit-bar-text-font-size,14px);background-color:#fff;background-color:var(--submit-bar-background-color,#fff)}.van-submit-bar__bar--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)}.van-submit-bar__text{-webkit-flex:1;flex:1;padding-right:12px;font-weight:500;text-align:right;color:#333;color:var(--submit-bar-text-color,#333)}.van-submit-bar__price{color:#ee0a24;color:var(--submit-bar-price-color,#ee0a24);font-size:18px;font-size:var(--submit-bar-price-font-size,18px)}.van-submit-bar__currency{font-size:14px;font-size:var(--submit-bar-currency-font-size,14px)}.van-submit-bar__suffix-label{margin-left:5px}.van-submit-bar__button{width:110px;width:var(--submit-bar-button-width,110px)} \ No newline at end of file +@import '../common/index.wxss';.van-submit-bar{position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none;z-index:100;z-index:var(--submit-bar-z-index,100)}.van-submit-bar__tip{padding:10px;padding:var(--submit-bar-tip-padding,10px);color:#f56723;color:var(--submit-bar-tip-color,#f56723);font-size:12px;font-size:var(--submit-bar-tip-font-size,12px);line-height:1.5;line-height:var(--submit-bar-tip-line-height,1.5);background-color:#fff7cc;background-color:var(--submit-bar-tip-background-color,#fff7cc)}.van-submit-bar__tip:empty{display:none}.van-submit-bar__tip-icon{width:12px;height:12px;margin-right:4px;vertical-align:middle}.van-submit-bar__tip-text{display:inline;vertical-align:middle}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:flex-end;justify-content:flex-end;height:50px;height:var(--submit-bar-height,50px);font-size:14px;font-size:var(--submit-bar-text-font-size,14px);background-color:#fff;background-color:var(--submit-bar-background-color,#fff)}.van-submit-bar__bar--safe{padding-bottom:env(safe-area-inset-bottom)}.van-submit-bar__text{-webkit-flex:1;flex:1;padding-right:12px;font-weight:500;text-align:right;color:#333;color:var(--submit-bar-text-color,#333)}.van-submit-bar__price{color:#ee0a24;color:var(--submit-bar-price-color,#ee0a24);font-size:18px;font-size:var(--submit-bar-price-font-size,18px)}.van-submit-bar__currency{font-size:14px;font-size:var(--submit-bar-currency-font-size,14px)}.van-submit-bar__suffix-label{margin-left:5px}.van-submit-bar__button{width:110px;width:var(--submit-bar-button-width,110px)} \ No newline at end of file diff --git a/dist/swipe-cell/index.js b/dist/swipe-cell/index.js index 922f58b0..32371402 100644 --- a/dist/swipe-cell/index.js +++ b/dist/swipe-cell/index.js @@ -1,6 +1,7 @@ import { VantComponent } from '../common/component'; import { touch } from '../mixins/touch'; const THRESHOLD = 0.3; +let ARRAY = []; VantComponent({ props: { disabled: Boolean, @@ -24,6 +25,10 @@ VantComponent({ }, created() { this.offset = 0; + ARRAY.push(this); + }, + destroyed() { + ARRAY = ARRAY.filter(item => item !== this); }, methods: { open(position) { @@ -67,6 +72,11 @@ VantComponent({ if (this.data.disabled) { return; } + ARRAY.forEach(item => { + if (item !== this) { + item.close(); + } + }); this.draging = true; this.startOffset = this.offset; this.firstDirection = ''; diff --git a/dist/tab/index.js b/dist/tab/index.js index c555393c..66691711 100644 --- a/dist/tab/index.js +++ b/dist/tab/index.js @@ -9,7 +9,12 @@ VantComponent({ info: null, title: String, disabled: Boolean, - titleStyle: String + titleStyle: String, + name: { + type: [Number, String], + value: '', + observer: 'setComputedName' + } }, data: { width: null, @@ -25,6 +30,9 @@ VantComponent({ titleStyle: 'update' }, methods: { + setComputedName() { + this.computedName = this.data.name || this.index; + }, update() { const parent = this.getRelationNodes('../tabs/index')[0]; if (parent) { diff --git a/dist/tabbar/index.js b/dist/tabbar/index.js index 4ec9fd97..b2276444 100644 --- a/dist/tabbar/index.js +++ b/dist/tabbar/index.js @@ -1,7 +1,5 @@ import { VantComponent } from '../common/component'; -import { safeArea } from '../mixins/safe-area'; VantComponent({ - mixins: [safeArea()], relation: { name: 'tabbar-item', type: 'descendant', @@ -39,6 +37,10 @@ VantComponent({ zIndex: { type: Number, value: 1 + }, + safeAreaInsetBottom: { + type: Boolean, + value: true } }, beforeCreate() { diff --git a/dist/tabbar/index.wxml b/dist/tabbar/index.wxml index 0926b643..c49b9d98 100644 --- a/dist/tabbar/index.wxml +++ b/dist/tabbar/index.wxml @@ -1,7 +1,7 @@ diff --git a/dist/tabbar/index.wxss b/dist/tabbar/index.wxss index ee44be7b..69eea105 100644 --- a/dist/tabbar/index.wxss +++ b/dist/tabbar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-tabbar{display:-webkit-flex;display:flex;width:100%;height:50px;background-color:#fff;background-color:var(--white,#fff)}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)} \ No newline at end of file +@import '../common/index.wxss';.van-tabbar{display:-webkit-flex;display:flex;width:100%;height:50px;background-color:#fff;background-color:var(--white,#fff)}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--safe{padding-bottom:env(safe-area-inset-bottom)} \ No newline at end of file diff --git a/dist/tabs/index.js b/dist/tabs/index.js index 6b68d799..f58baf1b 100644 --- a/dist/tabs/index.js +++ b/dist/tabs/index.js @@ -1,6 +1,6 @@ import { VantComponent } from '../common/component'; import { touch } from '../mixins/touch'; -import { nextTick } from '../common/utils'; +import { nextTick, isDef, addUnit } from '../common/utils'; VantComponent({ mixins: [touch], classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class'], @@ -8,14 +8,23 @@ VantComponent({ name: 'tab', type: 'descendant', linked(child) { - this.child.push(child); + child.index = this.children.length; + child.setComputedName(); + this.children.push(child); this.updateTabs(this.data.tabs.concat(child.data)); }, unlinked(child) { - const index = this.child.indexOf(child); + const index = this.children.indexOf(child); const { tabs } = this.data; tabs.splice(index, 1); - this.child.splice(index, 1); + this.children.splice(index, 1); + let i = index; + while (i >= 0 && i < this.children.length) { + const currentChild = this.children[i]; + currentChild.index--; + currentChild.setComputedName(); + i++; + } this.updateTabs(tabs); } }, @@ -25,16 +34,16 @@ VantComponent({ animated: Boolean, swipeable: Boolean, lineWidth: { - type: Number, + type: [String, Number], value: -1 }, lineHeight: { - type: Number, + type: [String, Number], value: -1 }, active: { - type: Number, - value: 0 + type: [String, Number], + value: 0, }, type: { type: String, @@ -68,12 +77,13 @@ VantComponent({ scrollable: false, trackStyle: '', wrapStyle: '', - position: '' + position: '', + currentIndex: null, }, watch: { swipeThreshold() { this.setData({ - scrollable: this.child.length > this.data.swipeThreshold + scrollable: this.children.length > this.data.swipeThreshold }); }, color: 'setLine', @@ -84,7 +94,7 @@ VantComponent({ offsetTop: 'setWrapStyle' }, beforeCreate() { - this.child = []; + this.children = []; }, mounted() { this.setLine(true); @@ -108,26 +118,28 @@ VantComponent({ }); this.setActiveTab(); }, - trigger(eventName, index) { + trigger(eventName, name) { + const { tabs, currentIndex } = this.data; this.$emit(eventName, { - index, - title: this.data.tabs[index].title + name, + title: tabs[currentIndex].title }); }, onTap(event) { const { index } = event.currentTarget.dataset; + const child = this.children[index]; if (this.data.tabs[index].disabled) { - this.trigger('disabled', index); + this.trigger('disabled', child.computedName); } else { - this.trigger('click', index); - this.setActive(index); + this.trigger('click', child.computedName); + this.setActive(child.computedName); } }, - setActive(active) { - if (active !== this.data.active) { - this.trigger('change', active); - this.setData({ active }); + setActive(computedName) { + if (computedName !== this.currentName) { + this.currentName = computedName; + this.trigger('change', computedName); this.setActiveTab(); } }, @@ -135,13 +147,13 @@ VantComponent({ if (this.data.type !== 'line') { return; } - const { color, active, duration, lineWidth, lineHeight } = this.data; + const { color, duration, currentIndex, lineWidth, lineHeight } = this.data; this.getRect('.van-tab', true).then((rects) => { - const rect = rects[active]; + const rect = rects[currentIndex]; const width = lineWidth !== -1 ? lineWidth : rect.width / 2; - const height = lineHeight !== -1 ? `height: ${lineHeight}px;` : ''; + const height = lineHeight !== -1 ? `height: ${addUnit(lineHeight)}; border-radius: ${addUnit(lineHeight)};` : ''; let left = rects - .slice(0, active) + .slice(0, currentIndex) .reduce((prev, curr) => prev + curr.width, 0); left += (rect.width - width) / 2; const transition = skipTransition @@ -150,7 +162,7 @@ VantComponent({ this.setData({ lineStyle: ` ${height} - width: ${width}px; + width: ${addUnit(width)}; background-color: ${color}; -webkit-transform: translateX(${left}px); transform: translateX(${left}px); @@ -160,32 +172,38 @@ VantComponent({ }); }, setTrack() { - const { animated, active, duration } = this.data; + const { animated, duration, currentIndex } = this.data; if (!animated) return ''; this.getRect('.van-tabs__content').then((rect) => { const { width } = rect; this.setData({ trackStyle: ` - width: ${width * this.child.length}px; - left: ${-1 * active * width}px; + width: ${width * this.children.length}px; + left: ${-1 * currentIndex * width}px; transition: left ${duration}s; display: -webkit-box; display: flex; ` }); const data = { width, animated }; - this.child.forEach((item) => { + this.children.forEach((item) => { item.setData(data); }); }); }, setActiveTab() { - this.child.forEach((item, index) => { + if (!isDef(this.currentName)) { + this.currentName = this.data.active || this.children[0].computedName; + } + this.children.forEach((item, index) => { const data = { - active: index === this.data.active + active: item.computedName === this.currentName }; if (data.active) { + this.setData({ + currentIndex: index + }); data.inited = true; } if (data.active !== item.data.active) { @@ -200,7 +218,7 @@ VantComponent({ }, // scroll active tab into view scrollIntoView() { - const { active, scrollable } = this.data; + const { currentIndex, scrollable } = this.data; if (!scrollable) { return; } @@ -208,9 +226,9 @@ VantComponent({ this.getRect('.van-tab', true), this.getRect('.van-tabs__nav') ]).then(([tabRects, navRect]) => { - const tabRect = tabRects[active]; + const tabRect = tabRects[currentIndex]; const offsetLeft = tabRects - .slice(0, active) + .slice(0, currentIndex) .reduce((prev, curr) => prev + curr.width, 0); this.setData({ scrollLeft: offsetLeft - (navRect.width - tabRect.width) / 2 @@ -231,15 +249,15 @@ VantComponent({ onTouchEnd() { if (!this.data.swipeable) return; - const { active, tabs } = this.data; + const { tabs, currentIndex } = this.data; const { direction, deltaX, offsetX } = this; const minSwipeDistance = 50; if (direction === 'horizontal' && offsetX >= minSwipeDistance) { - if (deltaX > 0 && active !== 0) { - this.setActive(active - 1); + if (deltaX > 0 && currentIndex !== 0) { + this.setActive(this.children[currentIndex - 1].computedName); } - else if (deltaX < 0 && active !== tabs.length - 1) { - this.setActive(active + 1); + else if (deltaX < 0 && currentIndex !== tabs.length - 1) { + this.setActive(this.children[currentIndex + 1].computedName); } } }, diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml index 1618d641..fd0a738f 100644 --- a/dist/tabs/index.wxml +++ b/dist/tabs/index.wxml @@ -17,15 +17,16 @@ wx:for="{{ tabs }}" wx:key="index" data-index="{{ index }}" - class="van-ellipsis tab-class {{ index === active ? 'tab-active-class' : '' }} {{ utils.bem('tab', { active: index === active, disabled: item.disabled }) }}" - style="{{ color && index !== active && type === 'card' && !item.disabled ? 'color: ' + color : '' }} {{ color && index === active && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-color: ' + color : '' }} {{ scrollable ? ';flex-basis:' + (88 / swipeThreshold) + '%' : '' }}" + class="van-ellipsis tab-class {{ index === currentIndex ? 'tab-active-class' : '' }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled }) }}" + style="{{ color && index !== currentIndex && type === 'card' && !item.disabled ? 'color: ' + color : '' }} {{ color && index === currentIndex && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-color: ' + color : '' }} {{ scrollable ? ';flex-basis:' + (88 / swipeThreshold) + '%' : '' }}" bind:tap="onTap" > - + {{ item.title }} diff --git a/dist/tabs/index.wxss b/dist/tabs/index.wxss index 4c48e9c7..1212756d 100644 --- a/dist/tabs/index.wxss +++ b/dist/tabs/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff;background-color:var(--white,#fff)}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border-radius:2px;border:1px solid #ee0a24;border:1px solid var(--red,#ee0a24)}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--red,#ee0a24);line-height:30px;line-height:var(--tabs-card-height,30px);border-right:1px solid #ee0a24;border-right:1px solid var(--red,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;border-radius:3px;background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs--line{padding-top:44px;padding-top:var(--tabs-line-height,44px)}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card{margin:0 15px;padding-top:30px;padding-top:var(--tabs-card-height,30px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;font-size:14px;text-align:center;cursor:pointer;color:#7d7e80;color:var(--gray-darker,#7d7e80);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;color:#333;color:var(--text-color,#333)}.van-tab--disabled{color:#c9c9c9;color:var(--gray,#c9c9c9)}.van-tab__title--dot:after{display:inline-block;width:8px;height:8px;vertical-align:middle;border-radius:100%;content:"";background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important} \ No newline at end of file +@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff;background-color:var(--white,#fff)}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border-radius:2px;border:1px solid #ee0a24;border:1px solid var(--red,#ee0a24)}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--red,#ee0a24);line-height:30px;line-height:var(--tabs-card-height,30px);border-right:1px solid #ee0a24;border-right:1px solid var(--red,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;border-radius:3px;background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs--line{padding-top:44px;padding-top:var(--tabs-line-height,44px)}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card{margin:0 15px;padding-top:30px;padding-top:var(--tabs-card-height,30px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;font-size:14px;text-align:center;cursor:pointer;color:#7d7e80;color:var(--gray-darker,#7d7e80);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;color:#333;color:var(--text-color,#333)}.van-tab--disabled{color:#c9c9c9;color:var(--gray,#c9c9c9)}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important} \ No newline at end of file diff --git a/lib/action-sheet/index.js b/lib/action-sheet/index.js index 9f92cd6f..f37fd1b3 100644 --- a/lib/action-sheet/index.js +++ b/lib/action-sheet/index.js @@ -1,13 +1,15 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); -var safe_area_1 = require("../mixins/safe-area"); component_1.VantComponent({ - mixins: [safe_area_1.safeArea()], props: { show: Boolean, title: String, cancelText: String, + round: { + type: Boolean, + value: true + }, zIndex: { type: Number, value: 100 @@ -27,6 +29,10 @@ component_1.VantComponent({ closeOnClickAction: { type: Boolean, value: true + }, + safeAreaInsetBottom: { + type: Boolean, + value: true } }, methods: { diff --git a/lib/action-sheet/index.wxml b/lib/action-sheet/index.wxml index 2ddb8635..c5bbf685 100644 --- a/lib/action-sheet/index.wxml +++ b/lib/action-sheet/index.wxml @@ -3,6 +3,7 @@ - + - + diff --git a/lib/goods-action/index.wxss b/lib/goods-action/index.wxss index a722fc23..b87836cb 100644 --- a/lib/goods-action/index.wxss +++ b/lib/goods-action/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-goods-action{position:fixed;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;background-color:#fff;background-color:var(--white,#fff)}.van-goods-action--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)} \ 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;-webkit-align-items:center;align-items:center;background-color:#fff;background-color:var(--white,#fff)}.van-goods-action--safe{padding-bottom:env(safe-area-inset-bottom)} \ No newline at end of file diff --git a/lib/grid-item/index.js b/lib/grid-item/index.js index 229217f3..238cafa6 100644 --- a/lib/grid-item/index.js +++ b/lib/grid-item/index.js @@ -13,6 +13,8 @@ component_1.VantComponent({ mixins: [link_1.link], props: { icon: String, + dot: Boolean, + info: null, text: String, useSlot: Boolean }, diff --git a/lib/grid-item/index.wxml b/lib/grid-item/index.wxml index 46d52fdb..4f8bb75f 100644 --- a/lib/grid-item/index.wxml +++ b/lib/grid-item/index.wxml @@ -7,7 +7,7 @@ - + diff --git a/lib/mixins/safe-area.js b/lib/mixins/safe-area.js deleted file mode 100644 index b9af8f3d..00000000 --- a/lib/mixins/safe-area.js +++ /dev/null @@ -1,47 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var cache = null; -function getSafeArea() { - return new Promise(function (resolve, reject) { - if (cache != null) { - resolve(cache); - } - else { - wx.getSystemInfo({ - success: function (_a) { - var model = _a.model, screenHeight = _a.screenHeight, statusBarHeight = _a.statusBarHeight; - var iphoneX = /iphone x/i.test(model); - var iphoneNew = /iPhone11/i.test(model) && screenHeight === 812; - cache = { - isIPhoneX: iphoneX || iphoneNew, - statusBarHeight: statusBarHeight - }; - resolve(cache); - }, - fail: reject - }); - } - }); -} -exports.safeArea = function (_a) { - var _b = _a === void 0 ? {} : _a, _c = _b.safeAreaInsetBottom, safeAreaInsetBottom = _c === void 0 ? true : _c, _d = _b.safeAreaInsetTop, safeAreaInsetTop = _d === void 0 ? false : _d; - return Behavior({ - properties: { - safeAreaInsetTop: { - type: Boolean, - value: safeAreaInsetTop - }, - safeAreaInsetBottom: { - type: Boolean, - value: safeAreaInsetBottom - } - }, - created: function () { - var _this = this; - getSafeArea().then(function (_a) { - var isIPhoneX = _a.isIPhoneX, statusBarHeight = _a.statusBarHeight; - _this.setData({ isIPhoneX: isIPhoneX, statusBarHeight: statusBarHeight }); - }); - } - }); -}; diff --git a/lib/nav-bar/index.js b/lib/nav-bar/index.js index 7d7070a6..37226c7f 100644 --- a/lib/nav-bar/index.js +++ b/lib/nav-bar/index.js @@ -1,9 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); -var safe_area_1 = require("../mixins/safe-area"); component_1.VantComponent({ - mixins: [safe_area_1.safeArea({ safeAreaInsetTop: true })], classes: ['title-class'], props: { title: String, @@ -18,7 +16,11 @@ component_1.VantComponent({ zIndex: { type: Number, value: 1 - } + }, + safeAreaInsetTop: { + type: Boolean, + value: true + }, }, methods: { onClickLeft: function () { diff --git a/lib/nav-bar/index.wxml b/lib/nav-bar/index.wxml index 2f235b5a..b3690aeb 100644 --- a/lib/nav-bar/index.wxml +++ b/lib/nav-bar/index.wxml @@ -1,8 +1,8 @@ diff --git a/lib/nav-bar/index.wxss b/lib/nav-bar/index.wxss index 1ba28ea7..b3c344a5 100644 --- a/lib/nav-bar/index.wxss +++ b/lib/nav-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--white,#fff)}.van-nav-bar__text{display:inline-block;margin:0 -15px;padding:0 15px;vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;font-weight:500;font-size:16px}.van-nav-bar__left,.van-nav-bar__right{position:absolute;bottom:0;font-size:14px}.van-nav-bar__left{left:15px}.van-nav-bar__right{right:15px} \ No newline at end of file +@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--white,#fff)}.van-nav-bar--safe{padding-top:env(safe-area-inset-top)}.van-nav-bar__text{display:inline-block;margin:0 -15px;padding:0 15px;vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;color:#1989fa;color:var(--blue,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;font-weight:500;font-size:16px}.van-nav-bar__left,.van-nav-bar__right{position:absolute;bottom:0;font-size:14px}.van-nav-bar__left{left:15px}.van-nav-bar__right{right:15px} \ No newline at end of file diff --git a/lib/notify/index.js b/lib/notify/index.js index bf869b32..2e4f1fd0 100644 --- a/lib/notify/index.js +++ b/lib/notify/index.js @@ -2,9 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); var color_1 = require("../common/color"); -var safe_area_1 = require("../mixins/safe-area"); component_1.VantComponent({ - mixins: [safe_area_1.safeArea()], props: { message: String, background: String, @@ -23,6 +21,10 @@ component_1.VantComponent({ zIndex: { type: Number, value: 110 + }, + safeAreaInsetTop: { + type: Boolean, + value: false } }, methods: { diff --git a/lib/notify/index.wxml b/lib/notify/index.wxml index d3f7366c..552b8e36 100644 --- a/lib/notify/index.wxml +++ b/lib/notify/index.wxml @@ -1,10 +1,15 @@ - - {{ message }} + + + {{ message }} + diff --git a/lib/notify/index.wxss b/lib/notify/index.wxss index 3a97c2b9..79ad59f9 100644 --- a/lib/notify/index.wxss +++ b/lib/notify/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-notify{position:fixed;top:0;box-sizing:border-box;width:100%;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--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)} \ No newline at end of file +@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__safe-area{height:constant(safe-area-inset-top);height:env(safe-area-inset-top)}.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)} \ No newline at end of file diff --git a/lib/popup/index.js b/lib/popup/index.js index a1b99a47..ae681aa4 100644 --- a/lib/popup/index.js +++ b/lib/popup/index.js @@ -2,7 +2,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); var transition_1 = require("../mixins/transition"); -var safe_area_1 = require("../mixins/safe-area"); component_1.VantComponent({ classes: [ 'enter-class', @@ -12,7 +11,7 @@ component_1.VantComponent({ 'leave-active-class', 'leave-to-class' ], - mixins: [transition_1.transition(false), safe_area_1.safeArea()], + mixins: [transition_1.transition(false)], props: { round: Boolean, closeable: Boolean, @@ -46,6 +45,14 @@ component_1.VantComponent({ type: String, value: 'center', observer: 'observeClass' + }, + safeAreaInsetBottom: { + type: Boolean, + value: true + }, + safeAreaInsetTop: { + type: Boolean, + value: false } }, created: function () { diff --git a/lib/popup/index.wxml b/lib/popup/index.wxml index c257348a..a3846862 100644 --- a/lib/popup/index.wxml +++ b/lib/popup/index.wxml @@ -10,8 +10,8 @@ /> diff --git a/lib/popup/index.wxss b/lib/popup/index.wxss index 575a9cc0..4524c7fc 100644 --- a/lib/popup/index.wxss +++ b/lib/popup/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-popup{position:fixed;top:50%;left:50%;box-sizing:border-box;max-height:100%;overflow-y:auto;transition-timing-function:ease;-webkit-animation:ease both;animation:ease both;-webkit-overflow-scrolling:touch;background-color:#fff;background-color:var(--white,#fff)}.van-popup--center{-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:12px;border-radius:var(--popup-round-border-radius,12px)}.van-popup--top{top:0;right:auto;bottom:auto;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--top.van-popup--round{border-radius:0 0 12px 12px;border-radius:0 0 var(--popup-round-border-radius,12px) var(--popup-round-border-radius,12px)}.van-popup--right{top:50%;right:0;bottom:auto;left:auto;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:12px 0 0 12px;border-radius:var(--popup-round-border-radius,12px) 0 0 var(--popup-round-border-radius,12px)}.van-popup--bottom{top:auto;right:auto;bottom:0;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--bottom.van-popup--round{border-radius:12px 12px 0 0;border-radius:var(--popup-round-border-radius,12px) var(--popup-round-border-radius,12px) 0 0}.van-popup--left{top:50%;right:auto;bottom:auto;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 12px 12px 0;border-radius:0 var(--popup-round-border-radius,12px) var(--popup-round-border-radius,12px) 0}.van-popup--bottom.van-popup--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)}.van-popup__close-icon{position:absolute;z-index:1;z-index:var(--popup-close-icon-z-index,1);color:#999;color:var(--popup-close-icon-color,#999);font-size:18px;font-size:var(--popup-close-icon-size,18px)}.van-popup__close-icon--top-left{top:16px;top:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--top-right{top:16px;top:var(--popup-close-icon-margin,16px);right:16px;right:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-left{bottom:16px;bottom:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-right{right:16px;right:var(--popup-close-icon-margin,16px);bottom:16px;bottom:var(--popup-close-icon-margin,16px)}.van-popup__close-icon:active{opacity:.6}.van-scale-enter-active,.van-scale-leave-active{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.van-scale-enter,.van-scale-leave-to{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.van-fade-enter-active,.van-fade-leave-active{transition-property:opacity}.van-fade-enter,.van-fade-leave-to{opacity:0}.van-center-enter-active,.van-center-leave-active{transition-property:opacity}.van-center-enter,.van-center-leave-to{opacity:0}.van-bottom-enter-active,.van-bottom-leave-active,.van-left-enter-active,.van-left-leave-active,.van-right-enter-active,.van-right-leave-active,.van-top-enter-active,.van-top-leave-active{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-bottom-enter,.van-bottom-leave-to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}.van-top-enter,.van-top-leave-to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}.van-left-enter,.van-left-leave-to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.van-right-enter,.van-right-leave-to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)} \ No newline at end of file +@import '../common/index.wxss';.van-popup{position:fixed;top:50%;left:50%;box-sizing:border-box;max-height:100%;overflow-y:auto;transition-timing-function:ease;-webkit-animation:ease both;animation:ease both;-webkit-overflow-scrolling:touch;background-color:#fff;background-color:var(--white,#fff)}.van-popup--center{-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:20px;border-radius:var(--popup-round-border-radius,20px)}.van-popup--top{top:0;right:auto;bottom:auto;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--top.van-popup--round{border-radius:0 0 20px 20px;border-radius:0 0 var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px)}.van-popup--right{top:50%;right:0;bottom:auto;left:auto;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:20px 0 0 20px;border-radius:var(--popup-round-border-radius,20px) 0 0 var(--popup-round-border-radius,20px)}.van-popup--bottom{top:auto;right:auto;bottom:0;left:50%;width:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-popup--bottom.van-popup--round{border-radius:20px 20px 0 0;border-radius:var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px) 0 0}.van-popup--left{top:50%;right:auto;bottom:auto;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 20px 20px 0;border-radius:0 var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px) 0}.van-popup--bottom.van-popup--safe{padding-bottom:env(safe-area-inset-bottom)}.van-popup--safeTop{padding-top:env(safe-area-inset-top)}.van-popup__close-icon{position:absolute;z-index:1;z-index:var(--popup-close-icon-z-index,1);color:#999;color:var(--popup-close-icon-color,#999);font-size:18px;font-size:var(--popup-close-icon-size,18px)}.van-popup__close-icon--top-left{top:16px;top:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--top-right{top:16px;top:var(--popup-close-icon-margin,16px);right:16px;right:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-left{bottom:16px;bottom:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-right{right:16px;right:var(--popup-close-icon-margin,16px);bottom:16px;bottom:var(--popup-close-icon-margin,16px)}.van-popup__close-icon:active{opacity:.6}.van-scale-enter-active,.van-scale-leave-active{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.van-scale-enter,.van-scale-leave-to{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.van-fade-enter-active,.van-fade-leave-active{transition-property:opacity}.van-fade-enter,.van-fade-leave-to{opacity:0}.van-center-enter-active,.van-center-leave-active{transition-property:opacity}.van-center-enter,.van-center-leave-to{opacity:0}.van-bottom-enter-active,.van-bottom-leave-active,.van-left-enter-active,.van-left-leave-active,.van-right-enter-active,.van-right-leave-active,.van-top-enter-active,.van-top-leave-active{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-bottom-enter,.van-bottom-leave-to{-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}.van-top-enter,.van-top-leave-to{-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}.van-left-enter,.van-left-leave-to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.van-right-enter,.van-right-leave-to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)} \ No newline at end of file diff --git a/lib/rate/index.js b/lib/rate/index.js index 29866261..e34b6a90 100644 --- a/lib/rate/index.js +++ b/lib/rate/index.js @@ -95,16 +95,11 @@ component_1.VantComponent({ var touchable = this.data.touchable; if (!touchable) return; - var _a = event.touches[0], clientX = _a.clientX, clientY = _a.clientY; + var clientX = event.touches[0].clientX; this.getRect('.van-rate__icon', true).then(function (list) { var target = list .sort(function (item) { return item.right - item.left; }) - .find(function (item) { - return clientX >= item.left && - clientX <= item.right && - clientY >= item.top && - clientY <= item.bottom; - }); + .find(function (item) { return clientX >= item.left && clientX <= item.right; }); if (target != null) { _this.onSelect(__assign(__assign({}, event), { currentTarget: target })); } diff --git a/lib/stepper/index.js b/lib/stepper/index.js index 9cb2df59..c9e86603 100644 --- a/lib/stepper/index.js +++ b/lib/stepper/index.js @@ -15,6 +15,7 @@ component_1.VantComponent({ buttonSize: null, asyncChange: Boolean, disableInput: Boolean, + decimalLength: Number, min: { type: null, value: 1 @@ -86,7 +87,14 @@ component_1.VantComponent({ // limit value range range: function (value) { value = String(value).replace(/[^0-9.-]/g, ''); - return Math.max(Math.min(this.data.max, value), this.data.min); + // format range + value = value === '' ? 0 : +value; + value = Math.max(Math.min(this.data.max, value), this.data.min); + // format decimal + if (utils_1.isDef(this.data.decimalLength)) { + value = value.toFixed(this.data.decimalLength); + } + return value; }, onInput: function (event) { var _a = (event.detail || {}).value, value = _a === void 0 ? '' : _a; @@ -99,7 +107,10 @@ 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 = +this.data.value + diff; + if (!utils_1.isDef(this.data.decimalLength)) { + value = Math.round(value * 100) / 100; + } this.triggerInput(this.range(value)); this.$emit(type); }, diff --git a/lib/submit-bar/index.js b/lib/submit-bar/index.js index eed5ce4e..198e29a4 100644 --- a/lib/submit-bar/index.js +++ b/lib/submit-bar/index.js @@ -1,9 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); -var safe_area_1 = require("../mixins/safe-area"); component_1.VantComponent({ - mixins: [safe_area_1.safeArea()], classes: [ 'bar-class', 'price-class', @@ -37,7 +35,11 @@ component_1.VantComponent({ value: 2, observer: 'updatePrice' }, - suffixLabel: String + suffixLabel: String, + safeAreaInsetBottom: { + type: Boolean, + value: true + } }, methods: { updatePrice: function () { diff --git a/lib/submit-bar/index.wxml b/lib/submit-bar/index.wxml index a9c7f0e6..4cdbd18d 100644 --- a/lib/submit-bar/index.wxml +++ b/lib/submit-bar/index.wxml @@ -16,7 +16,7 @@ - + {{ label || '合计：' }} diff --git a/lib/submit-bar/index.wxss b/lib/submit-bar/index.wxss index 1660ffd3..b891fcb8 100644 --- a/lib/submit-bar/index.wxss +++ b/lib/submit-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-submit-bar{position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none;z-index:100;z-index:var(--submit-bar-z-index,100)}.van-submit-bar__tip{padding:10px;padding:var(--submit-bar-tip-padding,10px);color:#f56723;color:var(--submit-bar-tip-color,#f56723);font-size:12px;font-size:var(--submit-bar-tip-font-size,12px);line-height:1.5;line-height:var(--submit-bar-tip-line-height,1.5);background-color:#fff7cc;background-color:var(--submit-bar-tip-background-color,#fff7cc)}.van-submit-bar__tip:empty{display:none}.van-submit-bar__tip-icon{width:12px;height:12px;margin-right:4px;vertical-align:middle}.van-submit-bar__tip-text{display:inline;vertical-align:middle}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:flex-end;justify-content:flex-end;height:50px;height:var(--submit-bar-height,50px);font-size:14px;font-size:var(--submit-bar-text-font-size,14px);background-color:#fff;background-color:var(--submit-bar-background-color,#fff)}.van-submit-bar__bar--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)}.van-submit-bar__text{-webkit-flex:1;flex:1;padding-right:12px;font-weight:500;text-align:right;color:#333;color:var(--submit-bar-text-color,#333)}.van-submit-bar__price{color:#ee0a24;color:var(--submit-bar-price-color,#ee0a24);font-size:18px;font-size:var(--submit-bar-price-font-size,18px)}.van-submit-bar__currency{font-size:14px;font-size:var(--submit-bar-currency-font-size,14px)}.van-submit-bar__suffix-label{margin-left:5px}.van-submit-bar__button{width:110px;width:var(--submit-bar-button-width,110px)} \ No newline at end of file +@import '../common/index.wxss';.van-submit-bar{position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none;z-index:100;z-index:var(--submit-bar-z-index,100)}.van-submit-bar__tip{padding:10px;padding:var(--submit-bar-tip-padding,10px);color:#f56723;color:var(--submit-bar-tip-color,#f56723);font-size:12px;font-size:var(--submit-bar-tip-font-size,12px);line-height:1.5;line-height:var(--submit-bar-tip-line-height,1.5);background-color:#fff7cc;background-color:var(--submit-bar-tip-background-color,#fff7cc)}.van-submit-bar__tip:empty{display:none}.van-submit-bar__tip-icon{width:12px;height:12px;margin-right:4px;vertical-align:middle}.van-submit-bar__tip-text{display:inline;vertical-align:middle}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:flex-end;justify-content:flex-end;height:50px;height:var(--submit-bar-height,50px);font-size:14px;font-size:var(--submit-bar-text-font-size,14px);background-color:#fff;background-color:var(--submit-bar-background-color,#fff)}.van-submit-bar__bar--safe{padding-bottom:env(safe-area-inset-bottom)}.van-submit-bar__text{-webkit-flex:1;flex:1;padding-right:12px;font-weight:500;text-align:right;color:#333;color:var(--submit-bar-text-color,#333)}.van-submit-bar__price{color:#ee0a24;color:var(--submit-bar-price-color,#ee0a24);font-size:18px;font-size:var(--submit-bar-price-font-size,18px)}.van-submit-bar__currency{font-size:14px;font-size:var(--submit-bar-currency-font-size,14px)}.van-submit-bar__suffix-label{margin-left:5px}.van-submit-bar__button{width:110px;width:var(--submit-bar-button-width,110px)} \ No newline at end of file diff --git a/lib/swipe-cell/index.js b/lib/swipe-cell/index.js index a0276354..f526fb8a 100644 --- a/lib/swipe-cell/index.js +++ b/lib/swipe-cell/index.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); var touch_1 = require("../mixins/touch"); var THRESHOLD = 0.3; +var ARRAY = []; component_1.VantComponent({ props: { disabled: Boolean, @@ -26,6 +27,11 @@ component_1.VantComponent({ }, created: function () { this.offset = 0; + ARRAY.push(this); + }, + destroyed: function () { + var _this = this; + ARRAY = ARRAY.filter(function (item) { return item !== _this; }); }, methods: { open: function (position) { @@ -62,9 +68,15 @@ component_1.VantComponent({ this.setData({ catchMove: false }); }, startDrag: function (event) { + var _this = this; if (this.data.disabled) { return; } + ARRAY.forEach(function (item) { + if (item !== _this) { + item.close(); + } + }); this.draging = true; this.startOffset = this.offset; this.firstDirection = ''; diff --git a/lib/tab/index.js b/lib/tab/index.js index 92b523f6..bfb25bbb 100644 --- a/lib/tab/index.js +++ b/lib/tab/index.js @@ -11,7 +11,12 @@ component_1.VantComponent({ info: null, title: String, disabled: Boolean, - titleStyle: String + titleStyle: String, + name: { + type: [Number, String], + value: '', + observer: 'setComputedName' + } }, data: { width: null, @@ -27,6 +32,9 @@ component_1.VantComponent({ titleStyle: 'update' }, methods: { + setComputedName: function () { + this.computedName = this.data.name || this.index; + }, update: function () { var parent = this.getRelationNodes('../tabs/index')[0]; if (parent) { diff --git a/lib/tabbar/index.js b/lib/tabbar/index.js index 97bd21c8..e3f60588 100644 --- a/lib/tabbar/index.js +++ b/lib/tabbar/index.js @@ -1,9 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var component_1 = require("../common/component"); -var safe_area_1 = require("../mixins/safe-area"); component_1.VantComponent({ - mixins: [safe_area_1.safeArea()], relation: { name: 'tabbar-item', type: 'descendant', @@ -41,6 +39,10 @@ component_1.VantComponent({ zIndex: { type: Number, value: 1 + }, + safeAreaInsetBottom: { + type: Boolean, + value: true } }, beforeCreate: function () { diff --git a/lib/tabbar/index.wxml b/lib/tabbar/index.wxml index 0926b643..c49b9d98 100644 --- a/lib/tabbar/index.wxml +++ b/lib/tabbar/index.wxml @@ -1,7 +1,7 @@ diff --git a/lib/tabbar/index.wxss b/lib/tabbar/index.wxss index ee44be7b..69eea105 100644 --- a/lib/tabbar/index.wxss +++ b/lib/tabbar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-tabbar{display:-webkit-flex;display:flex;width:100%;height:50px;background-color:#fff;background-color:var(--white,#fff)}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--safe{padding-bottom:34px;padding-bottom:var(--safe-area-inset-bottom,34px)} \ No newline at end of file +@import '../common/index.wxss';.van-tabbar{display:-webkit-flex;display:flex;width:100%;height:50px;background-color:#fff;background-color:var(--white,#fff)}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--safe{padding-bottom:env(safe-area-inset-bottom)} \ No newline at end of file diff --git a/lib/tabs/index.js b/lib/tabs/index.js index f03b565a..91148226 100644 --- a/lib/tabs/index.js +++ b/lib/tabs/index.js @@ -10,14 +10,23 @@ component_1.VantComponent({ name: 'tab', type: 'descendant', linked: function (child) { - this.child.push(child); + child.index = this.children.length; + child.setComputedName(); + this.children.push(child); this.updateTabs(this.data.tabs.concat(child.data)); }, unlinked: function (child) { - var index = this.child.indexOf(child); + var index = this.children.indexOf(child); var tabs = this.data.tabs; tabs.splice(index, 1); - this.child.splice(index, 1); + this.children.splice(index, 1); + var i = index; + while (i >= 0 && i < this.children.length) { + var currentChild = this.children[i]; + currentChild.index--; + currentChild.setComputedName(); + i++; + } this.updateTabs(tabs); } }, @@ -27,16 +36,16 @@ component_1.VantComponent({ animated: Boolean, swipeable: Boolean, lineWidth: { - type: Number, + type: [String, Number], value: -1 }, lineHeight: { - type: Number, + type: [String, Number], value: -1 }, active: { - type: Number, - value: 0 + type: [String, Number], + value: 0, }, type: { type: String, @@ -70,12 +79,13 @@ component_1.VantComponent({ scrollable: false, trackStyle: '', wrapStyle: '', - position: '' + position: '', + currentIndex: null, }, watch: { swipeThreshold: function () { this.setData({ - scrollable: this.child.length > this.data.swipeThreshold + scrollable: this.children.length > this.data.swipeThreshold }); }, color: 'setLine', @@ -86,7 +96,7 @@ component_1.VantComponent({ offsetTop: 'setWrapStyle' }, beforeCreate: function () { - this.child = []; + this.children = []; }, mounted: function () { var _this = this; @@ -111,26 +121,28 @@ component_1.VantComponent({ }); this.setActiveTab(); }, - trigger: function (eventName, index) { + trigger: function (eventName, name) { + var _a = this.data, tabs = _a.tabs, currentIndex = _a.currentIndex; this.$emit(eventName, { - index: index, - title: this.data.tabs[index].title + name: name, + title: tabs[currentIndex].title }); }, onTap: function (event) { var index = event.currentTarget.dataset.index; + var child = this.children[index]; if (this.data.tabs[index].disabled) { - this.trigger('disabled', index); + this.trigger('disabled', child.computedName); } else { - this.trigger('click', index); - this.setActive(index); + this.trigger('click', child.computedName); + this.setActive(child.computedName); } }, - setActive: function (active) { - if (active !== this.data.active) { - this.trigger('change', active); - this.setData({ active: active }); + setActive: function (computedName) { + if (computedName !== this.currentName) { + this.currentName = computedName; + this.trigger('change', computedName); this.setActiveTab(); } }, @@ -139,46 +151,52 @@ component_1.VantComponent({ if (this.data.type !== 'line') { return; } - var _a = this.data, color = _a.color, active = _a.active, duration = _a.duration, lineWidth = _a.lineWidth, lineHeight = _a.lineHeight; + var _a = this.data, color = _a.color, duration = _a.duration, currentIndex = _a.currentIndex, lineWidth = _a.lineWidth, lineHeight = _a.lineHeight; this.getRect('.van-tab', true).then(function (rects) { - var rect = rects[active]; + var rect = rects[currentIndex]; var width = lineWidth !== -1 ? lineWidth : rect.width / 2; - var height = lineHeight !== -1 ? "height: " + lineHeight + "px;" : ''; + var height = lineHeight !== -1 ? "height: " + utils_1.addUnit(lineHeight) + "; border-radius: " + utils_1.addUnit(lineHeight) + ";" : ''; var left = rects - .slice(0, active) + .slice(0, currentIndex) .reduce(function (prev, curr) { return prev + curr.width; }, 0); left += (rect.width - width) / 2; var transition = skipTransition ? '' : "transition-duration: " + duration + "s; -webkit-transition-duration: " + duration + "s;"; _this.setData({ - lineStyle: "\n " + height + "\n width: " + width + "px;\n background-color: " + color + ";\n -webkit-transform: translateX(" + left + "px);\n transform: translateX(" + left + "px);\n " + transition + "\n " + lineStyle: "\n " + height + "\n width: " + utils_1.addUnit(width) + ";\n background-color: " + color + ";\n -webkit-transform: translateX(" + left + "px);\n transform: translateX(" + left + "px);\n " + transition + "\n " }); }); }, setTrack: function () { var _this = this; - var _a = this.data, animated = _a.animated, active = _a.active, duration = _a.duration; + var _a = this.data, animated = _a.animated, duration = _a.duration, currentIndex = _a.currentIndex; if (!animated) return ''; this.getRect('.van-tabs__content').then(function (rect) { var width = rect.width; _this.setData({ - trackStyle: "\n width: " + width * _this.child.length + "px;\n left: " + -1 * active * width + "px;\n transition: left " + duration + "s;\n display: -webkit-box;\n display: flex;\n " + trackStyle: "\n width: " + width * _this.children.length + "px;\n left: " + -1 * currentIndex * width + "px;\n transition: left " + duration + "s;\n display: -webkit-box;\n display: flex;\n " }); var data = { width: width, animated: animated }; - _this.child.forEach(function (item) { + _this.children.forEach(function (item) { item.setData(data); }); }); }, setActiveTab: function () { var _this = this; - this.child.forEach(function (item, index) { + if (!utils_1.isDef(this.currentName)) { + this.currentName = this.data.active || this.children[0].computedName; + } + this.children.forEach(function (item, index) { var data = { - active: index === _this.data.active + active: item.computedName === _this.currentName }; if (data.active) { + _this.setData({ + currentIndex: index + }); data.inited = true; } if (data.active !== item.data.active) { @@ -194,7 +212,7 @@ component_1.VantComponent({ // scroll active tab into view scrollIntoView: function () { var _this = this; - var _a = this.data, active = _a.active, scrollable = _a.scrollable; + var _a = this.data, currentIndex = _a.currentIndex, scrollable = _a.scrollable; if (!scrollable) { return; } @@ -203,9 +221,9 @@ component_1.VantComponent({ this.getRect('.van-tabs__nav') ]).then(function (_a) { var tabRects = _a[0], navRect = _a[1]; - var tabRect = tabRects[active]; + var tabRect = tabRects[currentIndex]; var offsetLeft = tabRects - .slice(0, active) + .slice(0, currentIndex) .reduce(function (prev, curr) { return prev + curr.width; }, 0); _this.setData({ scrollLeft: offsetLeft - (navRect.width - tabRect.width) / 2 @@ -226,15 +244,15 @@ component_1.VantComponent({ onTouchEnd: function () { if (!this.data.swipeable) return; - var _a = this.data, active = _a.active, tabs = _a.tabs; + var _a = this.data, tabs = _a.tabs, currentIndex = _a.currentIndex; var _b = this, direction = _b.direction, deltaX = _b.deltaX, offsetX = _b.offsetX; var minSwipeDistance = 50; if (direction === 'horizontal' && offsetX >= minSwipeDistance) { - if (deltaX > 0 && active !== 0) { - this.setActive(active - 1); + if (deltaX > 0 && currentIndex !== 0) { + this.setActive(this.children[currentIndex - 1].computedName); } - else if (deltaX < 0 && active !== tabs.length - 1) { - this.setActive(active + 1); + else if (deltaX < 0 && currentIndex !== tabs.length - 1) { + this.setActive(this.children[currentIndex + 1].computedName); } } }, diff --git a/lib/tabs/index.wxml b/lib/tabs/index.wxml index 1618d641..fd0a738f 100644 --- a/lib/tabs/index.wxml +++ b/lib/tabs/index.wxml @@ -17,15 +17,16 @@ wx:for="{{ tabs }}" wx:key="index" data-index="{{ index }}" - class="van-ellipsis tab-class {{ index === active ? 'tab-active-class' : '' }} {{ utils.bem('tab', { active: index === active, disabled: item.disabled }) }}" - style="{{ color && index !== active && type === 'card' && !item.disabled ? 'color: ' + color : '' }} {{ color && index === active && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-color: ' + color : '' }} {{ scrollable ? ';flex-basis:' + (88 / swipeThreshold) + '%' : '' }}" + class="van-ellipsis tab-class {{ index === currentIndex ? 'tab-active-class' : '' }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled }) }}" + style="{{ color && index !== currentIndex && type === 'card' && !item.disabled ? 'color: ' + color : '' }} {{ color && index === currentIndex && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-color: ' + color : '' }} {{ scrollable ? ';flex-basis:' + (88 / swipeThreshold) + '%' : '' }}" bind:tap="onTap" > - + {{ item.title }} diff --git a/lib/tabs/index.wxss b/lib/tabs/index.wxss index 4c48e9c7..1212756d 100644 --- a/lib/tabs/index.wxss +++ b/lib/tabs/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff;background-color:var(--white,#fff)}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border-radius:2px;border:1px solid #ee0a24;border:1px solid var(--red,#ee0a24)}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--red,#ee0a24);line-height:30px;line-height:var(--tabs-card-height,30px);border-right:1px solid #ee0a24;border-right:1px solid var(--red,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;border-radius:3px;background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs--line{padding-top:44px;padding-top:var(--tabs-line-height,44px)}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card{margin:0 15px;padding-top:30px;padding-top:var(--tabs-card-height,30px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;font-size:14px;text-align:center;cursor:pointer;color:#7d7e80;color:var(--gray-darker,#7d7e80);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;color:#333;color:var(--text-color,#333)}.van-tab--disabled{color:#c9c9c9;color:var(--gray,#c9c9c9)}.van-tab__title--dot:after{display:inline-block;width:8px;height:8px;vertical-align:middle;border-radius:100%;content:"";background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important} \ No newline at end of file +@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff;background-color:var(--white,#fff)}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border-radius:2px;border:1px solid #ee0a24;border:1px solid var(--red,#ee0a24)}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--red,#ee0a24);line-height:30px;line-height:var(--tabs-card-height,30px);border-right:1px solid #ee0a24;border-right:1px solid var(--red,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;border-radius:3px;background-color:#ee0a24;background-color:var(--red,#ee0a24)}.van-tabs--line{padding-top:44px;padding-top:var(--tabs-line-height,44px)}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card{margin:0 15px;padding-top:30px;padding-top:var(--tabs-card-height,30px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;font-size:14px;text-align:center;cursor:pointer;color:#7d7e80;color:var(--gray-darker,#7d7e80);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;color:#333;color:var(--text-color,#333)}.van-tab--disabled{color:#c9c9c9;color:var(--gray,#c9c9c9)}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important} \ No newline at end of file