From e36b07f433ac3731b0b7a8a2861e6a62b70a4139 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 1 Jul 2024 23:24:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=9F=A5=E8=AF=A2=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E6=97=B6=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E9=89=B4=E6=9D=83=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/canvasUtils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 93994cade9..42f389d4cc 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -116,6 +116,7 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) { createTime: canvasInfo.createTime, updateTime: canvasInfo.updateTime, watermarkInfo: watermarkInfo, + weight: canvasInfo.weight, mobileLayout: canvasInfo.mobileLayout || false } const canvasVersion = canvasInfo.version From b978b40bd58e913d51152e072a74524988ae4b5b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Jul 2024 00:13:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E7=AD=89=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/ai/service/AiBaseService.java | 2 +- core/core-frontend/src/components/watermark/watermark.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java index bb188bdae0..44ab5344ba 100644 --- a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java +++ b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java @@ -24,7 +24,7 @@ public class AiBaseService implements AiComponentApi { @Override public Map findTargetUrl() { Map templateParams = sysParameterManage.groupVal("ai."); - if (templateParams != null && StringUtils.isNotEmpty(templateParams.get("ai.baseUrl")) && UrlTestUtils.isURLAvailable(templateParams.get("ai.baseUrl"))) { + if (templateParams != null && StringUtils.isNotEmpty(templateParams.get("ai.baseUrl"))) { return templateParams; } else { diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts index bc541fd4a1..80337236a1 100644 --- a/core/core-frontend/src/components/watermark/watermark.ts +++ b/core/core-frontend/src/components/watermark/watermark.ts @@ -45,7 +45,7 @@ export function watermark(settings, domId) { defaultSettings.watermark_x + defaultSettings.watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1) - ) > page_width + ) < page_width ) { defaultSettings.watermark_cols = Math.floor( (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / From 6ff602bb3607b71e0d3a190ea5e0e8c062047b66 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Jul 2024 09:41:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A7=E6=A8=A1=E7=89=88=E7=9A=84=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TemplateManageService.java | 6 ++++ core/core-frontend/src/utils/canvasUtils.ts | 31 ++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java b/core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java index b8de15c4b3..88e507f563 100644 --- a/core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java +++ b/core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java @@ -107,6 +107,9 @@ public class TemplateManageService implements TemplateManageApi { VisualizationTemplate template = new VisualizationTemplate(); BeanUtils.copyBean(template, request); + if(template.getVersion() == null){ + template.setVersion(2); + } templateMapper.insert(template); // 插入分类关系 request.getCategories().forEach(categoryId -> { @@ -134,6 +137,9 @@ public class TemplateManageService implements TemplateManageApi { } VisualizationTemplate template = new VisualizationTemplate(); BeanUtils.copyBean(template, request); + if(template.getVersion() == null){ + template.setVersion(2); + } templateMapper.updateById(template); //更新分类 // 分类映射删除 diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 42f389d4cc..3d20d9d8f1 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -89,6 +89,28 @@ export function commonHandleDragEnd(e, dvModel) { } } +function matrixAdaptor(componentItem) { + componentItem.x = 1 + (componentItem.x - 1) * 2 + componentItem.y = 1 + (componentItem.y - 1) * 2 + componentItem.sizeX = componentItem.sizeX * 2 + componentItem.sizeY = componentItem.sizeY * 2 + componentItem.mx = 1 + (componentItem.mx - 1) * 2 + componentItem.my = 1 + (componentItem.my - 1) * 2 + componentItem.mSizeX = componentItem.mSizeX * 2 + componentItem.mSizeY = componentItem.mSizeY * 2 + if (componentItem.component === 'Group') { + componentItem.propValue.forEach(groupItem => { + matrixAdaptor(groupItem) + }) + } else if (componentItem.component === 'DeTabs') { + componentItem.propValue.forEach(tabItem => { + tabItem.componentData.forEach(tabComponent => { + matrixAdaptor(tabComponent) + }) + }) + } +} + export function initCanvasDataPrepare(dvId, busiFlag, callBack) { const copyFlag = busiFlag != null && busiFlag.includes('-copy') const busiFlagCustom = copyFlag ? busiFlag.split('-')[0] : busiFlag @@ -152,14 +174,7 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) { } // 2 为基础版本 此处需要增加仪表板矩阵密度 if ((!canvasVersion || canvasVersion === 2) && canvasInfo.type === 'dashboard') { - componentItem.x = 1 + (componentItem.x - 1) * 2 - componentItem.y = 1 + (componentItem.y - 1) * 2 - componentItem.sizeX = componentItem.sizeX * 2 - componentItem.sizeY = componentItem.sizeY * 2 - componentItem.mx = 1 + (componentItem.mx - 1) * 2 - componentItem.my = 1 + (componentItem.my - 1) * 2 - componentItem.mSizeX = componentItem.mSizeX * 2 - componentItem.mSizeY = componentItem.mSizeY * 2 + matrixAdaptor(componentItem) } }) const curPreviewGap =