From 74215c9c66f63c46ca1584edc4b57397afce3bd1 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 13 Oct 2023 14:38:51 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3230=20fix=EF=BC=9Adashboard=20chart=20tool?= =?UTF-8?q?tip=E7=82=B9=E5=87=BB=E5=85=B6=E5=AE=83=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E6=9C=AA=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/chartBubble.vue | 2 +- nezha-fronted/src/components/chart/chart/chartDoughnut.vue | 2 +- nezha-fronted/src/components/chart/chart/chartFunnel.vue | 2 +- nezha-fronted/src/components/chart/chart/chartHexagonD3.vue | 2 +- nezha-fronted/src/components/chart/chart/chartRank.vue | 2 +- nezha-fronted/src/components/chart/chart/chartRose.vue | 2 +- nezha-fronted/src/components/chart/chart/chartSankey.vue | 2 +- nezha-fronted/src/components/chart/chart/chartStat.vue | 2 +- nezha-fronted/src/components/chart/chart/chartTable.vue | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/chartBubble.vue b/nezha-fronted/src/components/chart/chart/chartBubble.vue index 72d3c2ae4..9b92de4d5 100644 --- a/nezha-fronted/src/components/chart/chart/chartBubble.vue +++ b/nezha-fronted/src/components/chart/chart/chartBubble.vue @@ -338,7 +338,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartDoughnut.vue b/nezha-fronted/src/components/chart/chart/chartDoughnut.vue index ae754831c..7a7e193ff 100644 --- a/nezha-fronted/src/components/chart/chart/chartDoughnut.vue +++ b/nezha-fronted/src/components/chart/chart/chartDoughnut.vue @@ -445,7 +445,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartFunnel.vue b/nezha-fronted/src/components/chart/chart/chartFunnel.vue index 1b4aba82c..535cd5fe7 100644 --- a/nezha-fronted/src/components/chart/chart/chartFunnel.vue +++ b/nezha-fronted/src/components/chart/chart/chartFunnel.vue @@ -434,7 +434,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue index 736ae837f..2a352cf19 100644 --- a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue +++ b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue @@ -489,7 +489,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartRank.vue b/nezha-fronted/src/components/chart/chart/chartRank.vue index 5e0814422..bb876eb3c 100644 --- a/nezha-fronted/src/components/chart/chart/chartRank.vue +++ b/nezha-fronted/src/components/chart/chart/chartRank.vue @@ -351,7 +351,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartRose.vue b/nezha-fronted/src/components/chart/chart/chartRose.vue index b206e6a4e..0373d1b3c 100644 --- a/nezha-fronted/src/components/chart/chart/chartRose.vue +++ b/nezha-fronted/src/components/chart/chart/chartRose.vue @@ -472,7 +472,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartSankey.vue b/nezha-fronted/src/components/chart/chart/chartSankey.vue index 50b8c8ecc..9f8645af8 100644 --- a/nezha-fronted/src/components/chart/chart/chartSankey.vue +++ b/nezha-fronted/src/components/chart/chart/chartSankey.vue @@ -459,7 +459,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index c7bf3601f..31d6b36f3 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -541,7 +541,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } }, diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue index a0742f88a..1810855ca 100644 --- a/nezha-fronted/src/components/chart/chart/chartTable.vue +++ b/nezha-fronted/src/components/chart/chart/chartTable.vue @@ -524,7 +524,7 @@ export default { } }, chartMousedown (e) { - if (this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') { + if ((this.dataLink.length || this.chartInfo.datasource === 'metrics' || this.chartInfo.datasource === 'logs') && this.tooltip.dataLinkShow) { e.stopPropagation() } },