fix(Popup): 修复弹出层禁用遮罩层点击无效问题

D-xuanmo · Sep 1, 2024 · 2a37b59 · 2a37b59
1 parent d61ae6a
commit 2a37b59
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/docs/src/pages/components/common/overlay.md b/docs/src/pages/components/common/overlay.md
@@ -46,7 +46,7 @@ const visible2 = ref(false)
 |overlay-class|`string`|-|背景过渡时间|N|
 |overlay-style|`CSSProperties`|-|自定义 CSS|N|
 |teleport|`TeleportProps['to']`|`body`|选择要插入的 DOM 节点，同`Teleport`组件，[参考链接](https://staging-cn.vuejs.org/guide/built-ins/teleport.html#basic-usage)|N|
-|close-on-click-overlay|`boolean`|`true`|点击遮罩层是否关闭弹出层|N|
+|close-on-overlay-click|`boolean`|`true`|点击遮罩层是否关闭弹出层|N|
 
 ### Events
 

diff --git a/packages/dl-common/src/overlay/overlay.vue b/packages/dl-common/src/overlay/overlay.vue
@@ -31,6 +31,7 @@ const [name, bem] = createNamespace('overlay')
 
 export default defineComponent({
   name,
+  inheritAttrs: false,
   props: OVERLAY_PROPS,
   emits: ['update:visible', 'click'],
   setup(props, { emit }) {
@@ -64,7 +65,7 @@ export default defineComponent({
     }
 
     function handleClose() {
-      if (props.closeOnClickOverlay) {
+      if (props.closeOnOverlayClick) {
         setVisible((innerVisible.value = !innerVisible.value))
         emit('click')
       }

diff --git a/packages/dl-common/src/overlay/props.ts b/packages/dl-common/src/overlay/props.ts
@@ -27,7 +27,7 @@ export const OVERLAY_PROPS = {
     type: Object as PropType<CSSProperties>,
     default: undefined
   },
-  closeOnClickOverlay: {
+  closeOnOverlayClick: {
     type: Boolean,
     default: true
   },

diff --git a/packages/dl-common/src/popup/popup.vue b/packages/dl-common/src/popup/popup.vue
@@ -9,6 +9,7 @@
       :overlay-style="overlayStyle"
       :lazy-render="lazyRender"
       :lock-scroll="lockScroll"
+      :close-on-overlay-click="closeOnOverlayClick"
       @click="handleClose"
     />
     <transition
@@ -63,6 +64,7 @@ const [name, bem] = createNamespace('popup')
 export default defineComponent({
   name,
   components: { DOverlay, CloseOutlined },
+  inheritAttrs: false,
   props: POPUP_PROPS,
   emits: ['update:visible', 'open', 'opened', 'close', 'closed', 'click-overlay-icon'],
   setup(props, { emit, slots }) {