gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.9

Browse Source
This commit is contained in:
zyh
2023-10-13 14:50:39 +08:00
parent ac319771fc 74215c9c66
commit 33e63c0bd3
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/chart/chart/chartBubble.vue
View File

@@ -338,7 +338,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartDoughnut.vue
View File

@@ -445,7 +445,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartFunnel.vue
View File

@@ -434,7 +434,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
View File

@@ -489,7 +489,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartRank.vue
View File

@@ -351,7 +351,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartRose.vue
View File

@@ -472,7 +472,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartSankey.vue
View File

@@ -459,7 +459,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartStat.vue
View File

@@ -541,7 +541,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },

2
nezha-fronted/src/components/chart/chart/chartTable.vue
View File

@@ -527,7 +527,7 @@ export default {
} }
}, },
chartMousedown (e) { 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() e.stopPropagation()
} }
}, },