From f35cbc166ba6224ec3822a56ce8893ee0d08346c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 15 Jul 2021 09:57:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E9=A2=84=E8=A7=88=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/ComponentWrapper.vue      |  6 ++++++
 .../components/canvas/components/Editor/Preview.vue    |  6 ++++++
 .../canvas/components/Editor/PreviewFullScreen.vue     |  2 +-
 frontend/src/components/dataease/DeOutWidget.vue       |  7 +++++++
 frontend/src/components/widget/DeWidget/DeSelect.vue   |  6 ++++++
 .../src/components/widget/DeWidget/DeTreeSelect.vue    |  7 ++++++-
 frontend/src/views/panel/edit/index.vue                |  2 +-
 frontend/src/views/panel/list/PanelViewShow.vue        | 10 +++++++++-
 8 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 9955bc9af0..c999968f68 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -12,6 +12,7 @@
       :style="getComponentStyleDefault(config.style)"
       :out-style="config.style"
       :element="config"
+      :in-screen="inScreen"
     />
 
     <component
@@ -50,6 +51,11 @@ export default {
       type: Number,
       required: false,
       default: 0
+    },
+    inScreen: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   computed: {
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 851b253c25..1e0a961b76 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -8,6 +8,7 @@
       :key="index"
       :config="item"
       :search-count="searchCount"
+      :in-screen="inScreen"
     />
     <!--视图详情-->
     <el-dialog
@@ -54,6 +55,11 @@ export default {
       type: String,
       required: false,
       default: 'full'
+    },
+    inScreen: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   data() {
diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
index 7cd783afda..9d16f1c8bf 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%;height: 100vh;">
     <fullscreen style="height:100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen" @change="fullscreenChange">
-      <Preview v-if="fullscreen" />
+      <Preview v-if="fullscreen" :in-screen="!fullscreen" />
     </fullscreen>
   </div>
 </template>
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index c8cf5a4af9..ff37783057 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -21,6 +21,8 @@
                 class="component-custom"
                 :out-style="element.style"
                 :element="element"
+                :in-draw="inDraw"
+                :in-screen="inScreen"
               />
             </div>
           </div>
@@ -42,6 +44,11 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
+    },
+    inScreen: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   data() {
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 57853a8e67..d24b67186e 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -8,6 +8,7 @@
     :clearable="!options.attrs.multiple"
     :multiple="options.attrs.multiple"
     :placeholder="options.attrs.placeholder"
+    :popper-append-to-body="inScreen"
     @change="changeValue"
   >
     <el-option
@@ -32,6 +33,11 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
+    },
+    inScreen: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   data() {
diff --git a/frontend/src/components/widget/DeWidget/DeTreeSelect.vue b/frontend/src/components/widget/DeWidget/DeTreeSelect.vue
index bbdea8ec26..5d696839dd 100644
--- a/frontend/src/components/widget/DeWidget/DeTreeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeTreeSelect.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" @change="changeValue">
+  <el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder"  :popper-append-to-body="inScreen" @change="changeValue">
     <el-option
       v-for="item in options.attrs.datas"
       :key="item[options.attrs.key]"
@@ -23,6 +23,11 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
+    },
+    inScreen: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   data() {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index ccabae3648..9edcbd7019 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -154,7 +154,7 @@
     </el-dialog>
 
     <fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="previewVisible">
-      <Preview v-if="previewVisible" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
+      <Preview v-if="previewVisible" :in-screen="!previewVisible" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
     </fullscreen>
     <input id="input" ref="files" type="file" accept="image/*" hidden @change="handleFileChange">
 
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index d56ef0b195..531b63df6a 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -51,7 +51,7 @@
       <el-row class="panel-design-preview">
         <div ref="imageWrapper" style="width: 100%;height: 100%">
           <fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen">
-            <Preview v-if="showMain" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
+            <Preview v-if="showMain" :in-screen="!fullscreen" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
           </fullscreen>
         </div>
       </el-row>
@@ -116,6 +116,14 @@ export default {
         this.showMain = true
         this.initHasStar()
       })
+    },
+    fullscreen(newVal, oldVla) {
+      // 刷新 进行重新渲染
+      this.showMain = false
+      this.$nextTick(() => {
+        this.showMain = true
+        this.initHasStar()
+      })
     }
   },
   mounted() {