diff --git a/dist/button/index.js b/dist/button/index.js index 283c4a09..39750f8b 100644 --- a/dist/button/index.js +++ b/dist/button/index.js @@ -49,10 +49,16 @@ VantComponent({ methods: { onClick(event) { this.$emit('click', event); - const { canIUseGetUserProfile, openType, getUserProfileDesc } = this.data; + const { + canIUseGetUserProfile, + openType, + getUserProfileDesc, + lang, + } = this.data; if (openType === 'getUserInfo' && canIUseGetUserProfile) { wx.getUserProfile({ desc: getUserProfileDesc || ' ', + lang: lang || 'en', complete: (userProfile) => { this.$emit('getuserinfo', userProfile); }, diff --git a/dist/checkbox-group/index.js b/dist/checkbox-group/index.js index 1c871558..2dced547 100644 --- a/dist/checkbox-group/index.js +++ b/dist/checkbox-group/index.js @@ -15,16 +15,21 @@ VantComponent({ type: Boolean, observer: 'updateChildren', }, + direction: { + type: String, + value: 'vertical', + }, }, methods: { updateChildren() { this.children.forEach((child) => this.updateChild(child)); }, updateChild(child) { - const { value, disabled } = this.data; + const { value, disabled, direction } = this.data; child.setData({ value: value.indexOf(child.data.name) !== -1, parentDisabled: disabled, + direction, }); }, }, diff --git a/dist/checkbox-group/index.wxml b/dist/checkbox-group/index.wxml index 4fa864ce..638bf9de 100644 --- a/dist/checkbox-group/index.wxml +++ b/dist/checkbox-group/index.wxml @@ -1 +1,5 @@ - + + + + + diff --git a/dist/checkbox-group/index.wxss b/dist/checkbox-group/index.wxss index 99694d60..dcb6f333 100644 --- a/dist/checkbox-group/index.wxss +++ b/dist/checkbox-group/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss'; \ No newline at end of file +@import '../common/index.wxss';.van-checkbox-group--horizontal{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap} \ No newline at end of file diff --git a/dist/checkbox/index.js b/dist/checkbox/index.js index 281f69ad..304be2cd 100644 --- a/dist/checkbox/index.js +++ b/dist/checkbox/index.js @@ -29,6 +29,7 @@ VantComponent({ }, data: { parentDisabled: false, + direction: 'vertical', }, methods: { emitChange(value) { diff --git a/dist/checkbox/index.wxml b/dist/checkbox/index.wxml index 0c008d81..39a7bb03 100644 --- a/dist/checkbox/index.wxml +++ b/dist/checkbox/index.wxml @@ -1,7 +1,7 @@ - + + + + + diff --git a/dist/config-provider/index.wxs b/dist/config-provider/index.wxs new file mode 100644 index 00000000..7ca02030 --- /dev/null +++ b/dist/config-provider/index.wxs @@ -0,0 +1,29 @@ +/* eslint-disable */ +var object = require('../wxs/object.wxs'); +var style = require('../wxs/style.wxs'); + +function kebabCase(word) { + var newWord = word + .replace(getRegExp("[A-Z]", 'g'), function (i) { + return '-' + i; + }) + .toLowerCase() + .replace(getRegExp("^-"), ''); + + return newWord; +} + +function mapThemeVarsToCSSVars(themeVars) { + var cssVars = {}; + object.keys(themeVars).forEach(function (key) { + var cssVarsKey = '--' + kebabCase(key); + cssVars[cssVarsKey] = themeVars[key]; + }); + + return style(cssVars); +} + +module.exports = { + kebabCase: kebabCase, + mapThemeVarsToCSSVars: mapThemeVarsToCSSVars, +}; diff --git a/dist/goods-action-button/index.wxss b/dist/goods-action-button/index.wxss index 77d16c67..a4e3f4ee 100644 --- a/dist/goods-action-button/index.wxss +++ b/dist/goods-action-button/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}} \ No newline at end of file +@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:40px/2 0 0 40px/2;--button-border-radius:var(--goods-action-button-border-radius,40px/2) 0 0 var(--goods-action-button-border-radius,40px/2)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 40px/2 40px/2 0;--button-border-radius:0 var(--goods-action-button-border-radius,40px/2) var(--goods-action-button-border-radius,40px/2) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:40px/2;--button-border-radius:var(--goods-action-button-border-radius,40px/2)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}} \ No newline at end of file diff --git a/dist/grid-item/index.js b/dist/grid-item/index.js index e0083097..17ef232c 100644 --- a/dist/grid-item/index.js +++ b/dist/grid-item/index.js @@ -8,6 +8,7 @@ VantComponent({ props: { icon: String, iconColor: String, + iconPrefix: String, dot: Boolean, info: null, badge: null, @@ -34,6 +35,7 @@ VantComponent({ clickable, center, direction, + reverse, iconSize, } = data; this.setData({ @@ -43,6 +45,7 @@ VantComponent({ gutter, clickable, direction, + reverse, iconSize, index: children.indexOf(this), columnNum, diff --git a/dist/grid-item/index.wxml b/dist/grid-item/index.wxml index 0070a2bb..e95087d8 100644 --- a/dist/grid-item/index.wxml +++ b/dist/grid-item/index.wxml @@ -7,7 +7,7 @@ bindtap="onClick" > @@ -15,7 +15,7 @@ - + diff --git a/dist/grid-item/index.wxss b/dist/grid-item/index.wxss index ed7facb8..1342e99f 100644 --- a/dist/grid-item/index.wxss +++ b/dist/grid-item/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px} \ No newline at end of file +@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__text{margin:0 0 0 8px}.van-grid-item__content--reverse{-webkit-flex-direction:column-reverse;flex-direction:column-reverse}.van-grid-item__content--reverse .van-grid-item__text{margin:0 0 8px}.van-grid-item__content--horizontal.van-grid-item__content--reverse{-webkit-flex-direction:row-reverse;flex-direction:row-reverse}.van-grid-item__content--horizontal.van-grid-item__content--reverse .van-grid-item__text{margin:0 8px 0 0}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px} \ No newline at end of file diff --git a/dist/grid/index.js b/dist/grid/index.js index 73e41ceb..b80d3785 100644 --- a/dist/grid/index.js +++ b/dist/grid/index.js @@ -39,6 +39,11 @@ VantComponent({ type: String, observer: 'updateChildren', }, + reverse: { + type: Boolean, + value: false, + observer: 'updateChildren', + }, }, methods: { updateChildren() { diff --git a/dist/rate/index.js b/dist/rate/index.js index 90d2378c..9dd6819f 100644 --- a/dist/rate/index.js +++ b/dist/rate/index.js @@ -25,18 +25,9 @@ VantComponent({ type: String, value: 'star-o', }, - color: { - type: String, - value: '#ffd21e', - }, - voidColor: { - type: String, - value: '#c7c7c7', - }, - disabledColor: { - type: String, - value: '#bdbdbd', - }, + color: String, + voidColor: String, + disabledColor: String, count: { type: Number, value: 5, diff --git a/dist/rate/index.wxml b/dist/rate/index.wxml index 58eee5cd..049714c4 100644 --- a/dist/rate/index.wxml +++ b/dist/rate/index.wxml @@ -1,19 +1,20 @@ + - + diff --git a/dist/slider/index.wxss b/dist/slider/index.wxss index 7886b606..6307eac4 100644 --- a/dist/slider/index.wxss +++ b/dist/slider/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-slider{position:relative;border-radius:999px;border-radius:var(--border-radius-max,999px);background-color:#ebedf0;background-color:var(--slider-inactive-background-color,#ebedf0)}.van-slider:before{position:absolute;right:0;left:0;content:"";top:-8px;top:-var(--padding-xs,8px);bottom:-8px;bottom:-var(--padding-xs,8px)}.van-slider__bar{position:relative;border-radius:inherit;transition:width .2s;transition:width var(--animation-duration-fast,.2s);background-color:#1989fa;background-color:var(--slider-active-background-color,#1989fa)}.van-slider__button{width:24px;height:24px;border-radius:50%;box-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#fff;background-color:var(--slider-button-background-color,#fff)}.van-slider__button-wrapper{position:absolute;top:50%;right:0;-webkit-transform:translate3d(50%,-50%,0);transform:translate3d(50%,-50%,0)}.van-slider--disabled{opacity:.5} \ No newline at end of file +@import '../common/index.wxss';.van-slider{position:relative;height:2px;height:var(--slider-bar-height,2px);border-radius:999px;border-radius:var(--border-radius-max,999px);background-color:#ebedf0;background-color:var(--slider-inactive-background-color,#ebedf0)}.van-slider:before{position:absolute;right:0;left:0;content:"";top:-8px;top:-var(--padding-xs,8px);bottom:-8px;bottom:-var(--padding-xs,8px)}.van-slider__bar{position:relative;width:100%;height:100%;background-color:#1989fa;background-color:var(--slider-active-background-color,#1989fa);border-radius:inherit;transition:all .2s;transition:all var(--animation-duration-fast,.2s)}.van-slider__button{width:24px;width:var(--slider-button-width,24px);height:24px;height:var(--slider-button-height,24px);border-radius:50%;border-radius:var(--slider-button-border-radius,50%);box-shadow:0 1px 2px rgba(0,0,0,.5);box-shadow:var(--slider-button-box-shadow,0 1px 2px rgba(0,0,0,.5));background-color:#fff;background-color:var(--slider-button-background-color,#fff)}.van-slider__button-wrapper{position:absolute;top:50%;right:0;-webkit-transform:translate3d(50%,-50%,0);transform:translate3d(50%,-50%,0)}.van-slider--disabled{opacity:.5;opacity:var(--slider-disabled-opacity,.5)} \ No newline at end of file diff --git a/dist/wxs/style.wxs b/dist/wxs/style.wxs index c39c810f..d88ca7c9 100644 --- a/dist/wxs/style.wxs +++ b/dist/wxs/style.wxs @@ -2,6 +2,16 @@ var object = require('./object.wxs'); var array = require('./array.wxs'); +function kebabCase(word) { + var newWord = word + .replace(getRegExp("[A-Z]", 'g'), function (i) { + return '-' + i; + }) + .toLowerCase() + + return newWord; +} + function style(styles) { if (array.isArray(styles)) { return styles @@ -21,7 +31,7 @@ function style(styles) { return styles[key] != null && styles[key] !== ''; }) .map(function (key) { - return [key, [styles[key]]].join(':'); + return [kebabCase(key), [styles[key]]].join(':'); }) .join(';'); } diff --git a/lib/button/index.js b/lib/button/index.js index ca757d74..caff63c1 100644 --- a/lib/button/index.js +++ b/lib/button/index.js @@ -55,10 +55,12 @@ component_1.VantComponent({ var _a = this.data, canIUseGetUserProfile = _a.canIUseGetUserProfile, openType = _a.openType, - getUserProfileDesc = _a.getUserProfileDesc; + getUserProfileDesc = _a.getUserProfileDesc, + lang = _a.lang; if (openType === 'getUserInfo' && canIUseGetUserProfile) { wx.getUserProfile({ desc: getUserProfileDesc || ' ', + lang: lang || 'en', complete: function (userProfile) { _this.$emit('getuserinfo', userProfile); }, diff --git a/lib/checkbox-group/index.js b/lib/checkbox-group/index.js index 1c8016a6..96aec51c 100644 --- a/lib/checkbox-group/index.js +++ b/lib/checkbox-group/index.js @@ -17,6 +17,10 @@ component_1.VantComponent({ type: Boolean, observer: 'updateChildren', }, + direction: { + type: String, + value: 'vertical', + }, }, methods: { updateChildren: function () { @@ -28,10 +32,12 @@ component_1.VantComponent({ updateChild: function (child) { var _a = this.data, value = _a.value, - disabled = _a.disabled; + disabled = _a.disabled, + direction = _a.direction; child.setData({ value: value.indexOf(child.data.name) !== -1, parentDisabled: disabled, + direction: direction, }); }, }, diff --git a/lib/checkbox-group/index.wxml b/lib/checkbox-group/index.wxml index 4fa864ce..638bf9de 100644 --- a/lib/checkbox-group/index.wxml +++ b/lib/checkbox-group/index.wxml @@ -1 +1,5 @@ - + + + + + diff --git a/lib/checkbox-group/index.wxss b/lib/checkbox-group/index.wxss index 99694d60..dcb6f333 100644 --- a/lib/checkbox-group/index.wxss +++ b/lib/checkbox-group/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss'; \ No newline at end of file +@import '../common/index.wxss';.van-checkbox-group--horizontal{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap} \ No newline at end of file diff --git a/lib/checkbox/index.js b/lib/checkbox/index.js index 7b9598bb..c607f292 100644 --- a/lib/checkbox/index.js +++ b/lib/checkbox/index.js @@ -31,6 +31,7 @@ component_1.VantComponent({ }, data: { parentDisabled: false, + direction: 'vertical', }, methods: { emitChange: function (value) { diff --git a/lib/checkbox/index.wxml b/lib/checkbox/index.wxml index 0c008d81..39a7bb03 100644 --- a/lib/checkbox/index.wxml +++ b/lib/checkbox/index.wxml @@ -1,7 +1,7 @@ - + + + + + diff --git a/lib/config-provider/index.wxs b/lib/config-provider/index.wxs new file mode 100644 index 00000000..7ca02030 --- /dev/null +++ b/lib/config-provider/index.wxs @@ -0,0 +1,29 @@ +/* eslint-disable */ +var object = require('../wxs/object.wxs'); +var style = require('../wxs/style.wxs'); + +function kebabCase(word) { + var newWord = word + .replace(getRegExp("[A-Z]", 'g'), function (i) { + return '-' + i; + }) + .toLowerCase() + .replace(getRegExp("^-"), ''); + + return newWord; +} + +function mapThemeVarsToCSSVars(themeVars) { + var cssVars = {}; + object.keys(themeVars).forEach(function (key) { + var cssVarsKey = '--' + kebabCase(key); + cssVars[cssVarsKey] = themeVars[key]; + }); + + return style(cssVars); +} + +module.exports = { + kebabCase: kebabCase, + mapThemeVarsToCSSVars: mapThemeVarsToCSSVars, +}; diff --git a/lib/goods-action-button/index.wxss b/lib/goods-action-button/index.wxss index 77d16c67..a4e3f4ee 100644 --- a/lib/goods-action-button/index.wxss +++ b/lib/goods-action-button/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}} \ No newline at end of file +@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:40px/2 0 0 40px/2;--button-border-radius:var(--goods-action-button-border-radius,40px/2) 0 0 var(--goods-action-button-border-radius,40px/2)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 40px/2 40px/2 0;--button-border-radius:0 var(--goods-action-button-border-radius,40px/2) var(--goods-action-button-border-radius,40px/2) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:40px/2;--button-border-radius:var(--goods-action-button-border-radius,40px/2)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}} \ No newline at end of file diff --git a/lib/grid-item/index.js b/lib/grid-item/index.js index d6644781..03f0d785 100644 --- a/lib/grid-item/index.js +++ b/lib/grid-item/index.js @@ -10,6 +10,7 @@ component_1.VantComponent({ props: { icon: String, iconColor: String, + iconPrefix: String, dot: Boolean, info: null, badge: null, @@ -37,6 +38,7 @@ component_1.VantComponent({ clickable = data.clickable, center = data.center, direction = data.direction, + reverse = data.reverse, iconSize = data.iconSize; this.setData({ center: center, @@ -45,6 +47,7 @@ component_1.VantComponent({ gutter: gutter, clickable: clickable, direction: direction, + reverse: reverse, iconSize: iconSize, index: children.indexOf(this), columnNum: columnNum, diff --git a/lib/grid-item/index.wxml b/lib/grid-item/index.wxml index 0070a2bb..e95087d8 100644 --- a/lib/grid-item/index.wxml +++ b/lib/grid-item/index.wxml @@ -7,7 +7,7 @@ bindtap="onClick" > @@ -15,7 +15,7 @@ - + diff --git a/lib/grid-item/index.wxss b/lib/grid-item/index.wxss index ed7facb8..1342e99f 100644 --- a/lib/grid-item/index.wxss +++ b/lib/grid-item/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px} \ No newline at end of file +@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__text{margin:0 0 0 8px}.van-grid-item__content--reverse{-webkit-flex-direction:column-reverse;flex-direction:column-reverse}.van-grid-item__content--reverse .van-grid-item__text{margin:0 0 8px}.van-grid-item__content--horizontal.van-grid-item__content--reverse{-webkit-flex-direction:row-reverse;flex-direction:row-reverse}.van-grid-item__content--horizontal.van-grid-item__content--reverse .van-grid-item__text{margin:0 8px 0 0}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px} \ No newline at end of file diff --git a/lib/grid/index.js b/lib/grid/index.js index e138f2e7..2de31e04 100644 --- a/lib/grid/index.js +++ b/lib/grid/index.js @@ -41,6 +41,11 @@ component_1.VantComponent({ type: String, observer: 'updateChildren', }, + reverse: { + type: Boolean, + value: false, + observer: 'updateChildren', + }, }, methods: { updateChildren: function () { diff --git a/lib/rate/index.js b/lib/rate/index.js index 6e61947c..a9539582 100644 --- a/lib/rate/index.js +++ b/lib/rate/index.js @@ -42,18 +42,9 @@ component_1.VantComponent({ type: String, value: 'star-o', }, - color: { - type: String, - value: '#ffd21e', - }, - voidColor: { - type: String, - value: '#c7c7c7', - }, - disabledColor: { - type: String, - value: '#bdbdbd', - }, + color: String, + voidColor: String, + disabledColor: String, count: { type: Number, value: 5, diff --git a/lib/rate/index.wxml b/lib/rate/index.wxml index 58eee5cd..049714c4 100644 --- a/lib/rate/index.wxml +++ b/lib/rate/index.wxml @@ -1,19 +1,20 @@ + - + diff --git a/lib/slider/index.wxss b/lib/slider/index.wxss index 7886b606..6307eac4 100644 --- a/lib/slider/index.wxss +++ b/lib/slider/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-slider{position:relative;border-radius:999px;border-radius:var(--border-radius-max,999px);background-color:#ebedf0;background-color:var(--slider-inactive-background-color,#ebedf0)}.van-slider:before{position:absolute;right:0;left:0;content:"";top:-8px;top:-var(--padding-xs,8px);bottom:-8px;bottom:-var(--padding-xs,8px)}.van-slider__bar{position:relative;border-radius:inherit;transition:width .2s;transition:width var(--animation-duration-fast,.2s);background-color:#1989fa;background-color:var(--slider-active-background-color,#1989fa)}.van-slider__button{width:24px;height:24px;border-radius:50%;box-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#fff;background-color:var(--slider-button-background-color,#fff)}.van-slider__button-wrapper{position:absolute;top:50%;right:0;-webkit-transform:translate3d(50%,-50%,0);transform:translate3d(50%,-50%,0)}.van-slider--disabled{opacity:.5} \ No newline at end of file +@import '../common/index.wxss';.van-slider{position:relative;height:2px;height:var(--slider-bar-height,2px);border-radius:999px;border-radius:var(--border-radius-max,999px);background-color:#ebedf0;background-color:var(--slider-inactive-background-color,#ebedf0)}.van-slider:before{position:absolute;right:0;left:0;content:"";top:-8px;top:-var(--padding-xs,8px);bottom:-8px;bottom:-var(--padding-xs,8px)}.van-slider__bar{position:relative;width:100%;height:100%;background-color:#1989fa;background-color:var(--slider-active-background-color,#1989fa);border-radius:inherit;transition:all .2s;transition:all var(--animation-duration-fast,.2s)}.van-slider__button{width:24px;width:var(--slider-button-width,24px);height:24px;height:var(--slider-button-height,24px);border-radius:50%;border-radius:var(--slider-button-border-radius,50%);box-shadow:0 1px 2px rgba(0,0,0,.5);box-shadow:var(--slider-button-box-shadow,0 1px 2px rgba(0,0,0,.5));background-color:#fff;background-color:var(--slider-button-background-color,#fff)}.van-slider__button-wrapper{position:absolute;top:50%;right:0;-webkit-transform:translate3d(50%,-50%,0);transform:translate3d(50%,-50%,0)}.van-slider--disabled{opacity:.5;opacity:var(--slider-disabled-opacity,.5)} \ No newline at end of file diff --git a/lib/wxs/style.wxs b/lib/wxs/style.wxs index c39c810f..d88ca7c9 100644 --- a/lib/wxs/style.wxs +++ b/lib/wxs/style.wxs @@ -2,6 +2,16 @@ var object = require('./object.wxs'); var array = require('./array.wxs'); +function kebabCase(word) { + var newWord = word + .replace(getRegExp("[A-Z]", 'g'), function (i) { + return '-' + i; + }) + .toLowerCase() + + return newWord; +} + function style(styles) { if (array.isArray(styles)) { return styles @@ -21,7 +31,7 @@ function style(styles) { return styles[key] != null && styles[key] !== ''; }) .map(function (key) { - return [key, [styles[key]]].join(':'); + return [kebabCase(key), [styles[key]]].join(':'); }) .join(';'); }