center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4204 from dataease/pr@dev@fix_shortkey-change

Browse Source 
refactor(仪表板): 调整仪表板快捷键事件
This commit is contained in:
王嘉豪 2022-12-26 19:50:47 +08:00 committed by GitHub
commit 8e69ab477b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/canvas/utils/shortcutKey.js
View File

@ -53,12 +53,14 @@ export function listenGlobalKeyDown() {
window.onkeydown = (e) => { window.onkeydown = (e) => {
if (!store.state.isInEditor) return if (!store.state.isInEditor) return
const { keyCode } = e const { keyCode } = e
if (keyCode === ctrlKey || keyCode === commandKey) {
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
if (keyCode === ctrlKey || keyCode === commandKey) {
isCtrlOrCommandDown = true isCtrlOrCommandDown = true
} else if (isCtrlOrCommandDown) { } else if (isCtrlOrCommandDown) {
if (keyCode === zKey || keyCode === yKey || keyCode === dKey || keyCode === sKey || keyCode === enlargeKey) { if (keyCode === zKey || keyCode === yKey || keyCode === dKey || keyCode === sKey || keyCode === enlargeKey) {
e.preventDefault()
e.stopPropagation()
unlockMap[keyCode]() unlockMap[keyCode]()
} }
} }
@ -74,13 +76,14 @@ export function listenGlobalKeyDown() {
export function listenGlobalKeyDownPreview() { export function listenGlobalKeyDownPreview() {
window.onkeydown = (e) => { window.onkeydown = (e) => {
const { keyCode } = e const { keyCode } = e
if (keyCode === ctrlKey || keyCode === commandKey) {
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
if (keyCode === ctrlKey || keyCode === commandKey) {
isCtrlOrCommandDown = true isCtrlOrCommandDown = true
} else if (isCtrlOrCommandDown) { } else if (isCtrlOrCommandDown) {
if (keyCode === enlargeKey) { if (keyCode === enlargeKey) {
e.preventDefault() e.preventDefault()
e.stopPropagation()
unlockMap[keyCode]() unlockMap[keyCode]()
} }
} }