[improvement] Tag: add size prop (#1949)

This commit is contained in:
neverland 2018-10-17 15:16:32 +08:00 committed by GitHub
parent 935108c15c
commit d252a66b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 5 deletions

View File

@ -34,6 +34,12 @@
<van-tag color="#7232dd">{{ $t('tag') }}</van-tag> <van-tag color="#7232dd">{{ $t('tag') }}</van-tag>
<van-tag color="#7232dd" plain>{{ $t('tag') }}</van-tag> <van-tag color="#7232dd" plain>{{ $t('tag') }}</van-tag>
</demo-block> </demo-block>
<demo-block :title="$t('customSize')">
<van-tag type="danger">{{ $t('tag') }}</van-tag>
<van-tag type="danger" size="medium">{{ $t('tag') }}</van-tag>
<van-tag type="danger" size="large">{{ $t('tag') }}</van-tag>
</demo-block>
</demo-section> </demo-section>
</template> </template>
@ -44,13 +50,15 @@ export default {
plain: '空心样式', plain: '空心样式',
round: '圆角样式', round: '圆角样式',
mark: '标记样式', mark: '标记样式',
customColor: '自定义颜色' customColor: '自定义颜色',
customSize: '标签大小'
}, },
'en-US': { 'en-US': {
plain: 'Plain style', plain: 'Plain style',
round: 'Round style', round: 'Round style',
mark: 'Mark style', mark: 'Mark style',
customColor: 'Custom Color' customColor: 'Custom Color',
customSize: 'Custom Size'
} }
} }
}; };

View File

@ -54,11 +54,21 @@ Vue.use(Tag);
<van-tag color="#7232dd" plain>Tag</van-tag> <van-tag color="#7232dd" plain>Tag</van-tag>
``` ```
#### Custom Size
```html
<van-tag>Tag</van-tag>
<van-tag size="medium">Tag</van-tag>
<van-tag size="large">Tag</van-tag>
```
### API ### API
| Attribute | Description | Type | Default | | Attribute | Description | Type | Default |
|-----------|-----------|-----------|-------------| |-----------|-----------|-----------|-------------|
| type | Type, can be set to `primary` `success` `danger` | `String` | `''`| | type | Type, can be set to `primary` `success` `danger` | `String` | - |
| size | Size, can be set to `large` `medium` | `String` | - |
| color | Custom color | `String` | - |
| plain | Whether to be plain style | `Boolean` | `false` | | plain | Whether to be plain style | `Boolean` | `false` |
| round | Whether to be round style | `Boolean` | `false` | | round | Whether to be round style | `Boolean` | `false` |
| mark | Wtether to be mark style | `Boolean` | `false` | | mark | Wtether to be mark style | `Boolean` | `false` |

View File

@ -3,7 +3,8 @@
:class="[b({ :class="[b({
mark, mark,
plain, plain,
round round,
[size]: size
}), { }), {
'van-hairline--surround': plain 'van-hairline--surround': plain
}]" }]"
@ -27,6 +28,7 @@ export default create({
name: 'tag', name: 'tag',
props: { props: {
size: String,
type: String, type: String,
mark: Boolean, mark: Boolean,
color: String, color: String,

View File

@ -11,5 +11,6 @@ exports[`renders demo correctly 1`] = `
style="background-color:#06bf04;">标签</span></div> style="background-color:#06bf04;">标签</span></div>
<div><span class="van-tag" style="background-color:#f2826a;">标签</span> <span class="van-tag van-tag--plain van-hairline--surround" style="color:#f2826a;">标签</span> <span class="van-tag" style="background-color:#7232dd;">标签</span> <span class="van-tag van-tag--plain van-hairline--surround" <div><span class="van-tag" style="background-color:#f2826a;">标签</span> <span class="van-tag van-tag--plain van-hairline--surround" style="color:#f2826a;">标签</span> <span class="van-tag" style="background-color:#7232dd;">标签</span> <span class="van-tag van-tag--plain van-hairline--surround"
style="color:#7232dd;">标签</span></div> style="color:#7232dd;">标签</span></div>
<div><span class="van-tag" style="background-color:#f44;">标签</span> <span class="van-tag van-tag--medium" style="background-color:#f44;">标签</span> <span class="van-tag van-tag--large" style="background-color:#f44;">标签</span></div>
</div> </div>
`; `;

View File

@ -58,11 +58,20 @@ Vue.use(Tag);
<van-tag color="#7232dd" plain>标签</van-tag> <van-tag color="#7232dd" plain>标签</van-tag>
``` ```
#### 标签大小
```html
<van-tag>标签</van-tag>
<van-tag size="medium">标签</van-tag>
<van-tag size="large">标签</van-tag>
```
### API ### API
| 参数 | 说明 | 类型 | 默认值 | | 参数 | 说明 | 类型 | 默认值 |
|-----------|-----------|-----------|-------------| |-----------|-----------|-----------|-------------|
| type | 类型,可选值为`primary` `success` `danger` | `String` | `''`| | type | 类型,可选值为`primary` `success` `danger` | `String` | - |
| size | 大小, 可选值为`large` `medium` | `String` | - |
| color | 自定义标签颜色 | `String` | - | | color | 自定义标签颜色 | `String` | - |
| plain | 是否为空心样式 | `Boolean` | `false` | | plain | 是否为空心样式 | `Boolean` | `false` |
| round | 是否为圆角样式 | `Boolean` | `false` | | round | 是否为圆角样式 | `Boolean` | `false` |

View File

@ -29,4 +29,12 @@
border-radius: 1.6em; border-radius: 1.6em;
} }
} }
&--medium {
font-size: 12px;
}
&--large {
font-size: 14px;
}
} }