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

This commit is contained in:
zyh
2023-10-25 17:00:45 +08:00

View File

@@ -683,7 +683,7 @@ export default {
}, },
chartClick (params) { chartClick (params) {
// 先取消多表联动 防止其它图表setOption // 先取消多表联动 防止其它图表setOption
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.disconnect('timeSeriesGroup')
} }
getChart(this.chartId).dispatchAction({ getChart(this.chartId).dispatchAction({
@@ -741,7 +741,7 @@ export default {
this.toolbox.clickIndex = params.seriesIndex this.toolbox.clickIndex = params.seriesIndex
const e = params.event.event const e = params.event.event
this.toolboxPosition(e) this.toolboxPosition(e)
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.connect('timeSeriesGroup') echarts.connect('timeSeriesGroup')
} }
}, },
@@ -751,7 +751,7 @@ export default {
} }
}, },
showSelectedSeries () { showSelectedSeries () {
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.disconnect('timeSeriesGroup')
} }
this.legends.forEach((item, index) => { this.legends.forEach((item, index) => {
@@ -781,13 +781,13 @@ export default {
] ]
}) })
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.connect('timeSeriesGroup')
} }
this.clickout() this.clickout()
}, },
showAllSeries () { showAllSeries () {
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.disconnect('timeSeriesGroup')
} }
getChart(this.chartId).dispatchAction({ getChart(this.chartId).dispatchAction({
@@ -807,8 +807,8 @@ export default {
] ]
}) })
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.connect('timeSeriesGroup')
} }
this.clickout() this.clickout()
} }