From c32fce753da82d94972a31f8b6d2a7faa414f44f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 24 Feb 2022 18:14:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=86=E5=8F=B2=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E6=9D=BF=E7=9A=84=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E6=89=93?= =?UTF-8?q?=E4=B8=8D=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/ComponentWrapper.vue | 2 +- frontend/src/views/link/view/index.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index ff49beb53a..57c1c6f14b 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -94,7 +94,7 @@ export default { width: '100%', height: '100%' } - if (this.config.commonBackground.enable) { + if (this.config.commonBackground && this.config.commonBackground.enable) { if (this.config.commonBackground.backgroundType === 'innerImage') { style['background'] = `url(${this.config.commonBackground.innerImage}) no-repeat` } else if (this.config.commonBackground.backgroundType === 'outerImage') { diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue index 4ac41383a6..c522e56ba0 100644 --- a/frontend/src/views/link/view/index.vue +++ b/frontend/src/views/link/view/index.vue @@ -10,6 +10,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' export default { name: 'LinkView', @@ -40,14 +41,14 @@ export default { id: res.data.id, name: res.data.name }) + + panelInit(JSON.parse(res.data.panelData), JSON.parse(res.data.panelStyle)) // 设置浏览器title为当前仪表板名称 document.title = res.data.name // 刷新联动信息 getPanelAllLinkageInfo(this.resourceId).then(rsp => { this.$store.commit('setNowPanelTrackInfo', rsp.data) }) - this.$store.commit('setComponentData', this.resetID(JSON.parse(res.data.panelData))) - this.$store.commit('setCanvasStyle', JSON.parse(res.data.panelStyle)) // 刷新跳转信息 queryPanelJumpInfo(this.resourceId).then(rsp => { this.$store.commit('setNowPanelJumpInfo', rsp.data)