+
{{ getComponent(index)?.name }}
{
+ useEmitt().emitter.emit('renderChart-' + curComponent.value.id)
+ }, 400)
+ }
}
}
}
diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts
index 2417cc911e..3f264b426b 100644
--- a/core/core-frontend/src/utils/DeShortcutKey.ts
+++ b/core/core-frontend/src/utils/DeShortcutKey.ts
@@ -97,19 +97,24 @@ const checkDialog = () => {
}
let isCtrlOrCommandDown = false
+let isShiftDown = false
// 全局监听按键操作并执行相应命令
export function listenGlobalKeyDown() {
window.onkeydown = e => {
+ console.log('e.keyCode-down=' + e.keyCode)
if (!isInEditor || checkDialog()) return
const { keyCode } = e
if (positionMoveKey[keyCode] && curComponent.value) {
positionMoveKey[keyCode](keyCode)
e.preventDefault()
} else if (keyCode === shiftKey) {
+ isShiftDown = true
composeStore.setIsShiftDownStatus(true)
+ releaseKeyCheck()
} else if (keyCode === ctrlKey || keyCode === commandKey) {
isCtrlOrCommandDown = true
composeStore.setIsCtrlOrCmdDownStatus(true)
+ releaseKeyCheck()
} else if ((keyCode == deleteKey || keyCode == macDeleteKey) && curComponent.value) {
deleteComponent()
} else if (isCtrlOrCommandDown) {
@@ -124,10 +129,12 @@ export function listenGlobalKeyDown() {
}
window.onkeyup = e => {
+ console.log('e.keyCode=' + e.keyCode)
if (e.keyCode === ctrlKey || e.keyCode === commandKey) {
isCtrlOrCommandDown = false
composeStore.setIsCtrlOrCmdDownStatus(false)
} else if (e.keyCode === shiftKey) {
+ isShiftDown = true
composeStore.setIsShiftDownStatus(false)
}
}
@@ -137,6 +144,16 @@ export function listenGlobalKeyDown() {
}
}
+//当前不支持同时ctrl + shift操作
+function releaseKeyCheck() {
+ if (isCtrlOrCommandDown && isShiftDown) {
+ isCtrlOrCommandDown = false
+ composeStore.setIsCtrlOrCmdDownStatus(false)
+ isShiftDown = true
+ composeStore.setIsShiftDownStatus(false)
+ }
+}
+
function copy() {
copyStore.copy()
}
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 0c29075911..7a46020a24 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -453,8 +453,9 @@ onMounted(() => {
return
}
initTitle()
+ const viewInfo = val ? val : view.value
nextTick(() => {
- chartComponent?.value?.renderChart(val)
+ chartComponent?.value?.renderChart(viewInfo)
})
}
})