feat:恢复冲突

frontend/src/components/Editor/Preview.vue

@@ -1,17 +1,20 @@
 <template>
-  <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 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>

frontend/src/views/chart/components/ChartComponent.vue

@@ -40,6 +40,7 @@ export default {
   },
   mounted() {
     // 基于准备好的dom，初始化echarts实例
+    console.log('chartId:' + this.chartId)
     this.myChart = this.$echarts.init(document.getElementById(this.chartId))
     this.drawEcharts()
 

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

@@ -422,23 +422,7 @@ export default {
     nodeClick(data, node) {
       if (data.nodeType === 'panel') {
         this.currGroup = data
-        this.$store.dispatch('panel/setPanelInfo', data)
-        // 加载视图数据
-        this.$nextTick(() => {
-          localStorage.setItem('canvasData', null)
-          localStorage.setItem('canvasStyle', null)
-          get('panel/group/findOne/' + data.id).then(response => {
-            localStorage.setItem('canvasData', response.data.panelData)
-            localStorage.setItem('canvasStyle', response.data.panelStyle)
-            // 用保存的数据恢复画布
-            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')))
-            }
-          })
-        })
+        // this.$store.dispatch('panel/setPanelInfo', data)
       }
       if (node.expanded) {
         this.expandedArray.push(data.id)
@@ -449,15 +433,6 @@ export default {
         }
       }
     },
-
-    resetID(data) {
-      data.forEach(item => {
-        item.id = generateID()
-      })
-
-      return data
-    },
-
     back() {
       this.sceneMode = false
       this.$store.dispatch('dataset/setSceneData', null)