Merge branch '2.x' into dev

2020-11-14 14:36:14 +08:00
parent cfb16668ca 95227fff94
commit a1aed76a48
8 changed files with 21 additions and 13 deletions
@@ -127,6 +127,7 @@ export default {
 | close-icon | Close icon name | _string_ | `cross` |
 | close-icon-position | Close Icon Position，can be set to `top-left` `bottom-left` `bottom-right` | _string_ | `top-right` |
 | transition | Transition, equivalent to `name` prop of [transtion](https://v3.vuejs.org/api/built-in-components.html#transition) | _string_ | - |
+| transition-appear `v2.10.14` | Whether to apply transition on initial render | _boolean_ | `false` |
 | teleport | Return the mount node for Popup | _string \| Element_ | - |
 | safe-area-inset-bottom `v2.2.1` | Whether to enable bottom safe area adaptation | _boolean_ | `false` |