Merge pull request #6897 from dataease/pr@dev_one_dot_x

Pr@dev one dot x

core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue

@@ -398,13 +398,6 @@ export default {
 .component-active {
   z-index: 1;
 }
-
-.fullscreen {
-  transform: translate(0);
-  .main_view {
-    z-index: 0;
-  }
-}
 .user-view {
   transform: translate(0);
 }

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>

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;