From 89828c7f8d5de9772e77116c8d73950382f41c2a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 27 Oct 2022 21:02:54 +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=E6=96=B0=E7=94=BB=E5=B8=83=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=83=8C=E6=99=AF=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/Preview.vue  | 9 ++++++---
 frontend/src/views/panel/edit/index.vue                  | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 3f36a04261..ef6cba429d 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -27,7 +27,7 @@
         v-else-if="componentDataShow && componentDataShow.length===0"
         class="custom-position"
       >
-        {{ $t('panel.panelNull') }}
+        <span v-show="isMainCanvas()">{{ $t('panel.panelNull') }}</span>
       </el-row>
       <div
         v-else
@@ -214,7 +214,7 @@ export default {
       let style = {
         width: '100%'
       }
-      if (this.canvasStyleData.openCommonStyle) {
+      if (this.canvasStyleData.openCommonStyle && this.isMainCanvas()) {
         if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
           style = {
             background: `url(${imgUrlTrans(this.canvasStyleData.panel.imageUrl)}) no-repeat`,
@@ -308,6 +308,9 @@ export default {
     bus.$off('trigger-reset-button', this.triggerResetButton)
   },
   methods: {
+    isMainCanvas() {
+      return this.canvasId === 'canvas-main'
+    },
     triggerResetButton() {
       this.triggerSearchButton(true)
     },
@@ -439,7 +442,7 @@ export default {
       } else {
         this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比
       }
-      if (this.canvasId === 'canvas-main') {
+      if (this.isMainCanvas()) {
         this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
       }
       this.handleScaleChange()
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 511495400e..1b0dc5b197 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -174,6 +174,7 @@
           v-if="!previewVisible&&!mobileLayoutStatus"
           ref="canvasMainRef"
           class="canvas_main_content"
+          :style="customCanvasStyle"
           :canvas-style-data="canvasStyleData"
           :component-data="mainCanvasComponentData"
           :canvas-id="canvasId"