From dd3423b22ee59487f7ebf34bb5100441e5842cd7 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 29 Apr 2024 11:00:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E7=8A=B6=E6=80=81=E4=B8=8B=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=B2=A1=E6=9C=89=E5=B1=95=E7=A4=BA=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/EditBar.vue      | 31 ++++++++++---------
 .../components/editor/PreviewFullScreen.vue   |  2 ++
 .../canvas/components/editor/ViewTrackBar.vue |  4 ---
 .../canvas/customComponent/UserView.vue       | 31 ++++++++++---------
 core/frontend/src/styles/index.scss           |  4 +++
 .../src/views/chart/view/TitleRemark.vue      | 14 ---------
 core/frontend/src/views/panel/edit/index.vue  |  2 ++
 .../src/views/panel/list/PanelViewShow.vue    |  3 +-
 8 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/EditBar.vue b/core/frontend/src/components/canvas/components/editor/EditBar.vue
index 6e54505bc1..027b340c29 100644
--- a/core/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/core/frontend/src/components/canvas/components/editor/EditBar.vue
@@ -489,22 +489,23 @@ export default {
       this.$message({
         message: h('p', null, [
           this.$t('data_export.exporting'),
-          h(
-            Button,
-            {
-              props: {
-                type: 'text',
-                size: 'mini'
-              },
-              class: 'btn-text',
-              on: {
-                click: () => {
-                  cb()
+          this.showEditPosition === 'bar-main-preview'
+            ? h(
+              Button,
+              {
+                props: {
+                  type: 'text',
+                  size: 'mini'
+                },
+                class: 'btn-text',
+                on: {
+                  click: () => {
+                    cb()
+                  }
                 }
-              }
-            },
-            this.$t('data_export.export_center')
-          ),
+              },
+              this.$t('data_export.export_center')
+            ) : this.$t('data_export.export_center'),
           this.$t('data_export.export_info')
         ]),
         iconClass,
diff --git a/core/frontend/src/components/canvas/components/editor/PreviewFullScreen.vue b/core/frontend/src/components/canvas/components/editor/PreviewFullScreen.vue
index 57e0184cb5..e9398d452b 100644
--- a/core/frontend/src/components/canvas/components/editor/PreviewFullScreen.vue
+++ b/core/frontend/src/components/canvas/components/editor/PreviewFullScreen.vue
@@ -1,6 +1,8 @@
 <template>
   <div style="width: 100%;height: 100vh;">
     <fullscreen
+      teleport
+      fullscreen-class="de-fullscreen-preview-index"
       style="height:100%;background: #f7f8fa;overflow-y: auto"
       :fullscreen.sync="fullscreen"
       @change="fullscreenChange"
diff --git a/core/frontend/src/components/canvas/components/editor/ViewTrackBar.vue b/core/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
index 76ab54df63..35dd3c2985 100644
--- a/core/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
+++ b/core/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
@@ -11,7 +11,6 @@
       >
       <el-dropdown-menu
         class="track-menu"
-        :append-to-body="false"
       >
         <el-dropdown-item
           v-for="(item, key) in trackMenu"
@@ -76,9 +75,6 @@ export default {
 
   .track-menu {
     border: #3a8ee6 1px solid;
-    position: absolute !important;
-    top: 0 !important;
-    left: 0 !important;
   }
 
 </style>
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 8b1bcec6a7..1b6ef47d47 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -778,22 +778,23 @@ export default {
       this.$message({
         message: h('p', null, [
           this.$t('data_export.exporting'),
-          h(
-            Button,
-            {
-              props: {
-                type: 'text',
-                size: 'mini'
-              },
-              class: 'btn-text',
-              on: {
-                click: () => {
-                  cb()
+          this.editMode === 'preview'
+            ? h(
+              Button,
+              {
+                props: {
+                  type: 'text',
+                  size: 'mini'
+                },
+                class: 'btn-text',
+                on: {
+                  click: () => {
+                    cb()
+                  }
                 }
-              }
-            },
-            this.$t('data_export.export_center')
-          ),
+              },
+              this.$t('data_export.export_center')
+            ) : this.$t('data_export.export_center'),
           this.$t('data_export.export_info')
         ]),
         iconClass,
diff --git a/core/frontend/src/styles/index.scss b/core/frontend/src/styles/index.scss
index 1f04dd7f47..2a60c4d4fa 100644
--- a/core/frontend/src/styles/index.scss
+++ b/core/frontend/src/styles/index.scss
@@ -1818,3 +1818,7 @@ div:focus {
 .el-table__fixed-right::before {
   display: none;
 }
+
+.de-fullscreen-preview-index {
+  z-index: 2000;
+}
\ No newline at end of file
diff --git a/core/frontend/src/views/chart/view/TitleRemark.vue b/core/frontend/src/views/chart/view/TitleRemark.vue
index 437a92496a..c12a85af8a 100644
--- a/core/frontend/src/views/chart/view/TitleRemark.vue
+++ b/core/frontend/src/views/chart/view/TitleRemark.vue
@@ -6,7 +6,6 @@
       placement="bottom"
       trigger="hover"
       width="300"
-      :append-to-body="!previewVisible"
       :popper-class="previewVisible ? 'remark-pop' : ''"
       :visible-arrow="false"
     >
@@ -79,16 +78,3 @@ 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/edit/index.vue b/core/frontend/src/views/panel/edit/index.vue
index bbf086c3d7..6d9a957416 100644
--- a/core/frontend/src/views/panel/edit/index.vue
+++ b/core/frontend/src/views/panel/edit/index.vue
@@ -359,6 +359,8 @@
     </el-dialog>
 
     <fullscreen
+      teleport
+      fullscreen-class="de-fullscreen-preview-index"
       style="height: 100%;background: #f7f8fa;overflow-y: auto"
       :fullscreen.sync="previewVisible"
     >
diff --git a/core/frontend/src/views/panel/list/PanelViewShow.vue b/core/frontend/src/views/panel/list/PanelViewShow.vue
index 608abe3518..a2a54d3643 100644
--- a/core/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/core/frontend/src/views/panel/list/PanelViewShow.vue
@@ -254,6 +254,8 @@
           :style="imageWrapperStyle"
         >
           <fullscreen
+            teleport
+            fullscreen-class="de-fullscreen-preview-index"
             style="height: 100%;background: #f7f8fa;overflow-y: auto"
             :fullscreen.sync="fullscreen"
           >
@@ -978,4 +980,3 @@ export default {
   }
 }
 </style>
-