From a1ec52406d006df47b2f903d36044a0aa5c414eb Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 28 Nov 2023 15:58:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E8=A7=86=E5=9B=BE=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E7=9A=84=E5=A4=87=E6=B3=A8=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20#6207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |  7 ------
 .../src/views/chart/view/TitleRemark.vue      | 23 +++++++++++++++----
 .../src/views/panel/list/PanelViewShow.vue    |  8 +++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 53f166b252..7b27696d69 100644
--- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -398,11 +398,4 @@ export default {
 .component-active {
   z-index: 1;
 }
-
-.fullscreen {
-  transform: translate(0);
-  .main_view {
-    z-index: 0;
-  }
-}
 </style>
diff --git a/core/frontend/src/views/chart/view/TitleRemark.vue b/core/frontend/src/views/chart/view/TitleRemark.vue
index 84df54fd85..4ed49be67e 100644
--- a/core/frontend/src/views/chart/view/TitleRemark.vue
+++ b/core/frontend/src/views/chart/view/TitleRemark.vue
@@ -1,14 +1,13 @@
 <template>
   <span
-    style="display: inline-block;position: relative;
-    z-index: 10;"
+    style="display: inline-block;"
   >
     <el-popover
       placement="bottom"
       trigger="hover"
       width="300"
       :append-to-body="!previewVisible"
-      popper-class="remark-pop"
+      :popper-class="previewVisible && 'remark-pop'"
       :visible-arrow="false"
     >
       <div
@@ -19,7 +18,8 @@
       <i
         slot="reference"
         class="el-icon-info"
-        style="cursor: pointer;color: gray;font-size: 12px;"
+        style="cursor: pointer;color: gray;font-size: 12px;position: relative;
+    z-index: 10;"
       />
     </el-popover>
   </span>
@@ -43,6 +43,8 @@ export default {
 
 <style scoped>
 .remark-style{
+  position: relative;
+  z-index: 10;
   min-height: 100px;
   max-height: 200px;
   overflow-y: auto;
@@ -77,3 +79,16 @@ export default {
   text-align: -webkit-match-parent!important;
 }
 </style>
+
+<style lang="scss">
+.remark-pop {
+  position: absolute !important;
+  left: 10% !important;
+}
+.title-is-right {
+  .remark-pop {
+    left: auto !important;
+    right: 20px;
+  }
+}
+</style>
diff --git a/core/frontend/src/views/panel/list/PanelViewShow.vue b/core/frontend/src/views/panel/list/PanelViewShow.vue
index 1c0968f276..62fec26d3d 100644
--- a/core/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/core/frontend/src/views/panel/list/PanelViewShow.vue
@@ -499,6 +499,7 @@ export default {
     },
     fullscreen(newVal, oldVla) {
       // 刷新 进行重新渲染
+      this.$store.commit('setPreviewVisible', newVal)
       this.showMain = false
       this.$nextTick(() => {
         this.showMain = true
@@ -936,6 +937,13 @@ export default {
   margin-right: 5px;
 }
 
+.fullscreen {
+  transform: translate(0) !important;
+  .main_view {
+    z-index: 0;
+  }
+}
+
 .fullscreen-visual-selects {
   .VisualSelects {
     top: inherit !important;