From ebc0add96a1f408e211aedc56c273d48b73cdc36 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 29 Nov 2024 12:30:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B1=8F=E8=94=BD=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E9=80=89=E6=8B=A9=E6=97=B6=E6=97=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/data-visualization/canvas/ComponentWrapper.vue | 2 +- core/core-frontend/src/views/common/DeResourceGroupOpt.vue | 2 +- .../src/views/data-visualization/MultiplexPreviewShow.vue | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) 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 aef95bbb7d..84c3318d04 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -316,7 +316,7 @@ const eventEnable = computed( ) const onWrapperClick = e => { - if (eventEnable.value) { + if (eventEnable.value && showPosition.value !== 'canvas-multiplexing') { if (config.value.events.type === 'showHidden') { // 打开弹框区域 nextTick(() => { diff --git a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue index fbfaa8866d..14a96b9bb7 100644 --- a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue +++ b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue @@ -141,7 +141,7 @@ const optInit = (type, data: BusiTreeNode, exec, parentSelect = false) => { const placeholderLabel = data.leaf || type === 'leaf' ? props.curCanvasType === 'dataV' - ? t('work_branch.screen') + ? t('work_branch.big_data_screen') : t('work_branch.dashboard') : t('visualization.folder') placeholder.value = t('visualization.input_name_tips', [placeholderLabel]) diff --git a/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue b/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue index 18a1ddf241..d328317080 100644 --- a/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue +++ b/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue @@ -216,6 +216,7 @@ onBeforeMount(() => { :config="state.multiplexInfo" :canvas-style-data="canvasStyleData" :dv-info="dvInfo" + :show-position="'canvas-multiplexing'" :canvas-view-info="canvasViewInfo" />