Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-05 07:17:49 +08:00
82 changed files with 264 additions and 228 deletions
+1 -1
View File
@@ -92,7 +92,7 @@ export default {
| round | Whether to be round style | _boolean_ | `false` |
| mark | Whether to be mark style | _boolean_ | `false` |
| text-color | Text color | _string_ | `white` |
| closeable `v2.2.9` | Whether to be closeable | _boolean_ | `false` |
| closeable | Whether to be closeable | _boolean_ | `false` |
### Slots
+1 -1
View File
@@ -106,7 +106,7 @@ export default {
| round | 是否为圆角样式 | _boolean_ | `false` |
| mark | 是否为标记样式 | _boolean_ | `false` |
| text-color | 文本颜色,优先级高于`color`属性 | _string_ | `white` |
| closeable `v2.2.9` | 是否为可关闭标签 | _boolean_ | `false` |
| closeable | 是否为可关闭标签 | _boolean_ | `false` |
### Slots