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<String, String> findTargetUrl() {
         Map<String, String> 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-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/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) /
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 93994cade9..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
@@ -116,6 +138,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
@@ -151,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 =