From 0897d4614319e3f84d84ea960932c8ebc5a2dbb7 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 9 Feb 2021 16:45:42 +0800 Subject: [PATCH] feat(Popup): click-overlay add event param (#8107) --- src/action-sheet/README.md | 2 +- src/action-sheet/README.zh-CN.md | 2 +- src/popover/README.md | 2 +- src/popover/README.zh-CN.md | 2 +- src/popup/README.md | 2 +- src/popup/README.zh-CN.md | 2 +- src/popup/index.js | 5 +++-- src/share-sheet/README.md | 2 +- src/share-sheet/README.zh-CN.md | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/action-sheet/README.md b/src/action-sheet/README.md index 4c7110f8e..b6b3968db 100644 --- a/src/action-sheet/README.md +++ b/src/action-sheet/README.md @@ -205,7 +205,7 @@ export default { | close | Emitted when closing ActionSheet | - | | opened | Emitted when ActionSheet is opened | - | | closed | Emitted when ActionSheet is closed | - | -| click-overlay | Emitted when overlay is clicked | - | +| click-overlay | Emitted when overlay is clicked | _event: MouseEvent_ | ### Slots diff --git a/src/action-sheet/README.zh-CN.md b/src/action-sheet/README.zh-CN.md index 4c5fb5b59..f85c97dec 100644 --- a/src/action-sheet/README.zh-CN.md +++ b/src/action-sheet/README.zh-CN.md @@ -221,7 +221,7 @@ export default { | close | 关闭面板时触发 | - | | opened | 打开面板且动画结束后触发 | - | | closed | 关闭面板且动画结束后触发 | - | -| click-overlay | 点击遮罩层时触发 | - | +| click-overlay | 点击遮罩层时触发 | _event: MouseEvent_ | ### Slots diff --git a/src/popover/README.md b/src/popover/README.md index 6209630fc..03b7a432d 100644 --- a/src/popover/README.md +++ b/src/popover/README.md @@ -234,7 +234,7 @@ export default { | close | Emitted when closing Popover | - | | opened | Emitted when Popover is opened | - | | closed | Emitted when Popover is closed | - | -| click-overlay | Emitted when overlay is clicked | - | +| click-overlay | Emitted when overlay is clicked | _event: MouseEvent_ | ### Slots diff --git a/src/popover/README.zh-CN.md b/src/popover/README.zh-CN.md index 8d791ddfb..08a2fb8aa 100644 --- a/src/popover/README.zh-CN.md +++ b/src/popover/README.zh-CN.md @@ -250,7 +250,7 @@ export default { | close | 关闭菜单时触发 | - | | opened | 打开菜单且动画结束后触发 | - | | closed | 关闭菜单且动画结束后触发 | - | -| click-overlay | 点击遮罩层时触发 | - | +| click-overlay | 点击遮罩层时触发 | _event: MouseEvent_ | ### Slots diff --git a/src/popup/README.md b/src/popup/README.md index 35ec0f121..7cc4b99b9 100644 --- a/src/popup/README.md +++ b/src/popup/README.md @@ -140,7 +140,7 @@ export default { | Event | Description | Arguments | | ---------------- | ---------------------------------- | ------------------- | | click | Emitted when Popup is clicked | _event: MouseEvent_ | -| click-overlay | Emitted when overlay is clicked | - | +| click-overlay | Emitted when overlay is clicked | _event: MouseEvent_ | | click-close-icon | Emitted when close icon is clicked | _event: MouseEvent_ | | open | Emitted when opening Popup | - | | close | Emitted when closing Popup | - | diff --git a/src/popup/README.zh-CN.md b/src/popup/README.zh-CN.md index a84710026..34e9c20a3 100644 --- a/src/popup/README.zh-CN.md +++ b/src/popup/README.zh-CN.md @@ -150,7 +150,7 @@ export default { | 事件名 | 说明 | 回调参数 | | ---------------- | -------------------------- | ------------------- | | click | 点击弹出层时触发 | _event: MouseEvent_ | -| click-overlay | 点击遮罩层时触发 | - | +| click-overlay | 点击遮罩层时触发 | _event: MouseEvent_ | | click-close-icon | 点击关闭图标时触发 | _event: MouseEvent_ | | open | 打开弹出层时触发 | - | | close | 关闭弹出层时触发 | - | diff --git a/src/popup/index.js b/src/popup/index.js index 502690441..13252d049 100644 --- a/src/popup/index.js +++ b/src/popup/index.js @@ -155,8 +155,9 @@ export default createComponent({ } }; - const onClickOverlay = () => { - emit('click-overlay'); + const onClickOverlay = (event) => { + emit('click-overlay', event); + if (props.closeOnClickOverlay) { close(); } diff --git a/src/share-sheet/README.md b/src/share-sheet/README.md index 7a65e0a53..c9469eae0 100644 --- a/src/share-sheet/README.md +++ b/src/share-sheet/README.md @@ -191,7 +191,7 @@ export default { | --- | --- | --- | | select | Emitted when an option is clicked | _option: Option, index: number_ | | cancel | Emitted when the cancel button is clicked | - | -| click-overlay | Emitted when overlay is clicked | - | +| click-overlay | Emitted when overlay is clicked | _event: MouseEvent_ | ### Slots diff --git a/src/share-sheet/README.zh-CN.md b/src/share-sheet/README.zh-CN.md index e5ffa7470..f1a1fc86c 100644 --- a/src/share-sheet/README.zh-CN.md +++ b/src/share-sheet/README.zh-CN.md @@ -209,7 +209,7 @@ export default { | ------------- | ------------------ | ------------------------------- | | select | 点击分享选项时触发 | _option: Option, index: number_ | | cancel | 点击取消按钮时触发 | - | -| click-overlay | 点击遮罩层时触发 | - | +| click-overlay | 点击遮罩层时触发 | _event: MouseEvent_ | ### Slots