Skip to content

fix: shortcut operation attribute configuration internationalization and icon configuration closed abnormally #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hexqi merged 2 commits into from
Jan 13, 2025
Merged

fix: shortcut operation attribute configuration internationalization and icon configuration closed abnormally #970

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d1f99
fix: 快捷操作属性配置国际化和图标配置异常关闭
yy-wow Dec 27, 2024
34f4a6b
fix: review
yy-wow Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions packages/canvas/container/src/components/CanvasAction.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,21 +253,20 @@ export default {

const findParentHasClass = (target) => {
let parent = target.parentNode
let flag = false

if (parent.className === undefined) {
return false
}

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
}

return flag
return findParentHasClass(parent)
}

const onMousedown = (event, horizontal, vertical) => {
Expand Down
Loading