Merge pull request #5416 from dataease/dev

merge dev

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;
 }

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()

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))

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>