From f3f3d6f9386c0f2532ded39a7629391e19a09e20 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 7 Jan 2025 17:49:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D=E5=88=B6=20Tab=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=BB=84=E4=BB=B6=E6=97=B6=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E5=8F=A0=E5=8A=A0=EF=BC=8C=E6=97=A0=E6=B3=95=E6=8B=96=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20#14550?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/CanvasCore.vue | 2 +- .../custom-component/de-tabs/Component.vue | 1 + .../src/views/canvas/DeCanvas.vue | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index 7d335aa210..9cccfad3e8 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -737,7 +737,7 @@ function addItemToPositionBox(item) { pb[j][i].el = item } } catch (e) { - console.warn(e) + console.warn('addItemToPositionBox-warn:', e) } } } diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue index c84dd38a4a..90ae30000c 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -76,6 +76,7 @@ :canvas-view-info="canvasViewInfo" :canvas-id="element.id + '--' + tabItem.name" :class="moveActive ? 'canvas-move-in' : ''" + :canvas-position="'tab'" :canvas-active="editableTabsValue === tabItem.name" :font-family="fontFamily" > diff --git a/core/core-frontend/src/views/canvas/DeCanvas.vue b/core/core-frontend/src/views/canvas/DeCanvas.vue index 1be5155bd9..e23dca735b 100644 --- a/core/core-frontend/src/views/canvas/DeCanvas.vue +++ b/core/core-frontend/src/views/canvas/DeCanvas.vue @@ -45,10 +45,23 @@ const props = defineProps({ type: String, required: false, default: 'inherit' + }, + // 画布位置 + canvasPosition: { + type: String, + required: false, + default: 'main' } }) -const { canvasStyleData, componentData, canvasViewInfo, canvasId, canvasActive, outerScale } = - toRefs(props) +const { + canvasStyleData, + componentData, + canvasViewInfo, + canvasId, + canvasActive, + outerScale, + canvasPosition +} = toRefs(props) const domId = ref('de-canvas-' + canvasId.value) // change-end @@ -147,7 +160,7 @@ const canvasInitImmediately = () => { } const canvasInit = (isFistLoad = true) => { - if (canvasActive.value) { + if (canvasActive.value || canvasPosition.value === 'tab') { renderState.value = true setTimeout(function () { if (canvasOut.value) {