From ed13b5bcba8a38ba4872d4bad10bd6614ef68b0f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 1 Nov 2022 15:41:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E5=A6=82=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=EF=BC=8C=E5=A4=8D=E7=94=A8=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=90=AB=E6=9C=89tab=E7=BB=84=E4=BB=B6=E6=97=B6=EF=BC=8Ctab?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=A7=86=E5=9B=BE=E5=87=BA=E7=8E=B0=E9=94=99?=
 =?UTF-8?q?=E4=BD=8D=E9=87=8D=E5=8F=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/PreviewEject.vue         |  7 ++++++-
 .../canvas/components/Editor/PreviewFullScreen.vue    | 10 +++++++---
 frontend/src/views/link/view/index.vue                | 11 +++++++----
 frontend/src/views/panel/ViewSelect/multiplexing.vue  | 10 ++++++++--
 frontend/src/views/panel/edit/index.vue               |  2 +-
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
index da63010bb5..3595c0c13d 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
@@ -6,7 +6,7 @@
   >
     <Preview
       v-if="!dataLoading"
-      :component-data="componentData"
+      :component-data="mainCanvasComponentData"
       :canvas-style-data="canvasStyleData"
       :back-screen-shot="backScreenShot"
       :panel-info="panelInfo"
@@ -22,11 +22,13 @@ import { queryTargetPanelJumpInfo } from '@/api/panel/linkJump'
 import { proxyInitPanelData } from '@/api/panel/shareProxy'
 import { getOuterParamsInfo } from '@/api/panel/outerParams'
 import { mapState } from 'vuex'
+import { getNowCanvasComponentData } from '@/components/canvas/utils/utils'
 
 export default {
   components: { Preview },
   data() {
     return {
+      canvasId: 'canvas-main',
       dataLoading: false,
       backScreenShot: false,
       mainHeight: '100vh!important',
@@ -34,6 +36,9 @@ export default {
     }
   },
   computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    },
     bgStyle() {
       if (this.backScreenShot) {
         return { height: this.mainHeight }
diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
index 736c06bbf0..15575b4d2c 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
@@ -7,7 +7,7 @@
     >
       <Preview
         v-if="fullscreen"
-        :component-data="componentData"
+        :component-data="mainCanvasComponentData"
         :canvas-style-data="canvasStyleData"
         :panel-info="panelInfo"
         :in-screen="!fullscreen"
@@ -21,21 +21,25 @@
 import Preview from './Preview'
 import bus from '@/utils/bus'
 import { mapState } from 'vuex'
+import { getNowCanvasComponentData } from '@/components/canvas/utils/utils'
 
 export default {
   components: { Preview },
   data() {
     return {
+      canvasId: 'canvas-main',
       fullscreen: false
     }
   },
   computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    },
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
     ...mapState([
-      'canvasStyleData',
-      'componentData'
+      'canvasStyleData'
     ])
   },
   mounted() {
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index b6594b6714..ad862d15fb 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -2,7 +2,7 @@
   <div style="width: 100%;height: 100vh;background-color: #f7f8fa">
     <Preview
       v-if="show"
-      :component-data="componentData"
+      :component-data="mainCanvasComponentData"
       :canvas-style-data="canvasStyleData"
       :panel-info="panelInfo"
     />
@@ -15,7 +15,7 @@ import { uuid } from 'vue-uuid'
 import Preview from '@/components/canvas/components/Editor/Preview'
 import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
 import { queryPanelJumpInfo, queryTargetPanelJumpInfo } from '@/api/panel/linkJump'
-import { panelInit } from '@/components/canvas/utils/utils'
+import { getNowCanvasComponentData, panelInit } from '@/components/canvas/utils/utils'
 import { getOuterParamsInfo } from '@/api/panel/outerParams'
 import { mapState } from 'vuex'
 
@@ -34,14 +34,17 @@ export default {
   },
   data() {
     return {
+      canvasId: 'canvas-main',
       show: false,
       panelInfo: {}
     }
   },
   computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    },
     ...mapState([
-      'canvasStyleData',
-      'componentData'
+      'canvasStyleData'
     ])
   },
   created() {
diff --git a/frontend/src/views/panel/ViewSelect/multiplexing.vue b/frontend/src/views/panel/ViewSelect/multiplexing.vue
index 23de8ede10..2012a9da11 100644
--- a/frontend/src/views/panel/ViewSelect/multiplexing.vue
+++ b/frontend/src/views/panel/ViewSelect/multiplexing.vue
@@ -16,7 +16,7 @@
     <de-main-container>
       <Preview
         v-if="selectedPanel"
-        :component-data="componentData"
+        :component-data="mainCanvasComponentData"
         :canvas-style-data="canvasStyleData"
         :panel-info="panelInfo"
         :show-position="showPosition"
@@ -41,7 +41,7 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
 import DeContainer from '@/components/dataease/DeContainer'
 import DeAsideContainer from '@/components/dataease/DeAsideContainer'
 import { findOne } from '@/api/panel/panel'
-import { deepCopy, panelDataPrepare } from '@/components/canvas/utils/utils'
+import { deepCopy, getNowCanvasComponentData, panelDataPrepare } from '@/components/canvas/utils/utils'
 import Preview from '@/components/canvas/components/Editor/Preview'
 import MultiplexingView from '@/views/panel/ViewSelect/multiplexingView'
 import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel'
@@ -59,6 +59,7 @@ export default {
   },
   data() {
     return {
+      canvasId: 'canvas-main',
       showPosition: 'multiplexing',
       activeName: 'PanelList',
       viewLoading: false,
@@ -72,6 +73,11 @@ export default {
       panelInfo: {}
     }
   },
+  computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    }
+  },
   watch: {
 
   },
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 94544d3db5..ac92de88cb 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -362,7 +362,7 @@
         :panel-info="panelInfo"
         :show-type="canvasStyleData.selfAdaption?'full':'width'"
         :canvas-style-data="canvasStyleData"
-        :component-data="componentData"
+        :component-data="mainCanvasComponentData"
         show-position="edit"
       />
     </fullscreen>