From 6c9e34a1ee7c21c1cdd525b279c6575ae9753d55 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 28 Jan 2022 13:40:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E7=94=B1=E9=A2=9C=E8=89=B2=E5=88=87=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=E5=9B=BE=E7=89=87=EF=BC=8C=E6=9C=AA=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=97=B6=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E4=BE=9D=E7=84=B6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/edit/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index c2e0f37975..b79e9ff0f3 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -344,7 +344,7 @@ export default { mobileCanvasStyle() { let style if (this.canvasStyleData.openCommonStyle) { - if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) { + if (this.canvasStyleData.panel.backgroundType === 'image' && typeof (this.canvasStyleData.panel.imageUrl) === 'string') { style = { background: `url(${this.canvasStyleData.panel.imageUrl}) no-repeat` } From 44eb82eaf99b8d1811354c32d4b9aa742b0e473c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 28 Jan 2022 13:41:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=96=B0tab=E9=A1=B5=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3=E8=BD=AC=E6=97=B6?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=BA=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9B=AE=E6=A0=87=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9C=AA=E5=88=B7=E6=96=B0?= =?UTF-8?q?=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/PreviewEject.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 6a3b28434b..2783113a36 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -18,6 +18,11 @@ export default { mainHeight: '100vh!important' } }, + watch: { + '$route.params.reportId': function() { + this.restore() + } + }, computed: { bgStyle() { if (this.backScreenShot) {