From 5dc6c5923fa733e787bb050bb5a478e681d9687c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 15 Jun 2021 16:47:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/Preview.vue           |  8 ++++----
 frontend/src/views/panel/edit/index.vue            | 14 +++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index d288ccb07d..2428dca442 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="canvasInfo" :style="customStyle" class="bg">
+  <div id="canvasInfoTemp" :style="customStyle" class="bg">
     <el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position">
       {{ $t('panel.panelNull') }}
     </el-row>
@@ -101,7 +101,7 @@ export default {
     const _this = this
     const erd = elementResizeDetectorMaker()
     // 监听div变动事件
-    erd.listenTo(document.getElementById('canvasInfo'), element => {
+    erd.listenTo(document.getElementById('canvasInfoTemp'), element => {
       _this.$nextTick(() => {
         _this.restore()
       })
@@ -116,8 +116,8 @@ export default {
     getStyle,
     restore() {
       debugger
-      const canvasHeight = document.getElementById('canvasInfo').offsetHeight
-      const canvasWidth = document.getElementById('canvasInfo').offsetWidth
+      const canvasHeight = document.getElementById('canvasInfoTemp').offsetHeight
+      const canvasWidth = document.getElementById('canvasInfoTemp').offsetWidth
       this.scaleWidth = canvasWidth * 100 / parseInt(this.canvasStyleData.width)// 获取宽度比
       this.scaleHeight = canvasHeight * 100 / parseInt(this.canvasStyleData.height)// 获取高度比
       if (this.showType === 'width') {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index e14df6876c..f6ed8155d5 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -101,7 +101,7 @@
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
         >
-          <Editor :out-style="outStyle" />
+          <Editor v-if="!previewVisible" :out-style="outStyle" />
         </div>
       </de-main-container>
       <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">
@@ -135,14 +135,10 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      v-if="previewVisible"
-      :visible.sync="previewVisible"
-      :fullscreen="true"
-      custom-class="preview-dialog"
-    >
-      <PreviewFullScreen :fullscreen="previewVisible" />
-    </el-dialog>
+    <fullscreen style="height: 100%;background: none" :fullscreen.sync="previewVisible">
+      <Preview v-if="previewVisible" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
+    </fullscreen>
+
   </el-row>
 </template>