[new feature] progress add showPivot prop (#300)

* fix: Tabbar icon line-height

* [new feature] progress add showPivot prop
This commit is contained in:
neverland
2017-11-10 05:59:15 -06:00
committed by GitHub
parent fbcb691699
commit 5048d4fbac
4 changed files with 17 additions and 9 deletions

View File

@@ -1,25 +1,25 @@
<template>
<div class="van-progress">
<span class="van-progress__portion" :style="portionStyle"></span>
<span class="van-progress__pivot" :style="pivotStyle">{{ pivotText }}</span>
<span class="van-progress__pivot" v-show="showPivot" :style="pivotStyle">{{ pivotText }}</span>
</div>
</template>
<script>
const DEFAULT_COLOR = '#38f';
const DEFAULT_TEXT_COLOR = '#fff';
const INACTIVE_COLOR = '#cacaca';
export default {
name: 'van-progress',
props: {
inactive: Boolean,
percentage: {
type: Number,
required: true,
validator: value => value >= 0 && value <= 100
},
inactive: Boolean,
showPivot: {
type: Boolean,
default: true
},
pivotText: {
type: String,
default() {
@@ -28,17 +28,17 @@ export default {
},
color: {
type: String,
default: DEFAULT_COLOR
default: '#38f'
},
textColor: {
type: String,
default: DEFAULT_TEXT_COLOR
default: '#fff'
}
},
computed: {
componentColor() {
return this.inactive ? INACTIVE_COLOR : this.color;
return this.inactive ? '#cacaca' : this.color;
},
pivotStyle() {
const { percentage } = this;