Merge branch 'dev' into next

2020-10-22 16:10:38 +08:00
parent c7a2a538e1 abbf448a43
commit b5cd336bb8
29 changed files with 276 additions and 80 deletions
@@ -71,6 +71,7 @@ Use the image prop to display different placeholder images.
 | Attribute | Description | Type | Default |
 | --- | --- | --- | --- |
 | image | Image type，can be set to `error` `network` `search` or image URL | _string_ | `default` |
+| image-size `v2.10.11` | Image size | _number \| string_ | - |
 | description | Desciption | _string_ | - |

 ### Slots