From 6157bd0361057d914ca278397bc3084816550ed0 Mon Sep 17 00:00:00 2001
From: Wangjiahao <1522128093@qq.com>
Date: Fri, 2 Jun 2023 16:48:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=AF=E8=83=BD=E8=A2=AB=E6=8F=90=E5=89=8D?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AF=BC=E8=87=B4=E8=A7=86=E5=9B=BE=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/editor/Preview.vue | 4 ----
 frontend/src/components/canvas/utils/utils.js                | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 214679c9d8..f86aff4576 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -423,10 +423,6 @@ export default {
     if (this.canvasId === 'canvas-main' && !this.showPosition.includes('multiplexing')) {
       listenGlobalKeyDownPreview()
     }
-    // 取消视图请求
-    this.$cancelRequest('/chart/view/getData/**')
-    this.$cancelRequest('/api/link/viewDetail/**')
-    this.$cancelRequest('/static-resource/**')
   },
   mounted() {
     this.initWatermark()
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index ff651c0dc8..5d72c1281c 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -11,6 +11,7 @@ import store from '@/store'
 import { AIDED_DESIGN, MOBILE_SETTING, PAGE_LINE_DESIGN, PANEL_CHART_INFO, TAB_COMMON_STYLE } from '@/views/panel/panel'
 import html2canvas from 'html2canvasde'
 import xssCheck from 'xss'
+import Vue from 'vue'
 
 export function deepCopy(target) {
   if (typeof target === 'object' && target !== null) {
@@ -70,6 +71,10 @@ export function mobile2MainCanvas(mainSource, mobileSource) {
 }
 
 export function panelInit(componentData, componentStyle) {
+  // 取消视图请求
+  Vue.prototype.$cancelRequest('/chart/view/getData/**')
+  Vue.prototype.$cancelRequest('/api/link/viewDetail/**')
+  Vue.prototype.$cancelRequest('/static-resource/**')
   panelDataPrepare(componentData, componentStyle, function() {
     // 将data 和 style 数据设置到全局store中
     store.commit('setComponentData', resetID(componentData))

From ba27d96b32b264250128137bb6eef93f52cab8b5 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 2 Jun 2023 23:34:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E6=8F=90=E7=A4=BA):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=A4=BA=E6=A1=86=E8=A2=AB?=
 =?UTF-8?q?=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/ComponentWrapper.vue         | 3 +++
 frontend/src/views/chart/components/ChartComponentG2.vue  | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index fab2e19b7c..78ed44e70a 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -345,6 +345,9 @@ export default {
 .component {
   position: absolute;
 }
+.component-outer {
+  transform: translate(0);
+}
 .component-outer:hover {
   box-shadow: 0px 0px 3px #0a7be0;
 }
diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue
index 3ef1b888db..82c2b3394d 100644
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -33,6 +33,7 @@
     <div
       :id="chartId"
       style="width: 100%;overflow: hidden;"
+      class="g2-container"
       :style="{height:chartHeight}"
     />
   </div>
@@ -437,3 +438,10 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+.g2-container {
+  ::v-deep .g2-tooltip {
+    position: fixed !important;
+  }
+}
+</style>