feat:合并bug修复

frontend/src/components/canvas/components/Editor/Preview.vue

@@ -67,13 +67,10 @@ export default {
     // 监听div变动事件
     erd.listenTo(document.getElementById('canvasInfo'), element => {
       _this.$nextTick(() => {
+        debugger
         _this.restore()
       })
     })
-    // 监听数据变动事件
-    eventBus.$on('componentDataChange', () => {
-      _this.restore()
-    })
   },
   methods: {
     changeStyleWithScale,

frontend/src/views/panel/edit/index.vue

@@ -174,6 +174,7 @@ export default {
       }
     },
     panelInfo(newVal, oldVal) {
+      debugger
       this.init(newVal.id)
     }
   },
@@ -195,6 +196,7 @@ export default {
   },
   methods: {
     init(panelId) {
+      debugger
       // 如果临时画布有数据 则使用临时画布数据（视图编辑的时候 会保存临时画布数据）
       const componentDataTemp = this.$store.state.panel.componentDataTemp
       const canvasStyleDataTemp = this.$store.state.panel.canvasStyleDataTemp
@@ -203,8 +205,8 @@ export default {
         this.$store.commit('setCanvasStyle', JSON.parse(canvasStyleDataTemp))
       } else if (panelId) {
         get('panel/group/findOne/' + panelId).then(response => {
-          this.$store.commit('setComponentData', this.resetID(response.data.panelData))
-          this.$store.commit('setCanvasStyle', response.data.panelStyle)
+          this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
+          this.$store.commit('setCanvasStyle', JSON.parse(response.data.panelStyle))
         })
       }
     },

frontend/src/views/panel/list/PanelList.vue

@@ -424,7 +424,6 @@ export default {
           this.$store.commit('setCanvasStyle', JSON.parse(response.data.panelStyle))
           this.$store.dispatch('panel/setPanelInfo', data)
           this.currGroup = data
-          eventBus.$emit('componentDataChange', '')
         })
       }
       if (node.expanded) {
@@ -517,7 +516,6 @@ export default {
       this.authVisible = false
     },
     edit(data) {
-      // 清空临时画布
       this.$store.dispatch('panel/setPanelInfo', data)
       bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
     },

frontend/src/views/panel/list/PanelViewShow.vue

 <template>
-  <el-row v-if="showMain" style="height: 100%;width: 100%;">
+  <el-row style="height: 100%;width: 100%;">
     <el-col v-if="panelInfo.name.length>0" class="panel-design">
       <el-row class="panel-design-head">
         <!--TODO 仪表盘头部区域-->
@@ -12,7 +12,7 @@
       </el-row>
       <!--TODO 仪表盘预览区域-->
       <el-row class="panel-design-preview">
-        <Preview />
+        <Preview v-if="showMain" />
       </el-row>
     </el-col>
     <el-col v-if="panelInfo.name.length===0" style="height: 100%;">
@@ -25,14 +25,13 @@
 <script>
 import Preview from '@/components/canvas/components/Editor/Preview'
 import { mapState } from 'vuex'
-import eventBus from '@/components/canvas/utils/eventBus'
 
 export default {
   name: 'PanelViewShow',
   components: { Preview },
   data() {
     return {
-      showMain: false
+      showMain: true
 
     }
   },
@@ -45,15 +44,14 @@ export default {
       'canvasStyleData'
     ])
   },
-  mounted() {
-    // 监听数据变动事件 刷新清楚历史样式
-    eventBus.$on('componentDataChange', () => {
-      // 刷新
+  watch: {
+    panelInfo(newVal, oldVla) {
+      // 刷新 进行重新渲染
       this.showMain = false
-      this.$nextTick(() => {
-        this.showMain = true
-      })
-    })
+      this.$nextTick(() => { this.showMain = true })
+    }
+  },
+  mounted() {
   },
   methods: {
     clickPreview() {