From 333ff7085d107bcef19d05bac2deb15b4973a1dc Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 3 Sep 2024 13:14:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=A4=A7=E5=B1=8F=E5=B9=B6=E5=88=9B=E5=BB=BA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=E6=94=B9=E5=8F=98=E5=A4=A7=E5=B1=8F=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=AF=BC=E8=87=B4=E7=BB=84=E4=BB=B6=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/canvasUtils.ts | 2 ++ .../views/chart/components/editor/util/dataVisualization.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 37a45f8464..d1ae0edef8 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -653,6 +653,8 @@ export async function decompressionPre(params, callBack) { //历史字段适配 sourceCanvasStyle.component['seniorStyleSetting'] = sourceCanvasStyle.component['seniorStyleSetting'] || deepCopy(SENIOR_STYLE_SETTING_LIGHT) + sourceCanvasStyle['scaleWidth'] = sourceCanvasStyle['scale'] + sourceCanvasStyle['scaleHeight'] = sourceCanvasStyle['scaleHeight'] deTemplateData = { canvasStyleData: sourceCanvasStyle, componentData: sourceComponentData, diff --git a/core/core-frontend/src/views/chart/components/editor/util/dataVisualization.ts b/core/core-frontend/src/views/chart/components/editor/util/dataVisualization.ts index 09c831b9e4..eb52936c10 100644 --- a/core/core-frontend/src/views/chart/components/editor/util/dataVisualization.ts +++ b/core/core-frontend/src/views/chart/components/editor/util/dataVisualization.ts @@ -88,8 +88,8 @@ export const DEFAULT_CANVAS_STYLE_DATA_BASE = { popupButtonAvailable: true, // 弹框区域显示按钮是否可用 默认为true screenAdaptor: 'widthFirst', // 屏幕适配方式 widthFirst=宽度优先 heightFirst=高度优先 full=铺满全屏 keepSize=不缩放 scale: 60, - scaleWidth: 100, - scaleHeight: 100, + scaleWidth: 60, + scaleHeight: 60, backgroundColorSelect: true, backgroundImageEnable: false, backgroundType: 'backgroundColor', // 废弃