public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 21:42:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 解决跨组合快捷键操作问题

Browse Source
This commit is contained in:
wangjiahao
2023-12-27 18:47:13 +08:00
parent c61b7fcf6e
commit 0711ea8bc2
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/data-visualization/RealTimeGroup.vue
View File

@@ -37,7 +37,7 @@ const transformIndex = index => {
return componentData.value.length - 1 - index
}
const areaDataPush = component => {
if (component && !component.isLock && component.isShow) {
if (component && !component.isLock && component.isShow && component.canvasId === 'canvas-main') {
areaData.value.components.push(component)
}
}

8
core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
View File

@@ -30,7 +30,7 @@ const transformIndex = index => {
return componentData.value.length - 1 - index
}
const areaDataPush = component => {
if (component && !component.isLock && component.isShow) {
if (component && !component.isLock && component.isShow && component.canvasId === 'canvas-main') {
areaData.value.components.push(component)
}
}
@@ -65,12 +65,6 @@ const onClick = (e, index) => {
composeStore.setLaterIndex(null)
}
// ctrl or command 按下时 鼠标点击为选择需要组合的组件(取消需要组合的组件在ComposeShow组件中)
console.log(
'isCtrlOrCmdDown=' +
isCtrlOrCmdDown.value +
';all=' +
!!(isCtrlOrCmdDown.value && !areaData.value.components.includes(componentData.value[index]))
)
if (isCtrlOrCmdDown.value && !areaData.value.components.includes(componentData.value[index])) {
areaDataPush(componentData.value[index])
if (curComponent.value && curComponent.value.id !== componentData.value[index].id) {

2
core/core-frontend/src/components/data-visualization/canvas/Shape.vue
View File

@@ -366,7 +366,7 @@ const handleBoardMouseDownOnShape = e => {
}
const areaDataPush = component => {
if (component && !component.isLock && component.isShow) {
if (component && !component.isLock && component.isShow && component.canvasId === 'canvas-main') {
areaData.value.components.push(component)
}
}