diff --git a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue index 481c3633d9..8bf417af8c 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue @@ -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) } } diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index e5f2723768..1cfd38067a 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -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) { diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index a6c2234383..dcf3108462 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -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) } }