diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
index a6cc3ee61f..1f6faeec8b 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
@@ -1,21 +1,22 @@
 <template>
-    <div class="bg" v-if="show">
-        <el-button @click="close" class="close">关闭</el-button>
-        <div class="canvas-container">
-            <div class="canvas"
-                :style="{
-                    width: changeStyleWithScale(canvasStyleData.width) + 'px',
-                    height: changeStyleWithScale(canvasStyleData.height) + 'px',
-                }"
-            >
-                <ComponentWrapper
-                    v-for="(item, index) in componentData"
-                    :key="index"
-                    :config="item"
-                />
-            </div>
-        </div>
+  <div v-if="show" class="bg">
+    <el-button class="close" @click="close">关闭</el-button>
+    <div class="canvas-container">
+      <div
+        class="canvas"
+        :style="{
+          width: changeStyleWithScale(canvasStyleData.width) + 'px',
+          height: changeStyleWithScale(canvasStyleData.height) + 'px',
+        }"
+      >
+        <ComponentWrapper
+          v-for="(item, index) in componentData"
+          :key="index"
+          :config="item"
+        />
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -23,66 +24,70 @@ import { getStyle } from '@/components/canvas/utils/style'
 import { mapState } from 'vuex'
 import ComponentWrapper from './ComponentWrapper'
 import { changeStyleWithScale } from '@/components/canvas/utils/translate'
