Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-21 18:47:31 +08:00
59 changed files with 277 additions and 264 deletions
+9 -9
View File
@@ -122,7 +122,7 @@ export default {
| lock-scroll | Whether to lock background scroll | _boolean_ | `true` |
| lazy-render | Whether to lazy render util appeared | _boolean_ | `true` |
| close-on-popstate | Whether to close when popstate | _boolean_ | `false` |
| close-on-click-overlay | Whether to close when click overlay | _boolean_ | `true` |
| close-on-click-overlay | Whether to close when overlay is clicked | _boolean_ | `true` |
| closeable | Whether to show close icon | _boolean_ | `false` |
| close-icon | Close icon name | _string_ | `cross` |
| close-icon-position | Close Icon Positioncan be set to `top-left` `bottom-left` `bottom-right` | _string_ | `top-right` |
@@ -133,11 +133,11 @@ export default {
### Events
| Event | Description | Arguments |
| ------------- | ---------------------------- | -------------- |
| click | Triggered when click Popup | _event: Event_ |
| open | Triggered when open Popup | - |
| close | Triggered when close Popup | - |
| opened | Triggered when opened Popup | - |
| closed | Triggered when closed Popup | - |
| click-overlay | Triggered when click overlay | - |
| Event | Description | Arguments |
| ------------- | ------------------------------- | -------------- |
| click | Emitted when Popup is clicked | _event: Event_ |
| open | Emitted when opening Popup | - |
| close | Emitted when closing Popup | - |
| opened | Emitted when Popup is opened | - |
| closed | Emitted when Popup is closed | - |
| click-overlay | Emitted when overlay is clicked | - |
+1 -1
View File
@@ -63,7 +63,7 @@ export const popupSharedProps = {
type: Boolean,
default: true,
},
// whether to close popup when click overlay
// whether to close popup when overlay is clicked
closeOnClickOverlay: {
type: Boolean,
default: true,