diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue index 09e0ddf47a..87e356f11c 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -314,11 +314,20 @@ const eventEnable = computed( ['indicator', 'rich-text'].includes(config.value.innerType)) && config.value.events && config.value.events.checked && - (isDashboard() || (!isDashboard() && !isMobile())) + (isDashboard() || (!isDashboard() && !isMobile())) && + showPosition.value !== 'canvas-multiplexing' ) +const onWrapperClickCur = e => { + // 指标卡为内部触发 + if (['indicator'].includes(config.value.innerType)) { + return + } + onWrapperClick(e) +} + const onWrapperClick = e => { - if (eventEnable.value && showPosition.value !== 'canvas-multiplexing') { + if (eventEnable.value) { if (config.value.events.type === 'showHidden') { // 打开弹框区域 nextTick(() => { @@ -349,8 +358,8 @@ const onWrapperClick = e => { } else if (config.value.events.type === 'download') { useEmitt().emitter.emit('canvasDownload') } - e.preventDefault() - e.stopPropagation() + e?.preventDefault() + e?.stopPropagation() } } @@ -374,6 +383,13 @@ const freezeFlag = computed(() => { scrollMain.value - config.value.style?.top > 0 ) }) + +const commonParams = computed(() => { + return { + eventEnable: eventEnable.value, + eventType: config.value.events.type + } +})