From 2222eda12fba13c2e07cc5a0ee70b209b3814e4d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 21 May 2021 12:42:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=20=E5=85=A8=E5=B1=8F=E9=A2=84=E8=A7=88=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/PreviewEject.vue |  1 +
 .../components/Editor/PreviewFullScreen.vue   |  7 +++--
 .../components/canvas/components/Toolbar.vue  |  3 +--
 frontend/src/styles/index.scss                | 16 ++++++++++++
 frontend/src/views/panel/edit/index.vue       | 26 ++++++++++++++++---
 5 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
index a236d7eb00..62787bce27 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
@@ -148,6 +148,7 @@ export default {
 
 <style lang="scss" scoped>
   .bg {
+    height: 100vh!important;
     min-width: 800px;
     min-height: 600px;
     width: 100%;
diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
index 1ba977c4df..2f72f7a33d 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;">
     <span style="line-height: 35px; position: absolute; top:10px;right: 20px;z-index:100000">
-      <el-button size="mini" @click="toDir">
+      <el-button size="mini" @click="close">
         关闭
       </el-button>
     </span>
@@ -18,9 +18,8 @@ export default {
   components: { Preview },
 
   methods: {
-    toDir() {
-      this.$router.replace('/panel/index')
-      bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
+    close() {
+      bus.$emit('previewFullScreenClose')
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index e74d86054d..ee27aee033 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -221,8 +221,7 @@ export default {
     },
 
     clickPreview() {
-      // 编辑时临时保存 当前修改的画布
-      this.$router.replace('/PreviewFullScreen')
+      this.$emit('previewFullScreen')
     }
   }
 }
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index e452bce881..c7cae09c04 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -99,6 +99,22 @@ div:focus {
     }
 }
 
+.preview-dialog {
+  padding: 0px!important;
+  .el-dialog--center{
+    padding: 0px!important;
+  }
+
+  .el-dialog__header{
+    display:none!important;
+
+  }
+  .el-dialog__body{
+    padding: 0px!important;
+    height: 100vh!important;
+  }
+}
+
 .de-search-header {
     .el-tabs__header{
         display: none !important;;
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index fd9c585d51..7199c8b327 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -8,7 +8,7 @@
       </el-col>
       <!--横向工具栏-->
       <el-col :span="16">
-        <Toolbar @showPanel="showPanel" @close-left-panel="closeLeftPanel" />
+        <Toolbar @showPanel="showPanel" @close-left-panel="closeLeftPanel" @previewFullScreen="previewFullScreen" />
       </el-col>
     </el-header>
     <de-container>
@@ -110,6 +110,15 @@
         </span>
       </div>
     </el-dialog>
+
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :fullscreen="true"
+      custom-class="preview-dialog"
+    >
+      <PreviewFullScreen />
+    </el-dialog>
   </el-row>
 </template>
 
@@ -130,6 +139,7 @@ import { mapState } from 'vuex'
 import { uuid } from 'vue-uuid'
 import Toolbar from '@/components/canvas/components/Toolbar'
 import { get } from '@/api/panel/panel'
+import PreviewFullScreen from '@/components/canvas/components/Editor/PreviewFullScreen'
 
 // 引入样式
 import '@/components/canvas/assets/iconfont/iconfont.css'
@@ -149,7 +159,8 @@ export default {
     Editor,
     Toolbar,
     FilterDialog,
-    SubjectSetting
+    SubjectSetting,
+    PreviewFullScreen
   },
   data() {
     return {
@@ -164,7 +175,8 @@ export default {
       filterVisible: false,
       currentWidget: null,
       currentFilterCom: null,
-      subjectVisible: false
+      subjectVisible: false,
+      previewVisible: false
     }
   },
 
@@ -211,6 +223,10 @@ export default {
     bus.$on('component-dialog-edit', () => {
       this.eidtDialog()
     })
+
+    bus.$on('previewFullScreenClose', () => {
+      this.previewVisible = false
+    })
   },
   beforeDestroy() {
     const elx = this.$refs.rightPanel
@@ -375,7 +391,11 @@ export default {
       debugger
       this.show = false
       // this.beforeDestroy()
+    },
+    previewFullScreen() {
+      this.previewVisible = true
     }
+
   }
 }
 </script>