From 60a4f07d3742388256286cc05830527da82ee9e0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 14 Aug 2024 10:53:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/data-visualization/PreviewHead.vue              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index 3b4535080a..4603e79caf 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -170,10 +170,10 @@ const initOpenHandler = newWindow => {
                     >PDF</el-dropdown-item
                   >
                   <el-dropdown-item style="width: 118px" @click="downloadAsAppTemplate('template')"
-                    >模板</el-dropdown-item
+                    >样式模板</el-dropdown-item
                   >
                   <el-dropdown-item style="width: 118px" @click="downloadAsAppTemplate('app')"
-                    >应用</el-dropdown-item
+                    >应用模板</el-dropdown-item
                   >
                   <el-dropdown-item @click="download('img')">{{
                     t('chart.image')

From 2b908ed44f79edf7dedde4a3816220b44fcabff2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 14 Aug 2024 11:00:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E7=BB=84=E4=BB=B6=E7=A7=BB=E5=85=A5Tab?=
 =?UTF-8?q?=E6=97=B6=E6=94=BE=E5=85=A5=E6=9C=80=E5=BA=95=E7=AB=AF=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=BD=B1=E5=93=8D=E4=B9=8B=E5=89=8D=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/de-tabs/Component.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue
index c4c103c3fc..7d9a1d425a 100644
--- a/core/core-frontend/src/custom-component/de-tabs/Component.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue
@@ -116,7 +116,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
 import { guid } from '@/views/visualized/data/dataset/form/util'
 import eventBus from '@/utils/eventBus'
-import { canvasChangeAdaptor, findComponentIndexById } from '@/utils/canvasUtils'
+import { canvasChangeAdaptor, findComponentIndexById, isDashboard } from '@/utils/canvasUtils'
 import DeCustomTab from '@/custom-component/de-tabs/DeCustomTab.vue'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
@@ -281,14 +281,16 @@ const componentMoveIn = component => {
       if (refInstance) {
         const matrixBase = refInstance.getBaseMatrixSize() //矩阵基础大小
         canvasChangeAdaptor(component, matrixBase)
+        component.x = 1
+        component.y = 200
+        component.style.left = 0
+        component.style.top = 0
         tabItem.componentData.push(component)
-        nextTick(() => {
-          component.x = 1
-          component.y = 1
-          component.style.left = 0
-          component.style.top = 0
-          refInstance.addItemBox(component) //在适当的时候初始化布局组件
-        })
+        if (isDashboard()) {
+          nextTick(() => {
+            refInstance.addItemBox(component) //在适当的时候初始化布局组件
+          })
+        }
       }
     }
   })