diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index 654772cc68..e5f2723768 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -65,6 +65,12 @@ 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/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts index 19d4611046..665f3bbb26 100644 --- a/core/core-frontend/src/utils/DeShortcutKey.ts +++ b/core/core-frontend/src/utils/DeShortcutKey.ts @@ -109,11 +109,11 @@ export function listenGlobalKeyDown() { } else if (keyCode === shiftKey) { isShiftDown = true composeStore.setIsShiftDownStatus(true) - releaseKeyCheck() + releaseKeyCheck('shift') } else if (keyCode === ctrlKey || keyCode === commandKey) { isCtrlOrCommandDown = true composeStore.setIsCtrlOrCmdDownStatus(true) - releaseKeyCheck() + releaseKeyCheck('ctrl') } else if ((keyCode == deleteKey || keyCode == macDeleteKey) && curComponent.value) { deleteComponent() } else if (isCtrlOrCommandDown) { @@ -125,6 +125,7 @@ export function listenGlobalKeyDown() { lockMap[keyCode]() } } + console.log('1111=isCtrlOrCommandDown' + isCtrlOrCommandDown + ';isShiftDown=' + isShiftDown) } window.onkeyup = e => { @@ -150,11 +151,12 @@ export function releaseAttachKey() { } //当前不支持同时ctrl + shift操作 -function releaseKeyCheck() { - if (isCtrlOrCommandDown && isShiftDown) { +function releaseKeyCheck(keyType) { + if (keyType === 'shift' && isCtrlOrCommandDown) { isCtrlOrCommandDown = false composeStore.setIsCtrlOrCmdDownStatus(false) - isShiftDown = true + } else if (keyType === 'ctrl' && isShiftDown) { + isShiftDown = false composeStore.setIsShiftDownStatus(false) } }