From 4d5cb9194e9454bb5b4f8f8d672566103b26e468 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 19 Sep 2024 17:28:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=88=86=E7=BB=84=E5=86=85=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E6=B3=95=E6=94=BE=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/ComponentWrapper.vue               |  2 +-
 .../src/custom-component/group/Component.vue  |  1 -
 .../custom-component/group/GroupPreview.vue   | 19 +++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
index 8924557af0..685bdb31ba 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -274,7 +274,7 @@ const onWrapperClick = e => {
         }
         initOpenHandler(newWindow)
       } catch (e) {
-        console.warn(t('visualization.url_check_error') + ':' + url)
+        console.warn('url 格式错误:' + url)
       }
     } else if (config.value.events.type === 'refreshDataV') {
       useEmitt().emitter.emit('componentRefresh')
diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue
index ae3a654381..341ad3c04b 100644
--- a/core/core-frontend/src/custom-component/group/Component.vue
+++ b/core/core-frontend/src/custom-component/group/Component.vue
@@ -9,7 +9,6 @@ import { groupSizeStyleAdaptor } from '@/utils/style'
 const dvMainStore = dvMainStoreWithOut()
 const { canvasStyleData, curComponent } = storeToRefs(dvMainStore)
 const sourceCanvasStyle = deepCopy(DEFAULT_CANVAS_STYLE_DATA_DARK)
-
 const props = defineProps({
   propValue: {
     type: Array,
diff --git a/core/core-frontend/src/custom-component/group/GroupPreview.vue b/core/core-frontend/src/custom-component/group/GroupPreview.vue
index 41026a54f8..fc20b46662 100644
--- a/core/core-frontend/src/custom-component/group/GroupPreview.vue
+++ b/core/core-frontend/src/custom-component/group/GroupPreview.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
-import { toRefs } from 'vue'
+import { ref, toRefs } from 'vue'
 import ComponentWrapper from '@/components/data-visualization/canvas/ComponentWrapper.vue'
 import { toPercent } from '@/utils/translate'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import UserViewEnlarge from '@/components/visualization/UserViewEnlarge.vue'
+const dvMainStore = dvMainStoreWithOut()
+const userViewEnlargeRef = ref(null)
 
 const props = defineProps({
   propValue: {
@@ -43,7 +47,6 @@ const props = defineProps({
 })
 
 const { propValue, dvInfo, searchCount, scale, canvasViewInfo } = toRefs(props)
-
 const customGroupStyle = item => {
   return {
     width: toPercent(item.groupStyle.width),
@@ -52,6 +55,16 @@ const customGroupStyle = item => {
     left: toPercent(item.groupStyle.left)
   }
 }
+
+const userViewEnlargeOpen = (opt, item) => {
+  userViewEnlargeRef.value.dialogInit(
+    dvMainStore.canvasStyleData,
+    canvasViewInfo.value[item.id],
+    item,
+    opt,
+    { scale: scale.value }
+  )
+}
 </script>
 
 <template>
@@ -69,8 +82,10 @@ const customGroupStyle = item => {
         :show-position="showPosition"
         :search-count="searchCount"
         :scale="scale"
+        @userViewEnlargeOpen="userViewEnlargeOpen($event, item)"
       />
     </div>
+    <user-view-enlarge ref="userViewEnlargeRef"></user-view-enlarge>
   </div>
 </template>
 

From ab3030ff8e6cc6c8e960de1c0237405c6c5e38e2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 19 Sep 2024 17:45:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/UserViewEnlarge.vue  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 2ea86ea159..8b28c8f476 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -146,6 +146,7 @@ import { exportPivotExcel } from '@/views/chart/components/js/panel/common/commo
 import { useRequestStoreWithOut } from '@/store/modules/request'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
 import { activeWatermarkCheckUser } from '@/components/watermark/watermark'
+import { getCanvasStyle } from '@/utils/style'
 const downLoading = ref(false)
 const dvMainStore = dvMainStoreWithOut()
 const dialogShow = ref(false)
@@ -208,14 +209,14 @@ const DETAIL_TABLE_ATTR: DeepPartial<ChartObj> = {
 const authShow = computed(() => editMode.value === 'edit' || dvInfo.value.weight > 3)
 
 const customExport = computed(() => {
+  const style = canvasStyleData.value ? getCanvasStyle(canvasStyleData.value, 'canvas-main') : {}
   if (downLoading.value) {
     const bashStyle = pixel.value.split(' * ')
-    return {
-      width: bashStyle[0] + 'px!important',
-      height: bashStyle[1] + 'px!important'
-    }
+    style['width'] = bashStyle[0] + 'px!important'
+    style['height'] = bashStyle[1] + 'px!important'
+    return style
   } else {
-    return {}
+    return style
   }
 })