From 45d1f9967fd50e8609d770f3344a1a364e989000 Mon Sep 17 00:00:00 2001 From: yy-wow Date: Fri, 27 Dec 2024 01:02:35 -0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=BF=AB=E6=8D=B7=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E5=9B=BE=E6=A0=87=E9=85=8D=E7=BD=AE=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/container/src/components/CanvasAction.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/canvas/container/src/components/CanvasAction.vue b/packages/canvas/container/src/components/CanvasAction.vue index da3b3809df..c90a149121 100644 --- a/packages/canvas/container/src/components/CanvasAction.vue +++ b/packages/canvas/container/src/components/CanvasAction.vue @@ -261,12 +261,14 @@ export default { let name = JSON.stringify(parent.className) - if (name && name.indexOf('short-cut-set') === -1 && name.indexOf('tiny-dialog-box') === -1) { - flag = findParentHasClass(parent) - } else { - flag = true + const preventClassNameList = ['short-cut-set', 'tiny-dialog-box', 'icon-popover', 'i18n-input-popover'] + + if (preventClassNameList.some((item) => name?.includes(item))) { + return true } + flag = findParentHasClass(parent) + return flag } From 34f4a6bcdca6b78e7640c028492760e6981e66c6 Mon Sep 17 00:00:00 2001 From: yy-wow Date: Mon, 13 Jan 2025 01:29:06 -0800 Subject: [PATCH 2/2] fix: review --- packages/canvas/container/src/components/CanvasAction.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/canvas/container/src/components/CanvasAction.vue b/packages/canvas/container/src/components/CanvasAction.vue index c90a149121..651e347939 100644 --- a/packages/canvas/container/src/components/CanvasAction.vue +++ b/packages/canvas/container/src/components/CanvasAction.vue @@ -253,7 +253,6 @@ export default { const findParentHasClass = (target) => { let parent = target.parentNode - let flag = false if (parent.className === undefined) { return false @@ -267,9 +266,7 @@ export default { return true } - flag = findParentHasClass(parent) - - return flag + return findParentHasClass(parent) } const onMousedown = (event, horizontal, vertical) => {