diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index e2353ecfbb..36ada2785b 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -131,7 +131,7 @@ import Icon from '@/components/icon-custom/src/Icon.vue' import ComponentEditBar from '@/components/visualization/ComponentEditBar.vue' import { useEmitt } from '@/hooks/web/useEmitt' import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue' -import { groupSizeStyleAdaptor, groupStyleRevert } from '@/utils/style' +import { groupSizeStyleAdaptor, groupStyleRevert, groupStyleRevertBatch } from '@/utils/style' import { isDashboard, isGroupCanvas, isMainCanvas, isTabCanvas } from '@/utils/canvasUtils' import Board from '@/components/de-board/Board.vue' import { activeWatermarkCheckUser, removeActiveWatermark } from '@/components/watermark/watermark' 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 2d2d49a701..7d78e97910 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -364,7 +364,7 @@ const componentMoveIn = component => { dvMainStore.deleteComponent(curIndex) dvMainStore.setCurComponent({ component: null, index: null }) component.canvasId = element.value.id + '--' + tabItem.name - dataVTabComponentAdd(component, element.value.style) + dataVTabComponentAdd(component, element.value) tabItem.componentData.push(component) } } diff --git a/core/core-frontend/src/utils/style.ts b/core/core-frontend/src/utils/style.ts index b9c11912aa..3ab87550b5 100644 --- a/core/core-frontend/src/utils/style.ts +++ b/core/core-frontend/src/utils/style.ts @@ -278,6 +278,16 @@ function groupItemStyleAdaptor(component, parentStyle) { component.style.height = parentStyle.height * styleScale.height } +export function groupStyleRevertBatch(groupComponent, parentStyle) { + if (groupComponent.component === 'DeTabs') { + groupComponent.propValue.forEach(tabItem => { + tabItem.componentData.forEach(tabComponent => { + groupStyleRevert(tabComponent, parentStyle) + }) + }) + } +} + export function groupStyleRevert(innerComponent, parentStyle) { const innerStyle = { ...innerComponent.style } innerComponent.groupStyle.left = innerStyle.left / parentStyle.width @@ -297,11 +307,11 @@ export function groupSizeStyleAdaptor(groupComponent) { } } -export function dataVTabComponentAdd(innerComponent, parentStyle) { +export function dataVTabComponentAdd(innerComponent, parentComponent) { //do dataVTabComponentAdd innerComponent.style.top = 0 innerComponent.style.left = 0 - const parentStyleAdaptor = { ...parentStyle } + const parentStyleAdaptor = { ...parentComponent.style } // 去掉tab头部高度 parentStyleAdaptor.height = parentStyleAdaptor.height - 48 groupStyleRevert(innerComponent, parentStyleAdaptor)