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
+4 -4
View File
@@ -64,7 +64,7 @@ export default {
| z-index | z-index | _number \| string_ | `1` |
| duration | Animation duration | _number \| string_ | `0.3` |
| class-name | ClassName | _string_ | - |
| custom-class `v2.2.5` | Custom style | _object_ | - |
| custom-class | Custom style | _object_ | - |
| lock-scroll `v2.6.2` | Whether to lock background scroll | _boolean_ | `true` |
### Events
@@ -75,6 +75,6 @@ export default {
### Slots
| Name | Description |
| ---------------- | ------------ |
| default `v2.2.5` | Default slot |
| Name | Description |
| ------- | ------------ |
| default | Default slot |
+4 -4
View File
@@ -70,7 +70,7 @@ export default {
| z-index | z-index 层级 | _number \| string_ | `1` |
| duration | 动画时长,单位秒 | _number \| string_ | `0.3` |
| class-name | 自定义类名 | _string_ | - |
| custom-style `v2.2.5` | 自定义样式 | _object_ | - |
| custom-style | 自定义样式 | _object_ | - |
| lock-scroll `v2.6.2` | 是否锁定背景滚动,锁定时蒙层里的内容也将无法滚动 | _boolean_ | `true` |
### Events
@@ -81,6 +81,6 @@ export default {
### Slots
| 名称 | 说明 |
| ---------------- | ---------------------------------- |
| default `v2.0.5` | 默认插槽,用于在遮罩层上方嵌入内容 |
| 名称 | 说明 |
| ------- | ---------------------------------- |
| default | 默认插槽,用于在遮罩层上方嵌入内容 |