forked from github/dataease
Merge branch 'dev-v2' into pr@dev-v2@fix_report_view_excel
This commit is contained in:
commit
bf27f533a6
@ -11,7 +11,7 @@ const composeStore = composeStoreWithOut()
|
|||||||
const snapshotStore = snapshotStoreWithOut()
|
const snapshotStore = snapshotStoreWithOut()
|
||||||
const copyStore = copyStoreWithOut()
|
const copyStore = copyStoreWithOut()
|
||||||
const lockStore = lockStoreWithOut()
|
const lockStore = lockStoreWithOut()
|
||||||
const { curComponent, isInEditor } = storeToRefs(dvMainStore)
|
const { curComponent, isInEditor, editMode } = storeToRefs(dvMainStore)
|
||||||
const { areaData } = storeToRefs(composeStore)
|
const { areaData } = storeToRefs(composeStore)
|
||||||
|
|
||||||
const ctrlKey = 17,
|
const ctrlKey = 17,
|
||||||
@ -101,7 +101,7 @@ let isShiftDown = false
|
|||||||
// 全局监听按键操作并执行相应命令
|
// 全局监听按键操作并执行相应命令
|
||||||
export function listenGlobalKeyDown() {
|
export function listenGlobalKeyDown() {
|
||||||
window.onkeydown = e => {
|
window.onkeydown = e => {
|
||||||
if (!isInEditor || checkDialog()) return
|
if (!isInEditor.value || editMode.value === 'preview' || checkDialog()) return
|
||||||
const { keyCode } = e
|
const { keyCode } = e
|
||||||
if (positionMoveKey[keyCode] && curComponent.value) {
|
if (positionMoveKey[keyCode] && curComponent.value) {
|
||||||
positionMoveKey[keyCode](keyCode)
|
positionMoveKey[keyCode](keyCode)
|
||||||
|
Loading…
Reference in New Issue
Block a user