From c5f997ac4eae37be5c900f59faa2bddb19a56968 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 29 Oct 2021 13:39:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20antv=E7=82=B9=E5=87=BB=E5=9D=90?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/ChartComponentG2.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index a99894d4ad..48156af50d 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -192,8 +192,8 @@ export default { if (this.trackMenu.length < 2) { // 只有一个事件直接调用 this.trackClick(this.trackMenu[0]) } else { // 视图关联多个事件 - this.trackBarStyle.left = param.clientX + 'px' - this.trackBarStyle.top = (param.clientY - 15) + 'px' + this.trackBarStyle.left = param.x + 'px' + this.trackBarStyle.top = (param.y - 15) + 'px' this.$refs.viewTrack.trackButtonClick() } }, From 0ff8927d4bdbf30a0f378e83a4335426a297a046 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 29 Oct 2021 13:42:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=E8=B7=B3=E8=BD=AC=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B9=9F=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BB=A7=E7=BB=AD=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/PreviewEject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 9619635a98..976373206b 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -31,7 +31,7 @@ export default { this.$store.commit('setNowPanelTrackInfo', rsp.data) }) // 刷新跳转信息 - queryPanelJumpInfo(data.id).then(rsp => { + queryPanelJumpInfo(this.panelId).then(rsp => { this.$store.commit('setNowPanelJumpInfo', rsp.data) }) From 7ca65ff2801bbd9c237921a935867b8f4e81e7b7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 29 Oct 2021 13:47:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E8=81=94=E5=8A=A8=E9=80=89=E9=A1=B9=E5=80=BC=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/LinkJumpSet/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index b6eb113884..74a57c7bf8 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -285,7 +285,7 @@ export default { if (!this.linkJumpInfo.content) { this.linkJumpInfo.content = 'http://' } - if (this.linkJumpInfo.linkType === 'inner' && this.linkJumpInfo.targetPanelId) { + if (this.linkJumpInfo.targetPanelId) { this.getPanelViewList(this.linkJumpInfo.targetPanelId) } }, @@ -302,7 +302,7 @@ export default { }) }, panelNodeClick(data, node) { - console.log('panelNodeClick:' + JSON.stringify(data)) + // console.log('panelNodeClick:' + JSON.stringify(data)) this.linkJumpInfo.targetViewInfoList = [] this.getPanelViewList(data.id) },