diff --git a/core/core-frontend/src/utils/changeComponentsSizeWithScale.ts b/core/core-frontend/src/utils/changeComponentsSizeWithScale.ts index c4e46212e3..f45e531f73 100644 --- a/core/core-frontend/src/utils/changeComponentsSizeWithScale.ts +++ b/core/core-frontend/src/utils/changeComponentsSizeWithScale.ts @@ -61,6 +61,7 @@ function changeComponentsSizeWithScaleCircle(componentDataCopy, scale) { changeComponentsSizeWithScaleCircle(tabItem.componentData, scale) }) } else { + changeComponentsSizeWithScaleCircle(componentInner.propValue, scale) groupItemStyleAdaptor(componentInner, parentStyle) } }) @@ -117,7 +118,7 @@ export function changeRefComponentsSizeWithScale(componentDataRef, canvasStyleDa canvasStyleDataRef.scale = scale } -export function changeRefComponentsSizeWithScalePoint( +export function changeRefComponentsSizeWithScalePointCircle( componentDataRef, canvasStyleDataRef, scaleWidth, @@ -126,7 +127,6 @@ export function changeRefComponentsSizeWithScalePoint( ) { componentDataRef.forEach(component => { Object.keys(component.style).forEach(key => { - if (key === 'fontSize' && component.style[key] === '') return if (needToChangeDirectionAttrs.width.includes(key)) { // 根据原来的比例获取样式原来的尺寸 // 再用原来的尺寸 * 现在的比例得出新的尺寸 @@ -143,7 +143,32 @@ export function changeRefComponentsSizeWithScalePoint( ) } }) + if (component.component === 'Group') { + changeRefComponentsSizeWithScalePointCircle( + component.propValue, + canvasStyleDataRef, + scaleWidth, + scaleHeight, + outScale + ) + } }) +} + +export function changeRefComponentsSizeWithScalePoint( + componentDataRef, + canvasStyleDataRef, + scaleWidth, + scaleHeight, + outScale +) { + changeRefComponentsSizeWithScalePointCircle( + componentDataRef, + canvasStyleDataRef, + scaleWidth, + scaleHeight, + outScale + ) canvasStyleDataRef.scale = scaleWidth canvasStyleDataRef.scaleWidth = scaleWidth canvasStyleDataRef.scaleHeight = scaleHeight