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
+3 -3
View File
@@ -98,8 +98,8 @@ app.use(GridItem);
| Attribute | Description | Type | Default |
| --- | --- | --- | --- |
| column-num `v2.0.4` | Column Num | _number \| string_ | `4` |
| icon-size `v2.2.6` | Icon size | _number \| string_ | `28px` |
| column-num | Column Num | _number \| string_ | `4` |
| icon-size | Icon size | _number \| string_ | `28px` |
| gutter | Gutter | _number \| string_ | `0` |
| border | Whether to show border | _boolean_ | `true` |
| center | Whether to center content | _boolean_ | `true` |
@@ -114,7 +114,7 @@ app.use(GridItem);
| text | Text | _string_ | - |
| icon | Icon name or URL | _string_ | - |
| icon-prefix `v2.5.3` | Icon className prefix | _string_ | `van-icon` |
| dot `v2.2.1` | Whether to show red dot | _boolean_ | `false` |
| dot | Whether to show red dot | _boolean_ | `false` |
| badge `v2.5.6` | Content of the badge | _number \| string_ | - |
| url | Link URL | _string_ | - |
| to | Target route of the link, same as to of vue-router | _string \| object_ | - |