center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11948 from dataease/pr@dev-v2@fix_scroll

Browse Source 
fix(数据大屏): 修复首次进入创建大屏并创建组件后改变大屏大小导致组件大小发生变化问题
This commit is contained in:
王嘉豪 2024-09-03 13:15:42 +08:00 committed by GitHub
commit abad25f0b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/utils/canvasUtils.ts
View File

@ -653,6 +653,8 @@ export async function decompressionPre(params, callBack) {
//历史字段适配 //历史字段适配
sourceCanvasStyle.component['seniorStyleSetting'] = sourceCanvasStyle.component['seniorStyleSetting'] =
sourceCanvasStyle.component['seniorStyleSetting'] || deepCopy(SENIOR_STYLE_SETTING_LIGHT) sourceCanvasStyle.component['seniorStyleSetting'] || deepCopy(SENIOR_STYLE_SETTING_LIGHT)
sourceCanvasStyle['scaleWidth'] = sourceCanvasStyle['scale']
sourceCanvasStyle['scaleHeight'] = sourceCanvasStyle['scaleHeight']
deTemplateData = { deTemplateData = {
canvasStyleData: sourceCanvasStyle, canvasStyleData: sourceCanvasStyle,
componentData: sourceComponentData, componentData: sourceComponentData,

4
core/core-frontend/src/views/chart/components/editor/util/dataVisualization.ts
View File

@ -88,8 +88,8 @@ export const DEFAULT_CANVAS_STYLE_DATA_BASE = {
popupButtonAvailable: true, // 弹框区域显示按钮是否可用 默认为true popupButtonAvailable: true, // 弹框区域显示按钮是否可用 默认为true
screenAdaptor: 'widthFirst', // 屏幕适配方式 widthFirst=宽度优先 heightFirst=高度优先 full=铺满全屏 keepSize=不缩放 screenAdaptor: 'widthFirst', // 屏幕适配方式 widthFirst=宽度优先 heightFirst=高度优先 full=铺满全屏 keepSize=不缩放
scale: 60, scale: 60,
scaleWidth: 100, scaleWidth: 60,
scaleHeight: 100, scaleHeight: 60,
backgroundColorSelect: true, backgroundColorSelect: true,
backgroundImageEnable: false, backgroundImageEnable: false,
backgroundType: 'backgroundColor', // 废弃 backgroundType: 'backgroundColor', // 废弃