浏览代码

upd(overlay): 优化组件closeOnClickOverlay属性功能

suzigang 3 年之前
父节点
当前提交
4bddff9850

+ 2 - 2
src/packages/__VUE/overlay/doc.en-US.md

@@ -246,13 +246,13 @@ Set `close on click override` to control whether the click mask is closed. If it
 | overlay-class          | Custom mask class name   | string         | -      |
 | overlay-class          | Custom mask class name   | string         | -      |
 | overlay-style          | Custom Mask Style   | CSSProperties  | -      |
 | overlay-style          | Custom Mask Style   | CSSProperties  | -      |
 | lock-scroll            | Whether the background is locked when the mask is displayed     | boolean        | `false`  |
 | lock-scroll            | Whether the background is locked when the mask is displayed     | boolean        | `false`  |
-| close-on-click-overlay | Whether to close the mask when clicking. If you set `false`, the `click` event will become invalid | boolean        | `true`   |
+| close-on-click-overlay | Whether to close the mask when clicking. | boolean        | `true`   |
 
 
 ### Events
 ### Events
 
 
 | Event | Description                  | Arguments   |
 | Event | Description                  | Arguments   |
 | ------ | ---------- | ------------ |
 | ------ | ---------- | ------------ |
-| click  | Triggered when clicked. It only takes effect when  `close-on-click-overlay` is `true`   | event: MouseEvent |
+| click  | Triggered when clicked.   | event: MouseEvent |
 
 
 ### Slots
 ### Slots
 
 

+ 2 - 2
src/packages/__VUE/overlay/doc.md

@@ -244,13 +244,13 @@ app.use(OverLay);
 | overlay-class          | 自定义遮罩类名   | string         | -      |
 | overlay-class          | 自定义遮罩类名   | string         | -      |
 | overlay-style          | 自定义遮罩样式   | CSSProperties  | -      |
 | overlay-style          | 自定义遮罩样式   | CSSProperties  | -      |
 | lock-scroll            | 遮罩显示时的背景是否锁定     | boolean        | `false`  |
 | lock-scroll            | 遮罩显示时的背景是否锁定     | boolean        | `false`  |
-| close-on-click-overlay | 点击遮罩时是否关闭,如果设置 `false`,那么 `click`事件将失效 | boolean        | `true`   |
+| close-on-click-overlay | 点击遮罩时是否关闭 | boolean        | `true`   |
 
 
 ### Events
 ### Events
 
 
 | 事件名 | 说明       | 回调参数     |
 | 事件名 | 说明       | 回调参数     |
 | ------ | ---------- | ------------ |
 | ------ | ---------- | ------------ |
-| click  | 点击时触发,仅当 `close-on-click-overlay` 为 `true` 时生效   | event: MouseEvent |
+| click  | 点击时触发   | event: MouseEvent |
 
 
 ### Slots
 ### Slots
 
 

+ 1 - 1
src/packages/__VUE/overlay/index.taro.vue

@@ -59,9 +59,9 @@ export default create({
     });
     });
 
 
     const onClick = (e: MouseEvent) => {
     const onClick = (e: MouseEvent) => {
+      emit('click', e);
       if (props.closeOnClickOverlay) {
       if (props.closeOnClickOverlay) {
         emit('update:visible', false);
         emit('update:visible', false);
-        emit('click', e);
       }
       }
     };
     };
 
 

+ 1 - 1
src/packages/__VUE/overlay/index.vue

@@ -68,9 +68,9 @@ export default create({
     });
     });
 
 
     const onClick = (e: MouseEvent) => {
     const onClick = (e: MouseEvent) => {
+      emit('click', e);
       if (props.closeOnClickOverlay) {
       if (props.closeOnClickOverlay) {
         emit('update:visible', false);
         emit('update:visible', false);
-        emit('click', e);
       }
       }
     };
     };
 
 

+ 1 - 1
src/packages/__VUE/popup/common.ts

@@ -78,8 +78,8 @@ export const component = (componentName: string) => {
       };
       };
 
 
       const onClickOverlay = (e: Event) => {
       const onClickOverlay = (e: Event) => {
+        emit('click-overlay', e);
         if (props.closeOnClickOverlay) {
         if (props.closeOnClickOverlay) {
-          emit('click-overlay', e);
           emit('update:visible', false);
           emit('update:visible', false);
           // close();
           // close();
         }
         }