+import { uuid } from 'vue-uuid'
 
 export default {
-    model: {
-        prop: 'show',
-        event: 'change',
-    },
-    props: {
-        show: {
-            type: Boolean,
-            default: false,
-        },
-    },
-    components: { ComponentWrapper },
-    computed: mapState([
-        'componentData',
-        'canvasStyleData',
-    ]),
-    methods: {
-        changeStyleWithScale,
+  components: { ComponentWrapper },
+  model: {
+    prop: 'show',
+    event: 'change'
+  },
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    }
+  },
+  created() {
+    this.restore()
+  },
+  computed: mapState([
+    'componentData',
+    'canvasStyleData'
+  ]),
+  methods: {
+    changeStyleWithScale,
 
-        getStyle,
+    getStyle,
 
-        close() {
-            this.$emit('change', false)
-        },
+    close() {
+      this.$emit('change', false)
     },
+    restore() {
+      debugger
+      // 用保存的数据恢复画布
+      if (localStorage.getItem('canvasData')) {
+        this.componentData = this.resetID(JSON.parse(localStorage.getItem('canvasData')))
+      }
+
+      if (localStorage.getItem('canvasStyle')) {
+        this.canvasStyleData = JSON.parse(localStorage.getItem('canvasStyle'))
+        this.$store.commit('setCanvasStyle', JSON.parse(localStorage.getItem('canvasStyle')))
+      }
+    },
+    resetID(data) {
+      data.forEach(item => {
+        item.id = uuid.v1()
+      })
+
+      return data
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-.bg {
+  .bg {
     width: 100%;
     height: 100%;
-    top: 0;
-    left: 0;
-    position: fixed;
-    background: rgb(0, 0, 0, .5);
-    z-index: 10;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: auto;
-    padding: 20px;
-
     .canvas-container {
-        width: calc(100% - 40px);
-        height: calc(100% - 120px);
-        overflow: auto;
-
-        .canvas {
-            background: #fff;
-            position: relative;
-            margin: auto;
-        }
+      width: 100%;
+      height: 100%;
+      overflow: auto;
+      .canvas {
+        position: relative;
+        margin: auto;
+      }
     }
-
-    .close {
-        position: absolute;
-        right: 20px;
-        top: 100px;
-    }
-}
+  }
 </style>
diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
new file mode 100644
index 0000000000..9a86c6e111
--- /dev/null
+++ b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="bg">
+    <div id="preview-parent" class="canvas-container">
+      <div
+        class="canvas"
+        :style="{
+          width: changeStyleWithScale(canvasStyleData.width) + 'px',
+          height: changeStyleWithScale(canvasStyleData.height) + 'px',
+        }"
+      >
+        <ComponentWrapper
+          v-for="(item, index) in componentData"
+          :key="index"
+          :config="item"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getStyle } from '@/components/canvas/utils/style'
+import { mapState } from 'vuex'
+import ComponentWrapper from './ComponentWrapper'
+import { changeStyleWithScale } from '@/components/canvas/utils/translate'
+import { uuid } from 'vue-uuid'
+
+export default {
+  components: { ComponentWrapper },
+  model: {
+    prop: 'show',
+    event: 'change'
+  },
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: mapState([
+    'componentData',
+    'canvasStyleData'
+  ]),
+  mounted() {
+    // 计算组件当前合适宽度
+  },
+  created() {
+    this.restore()
+  },
+  methods: {
+    changeStyleWithScale,
+
+    getStyle,
+
+    close() {
+      this.$emit('change', false)
+    },
+    restore() {
+      // 用保存的数据恢复画布
+      if (localStorage.getItem('canvasData')) {
+        this.$store.commit('setComponentData', this.resetID(JSON.parse(localStorage.getItem('canvasData'))))
+      }
+
+      if (localStorage.getItem('canvasStyle')) {
+        this.$store.commit('setCanvasStyle', JSON.parse(localStorage.getItem('canvasStyle')))
+      }
+    },
+    resetID(data) {
+      data.forEach(item => {
+        item.id = uuid.v1()
+      })
+
+      return data
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.bg {
+    width: 100%;
+    height: 100%;
+    .canvas-container {
+        width: 100%;
+        height: 100%;
+        overflow: auto;
+      .canvas {
+            position: relative;
+            margin: auto;
+        }
+    }
+}
+</style>
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 0580d609a8..25b4e1c712 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -29,7 +29,7 @@
         <el-button class="el-icon-circle-check" size="mini" circle @click="save" />
       </el-tooltip>
       <el-tooltip content="预览">
-        <el-button class="el-icon-view" size="mini" circle @click="preview" />
+        <el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
       </el-tooltip>
 
       <span style="float: right;margin-left: 10px">
@@ -40,7 +40,7 @@
     </div>
 
     <!-- 预览 -->
-    <PreviewEject v-model="isShowPreview" @change="handlePreviewChange" />
+    <!--    <PreviewEject v-model="isShowPreview" @change="handlePreviewChange" />-->
   </div>
 </template>
 
@@ -216,6 +216,13 @@ export default {
 
     handlePreviewChange() {
       this.$store.commit('setEditMode', 'edit')
+    },
+
+    clickPreview() {
+      localStorage.setItem('canvasData', JSON.stringify(this.componentData))
+      localStorage.setItem('canvasStyle', JSON.stringify(this.canvasStyleData))
+      const url = '#/preview'
+      window.open(url, '_blank')
     }
   }
 }
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 52e1f98407..369956f76c 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -73,7 +73,7 @@ export const constantRoutes = [
   },
   {
     path: '/preview',
-    component: () => import('@/views/panel/preview/index'),
+    component: () => import('@/components/canvas/components/Editor/PreviewFullScreen'),
     hidden: true
   },
 
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 157094b720..ab5cc22cf9 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -10,7 +10,7 @@
           </span>
           <span style="float: right;line-height: 40px;">
             <el-tooltip content="预览">
-              <el-button class="el-icon-view" size="mini" circle />
+              <el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
             </el-tooltip>
           </span>
         </el-row>
@@ -24,6 +24,7 @@
 </template>
 <script>
 import Preview from '@/components/canvas/components/Editor/Preview'
+import { mapState } from 'vuex'
 
 export default {
   name: 'PanelViewShow',
@@ -36,12 +37,22 @@ export default {
   computed: {
     panelInfo() {
       return this.$store.state.panel.panelInfo
-    }
+    },
+    ...mapState([
+      'componentData',
+      'canvasStyleData'
+    ])
   },
   mounted() {
 
   },
   methods: {
+    clickPreview() {
+      localStorage.setItem('canvasData', JSON.stringify(this.componentData))
+      localStorage.setItem('canvasStyle', JSON.stringify(this.canvasStyleData))
+      const url = '#/preview'
+      window.open(url, '_blank')
+    }
 
   }
 }