From b9a34aa0b6b224812f17248f592f684b2a552db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Wed, 26 Sep 2018 15:44:51 +0800 Subject: [PATCH] build --- dist/cell/index.wxml | 9 ++++--- dist/radio-group/index.js | 37 ++++++++++++++++++++++++++++ dist/radio-group/index.json | 6 +++++ dist/radio-group/index.wxml | 3 +++ dist/radio-group/index.wxss | 1 + dist/radio/index.js | 49 +++++++++++++++++++++++++++++++++++++ dist/radio/index.json | 6 +++++ dist/radio/index.wxml | 16 ++++++++++++ dist/radio/index.wxss | 1 + dist/search/index.js | 1 + dist/steps/index.wxml | 2 +- dist/steps/index.wxss | 2 +- dist/submit-bar/index.js | 3 ++- dist/submit-bar/index.wxml | 2 +- dist/submit-bar/index.wxss | 2 +- 15 files changed, 131 insertions(+), 9 deletions(-) create mode 100644 dist/radio-group/index.js create mode 100644 dist/radio-group/index.json create mode 100644 dist/radio-group/index.wxml create mode 100644 dist/radio-group/index.wxss create mode 100644 dist/radio/index.js create mode 100644 dist/radio/index.json create mode 100644 dist/radio/index.wxml create mode 100644 dist/radio/index.wxss diff --git a/dist/cell/index.wxml b/dist/cell/index.wxml index 70866015..ee92995f 100644 --- a/dist/cell/index.wxml +++ b/dist/cell/index.wxml @@ -11,14 +11,15 @@ - {{ title }} - {{ label }} + + {{ title }} + {{ label }} + + - {{ value }} diff --git a/dist/radio-group/index.js b/dist/radio-group/index.js new file mode 100644 index 00000000..f42c9c4c --- /dev/null +++ b/dist/radio-group/index.js @@ -0,0 +1,37 @@ +import { VantComponent } from '../common/component'; + +VantComponent({ + relations: { + '../radio/index': { + type: 'descendant', + linked(target) { + const { value, disabled } = this.data; + target.setData({ + value: value, + disabled: disabled || target.data.disabled + }); + } + } + }, + + props: { + value: { + type: null, + observer(value) { + const children = this.getRelationNodes('../radio/index'); + children.forEach(child => { + child.setData({ value }); + }); + } + }, + disabled: { + type: Boolean, + observer(disabled) { + const children = this.getRelationNodes('../radio/index'); + children.forEach(child => { + child.setData({ disabled: disabled || children.data.disabled }); + }); + } + } + } +}); diff --git a/dist/radio-group/index.json b/dist/radio-group/index.json new file mode 100644 index 00000000..0a336c08 --- /dev/null +++ b/dist/radio-group/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "van-icon": "../icon/index" + } +} diff --git a/dist/radio-group/index.wxml b/dist/radio-group/index.wxml new file mode 100644 index 00000000..775ee3ce --- /dev/null +++ b/dist/radio-group/index.wxml @@ -0,0 +1,3 @@ + + + diff --git a/dist/radio-group/index.wxss b/dist/radio-group/index.wxss new file mode 100644 index 00000000..6f56fe43 --- /dev/null +++ b/dist/radio-group/index.wxss @@ -0,0 +1 @@ +.van-radio{overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__input,.van-radio__label{display:inline-block;vertical-align:middle}.van-radio__input{height:1em;position:relative;font-size:20px}.van-radio__control{z-index:1;position:absolute;top:0;left:0;opacity:0;margin:0;width:100%;height:100%}.van-radio__label{line-height:20px;margin-left:10px}.van-radio__label--left{float:left;margin:0 10px 0 0}.van-radio__icon{width:1em;pointer-events:none}.van-radio__icon--disabled{color:#e5e5e5}.van-radio__icon--checked{color:#06bf04}.van-radio__icon--check{color:#999} \ No newline at end of file diff --git a/dist/radio/index.js b/dist/radio/index.js new file mode 100644 index 00000000..280e2c1f --- /dev/null +++ b/dist/radio/index.js @@ -0,0 +1,49 @@ +import { VantComponent } from '../common/component'; + +VantComponent({ + relations: { + '../radio-group/index': { + type: 'ancestor' + } + }, + + classes: ['icon-class', 'label-class'], + + props: { + name: null, + value: null, + disabled: Boolean, + labelDisabled: Boolean, + labelPosition: String + }, + + computed: { + iconClass() { + const { disabled, name, value } = this.data; + return this.classNames('van-radio__icon', { + 'van-radio__icon--disabled': disabled, + 'van-radio__icon--checked': !disabled && name === value, + 'van-radio__icon--check': !disabled && name !== value + }); + } + }, + + methods: { + emitChange(value) { + const parent = this.getRelationNodes('../radio-group/index')[0]; + (parent || this).$emit('input', value); + (parent || this).$emit('change', value); + }, + + onChange(event) { + const { value } = event.detail; + this.emitChange(value); + }, + + onClickLabel() { + if (!this.data.disabled && !this.data.labelDisabled) { + this.emitChange(this.data.name); + } + } + } +}); diff --git a/dist/radio/index.json b/dist/radio/index.json new file mode 100644 index 00000000..0a336c08 --- /dev/null +++ b/dist/radio/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "van-icon": "../icon/index" + } +} diff --git a/dist/radio/index.wxml b/dist/radio/index.wxml new file mode 100644 index 00000000..011a7e0e --- /dev/null +++ b/dist/radio/index.wxml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/dist/radio/index.wxss b/dist/radio/index.wxss new file mode 100644 index 00000000..b6c34285 --- /dev/null +++ b/dist/radio/index.wxss @@ -0,0 +1 @@ +.van-radio{overflow:hidden;line-height:1;-webkit-user-select:none;user-select:none}.van-radio__input,.van-radio__label{display:inline-block;vertical-align:middle}.van-radio__input{position:relative;font-size:20px}.van-radio__control{z-index:1;position:absolute;top:0;left:0;width:100%;height:100%;margin:0;opacity:0}.van-radio__label{margin-left:10px;color:#333;font-size:16px;line-height:20px}.van-radio__label--left{margin:0 10px 0 0;float:left}.van-radio__icon{pointer-events:none;display:block;line-height:0}.van-radio__icon--disabled{color:#e5e5e5}.van-radio__icon--checked{color:#06bf04}.van-radio__icon--check{color:#999} \ No newline at end of file diff --git a/dist/search/index.js b/dist/search/index.js index ebcee417..8729f641 100644 --- a/dist/search/index.js +++ b/dist/search/index.js @@ -24,6 +24,7 @@ VantComponent({ methods: { onChange(event) { + this.setData({ value: event.detail }); this.$emit('change', event.detail); }, diff --git a/dist/steps/index.wxml b/dist/steps/index.wxml index 01f9f534..8490bb6b 100644 --- a/dist/steps/index.wxml +++ b/dist/steps/index.wxml @@ -13,6 +13,6 @@ - + diff --git a/dist/steps/index.wxss b/dist/steps/index.wxss index d22c1cb2..3f22cce6 100644 --- a/dist/steps/index.wxss +++ b/dist/steps/index.wxss @@ -1 +1 @@ -.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:-50%;left:-50%;right:-50%;bottom:-50%;-webkit-transform:scale(.5);transform:scale(.5);pointer-events:none;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;border:0 solid #eee}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-steps{overflow:hidden;background-color:#fff}.van-steps--horizontal{display:-webkit-box;display:-webkit-flex;display:flex;overflow:hidden;position:relative;padding:10px 10px 15px}.van-steps--vertical{padding:0 0 0 35px}.van-step{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:14px;position:relative;color:#999}.van-step--finish{color:#333}.van-step__circle{width:5px;height:5px;background-color:#999;border-radius:50%}.van-step--horizontal{float:left;padding-bottom:10px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none;margin-left:0}.van-step--horizontal:last-child{position:absolute;right:10px;width:auto}.van-step--horizontal:last-child .van-step__title{-webkit-transform:none;transform:none;margin-left:0;text-align:right}.van-step--horizontal:last-child .van-step__circle-container{left:auto;right:-9px}.van-step--horizontal:last-child .van-step__line{width:0}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:0;left:-8px;padding:0 8px;background-color:#fff;z-index:1}.van-step--horizontal .van-step__title{font-size:12px;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);display:inline-block;margin-left:3px}.van-step--horizontal .van-step__line{position:absolute;left:0;bottom:2px;width:100%;height:1px;background-color:#eee}.van-step--horizontal.van-step--process{color:#333}.van-step--horizontal.van-step--process .van-step__circle-container{bottom:-4px}.van-step--horizontal.van-step--process .van-step__active{font-size:12px;color:#06bf04;display:block;line-height:1}.van-step--vertical{font-size:14px;line-height:18px;padding:10px 10px 10px 0}.van-step--vertical:not(:last-child)::after{border-bottom-width:1px}.van-step--vertical:first-child::before{content:'';position:absolute;width:1px;height:20px;background-color:#fff;top:0;left:-15px;z-index:1}.van-step--vertical .van-step__active,.van-step--vertical .van-step__circle{z-index:2;position:absolute}.van-step--vertical .van-step__active{top:12px;left:-20px;line-height:1;font-size:12px}.van-step--vertical .van-step__circle{top:16px;left:-17px}.van-step--vertical .van-step__line{position:absolute;top:0;left:-15px;width:1px;height:100%;background-color:#eee} \ No newline at end of file +.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:-50%;left:-50%;right:-50%;bottom:-50%;-webkit-transform:scale(.5);transform:scale(.5);pointer-events:none;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;border:0 solid #eee}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-steps{overflow:hidden;background-color:#fff}.van-steps--horizontal{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;overflow:hidden;padding:10px 10px 15px}.van-steps--vertical{padding:0 0 0 35px}.van-step{position:relative;-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:14px;color:#999}.van-step--finish{color:#333}.van-step__circle{width:5px;height:5px;background-color:#999;border-radius:50%}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:10px;width:auto}.van-step--horizontal:last-child .van-step__title{-webkit-transform:none;transform:none;text-align:right}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;padding:0 8px;background-color:#fff;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0)}.van-step--horizontal .van-step__title{display:inline-block;font-size:12px;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.van-step--horizontal .van-step__line{position:absolute;left:0;right:0;bottom:6px;height:1px;background-color:#eee;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal.van-step--process{color:#333}.van-step--horizontal.van-step--process .van-step__active{display:block;font-size:12px;color:#06bf04;line-height:1}.van-step--vertical{font-size:14px;line-height:18px;padding:10px 10px 10px 0}.van-step--vertical:not(:last-child)::after{border-bottom-width:1px}.van-step--vertical:first-child::before{content:'';position:absolute;width:1px;height:20px;background-color:#fff;top:0;left:-15px;z-index:1}.van-step--vertical .van-step__active,.van-step--vertical .van-step__circle,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__active{font-size:12px;line-height:1}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;background-color:#eee;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)} \ No newline at end of file diff --git a/dist/submit-bar/index.js b/dist/submit-bar/index.js index 00857608..a5b70d95 100644 --- a/dist/submit-bar/index.js +++ b/dist/submit-bar/index.js @@ -2,6 +2,7 @@ import { VantComponent } from '../common/component'; VantComponent({ classes: [ + 'bar-class', 'price-class', 'button-class' ], @@ -9,7 +10,7 @@ VantComponent({ props: { tip: [String, Boolean], type: Number, - price: Number, + price: null, label: String, loading: Boolean, disabled: Boolean, diff --git a/dist/submit-bar/index.wxml b/dist/submit-bar/index.wxml index d40fd4f1..134f51fc 100644 --- a/dist/submit-bar/index.wxml +++ b/dist/submit-bar/index.wxml @@ -5,7 +5,7 @@ {{ tipStr }} - + diff --git a/dist/submit-bar/index.wxss b/dist/submit-bar/index.wxss index fd6d9d09..454ef419 100644 --- a/dist/submit-bar/index.wxss +++ b/dist/submit-bar/index.wxss @@ -1 +1 @@ -.van-submit-bar{left:0;bottom:0;width:100%;z-index:100;position:fixed;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{color:#f85;padding:10px;font-size:12px;line-height:18px;background-color:#fff7cc}.van-submit-bar__bar{height:50px;display:-webkit-box;display:-webkit-flex;display:flex;font-size:14px;-webkit-box-align:center;-webkit-align-items:center;align-items:center;background-color:#fff}.van-submit-bar__text{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-weight:500;text-align:right;color:#333;padding-right:12px}.van-submit-bar__text span{display:inline-block}.van-submit-bar__price{color:#f44}.van-submit-bar__button button{width:110px}.van-submit-bar__button--disabled button{border:none!important} \ No newline at end of file +.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;background-color:#fff7cc;color:#f85;font-size:12px;line-height:18px}.van-submit-bar__bar{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__text{-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{padding-right:12px;color:#f44}.van-submit-bar__button button{width:110px}.van-submit-bar__button--disabled button{border:none!important} \ No newline at end of file