diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index f238df3cf..82c8995e3 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -150,6 +150,7 @@ item.name) + if (this.isNoData) { + return + } + chartOption.xAxis.data = chartOption.series[0].data.map(item => item.name) chartOption.axisLabel = { margin: 8, formatter (params) { - const dataLength = chartOption.series.data.length || 1 + const dataLength = chartOption.series[0].data.length || 1 const chartWidth = (document.getElementById('chart-canvas-' + self.chartInfo.id).offsetWidth - 80) / dataLength// 容器宽 - padding - 空余 const length = Math.ceil((chartWidth) / 16) let val = '' @@ -143,7 +146,7 @@ export default { }) }) this.$emit('chartIsNoData', this.isNoData) - return s + return [s] }, formatterFunc (params, ticket, callback) { const self = this diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue index bf7771474..45ec4bf22 100644 --- a/nezha-fronted/src/components/chart/chart/chartGroup.vue +++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue @@ -25,7 +25,8 @@ export default { name: 'chart-group', props: { panelLock: Boolean, - from: String + from: String, + filter: {} }, mixins: [chartMixin, chartFormat], computed: { @@ -52,7 +53,7 @@ export default { this.dataList = this.dataList.map(item => { return { ...item, - hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件 + // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件 loaded: true } }) @@ -67,7 +68,7 @@ export default { this.dataList = arr.map(item => { return { ...item, - hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件 + // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件 loaded: false } }) diff --git a/nezha-fronted/src/components/chart/chart/chartPie.vue b/nezha-fronted/src/components/chart/chart/chartPie.vue index 95d2c431e..b4c5cf2c3 100644 --- a/nezha-fronted/src/components/chart/chart/chartPie.vue +++ b/nezha-fronted/src/components/chart/chart/chartPie.vue @@ -77,9 +77,13 @@ export default { } }, methods: { - initChart (chartOption) { + initChart (chartOption = this.chartOption) { + console.log(123123,chartOption,this.chartOption) this.legends = [] chartOption.series = this.initPieData(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends + if (this.isNoData) { + return + } // chartOption.series.label.formatter = this.pieFormatterLabel chartOption.tooltip.formatter = this.formatterFunc /* 使用setTimeout延迟渲染图表,避免样式错乱 */ @@ -93,6 +97,7 @@ export default { initPieData (chartInfo, seriesTemplate, originalDatas) { let colorIndex = 0 const s = lodash.cloneDeep(seriesTemplate) + console.log(s) s.data = [] originalDatas.forEach((originalData, expressionIndex) => { originalData.forEach((data, dataIndex) => { @@ -123,7 +128,7 @@ export default { }) }) this.$emit('chartIsNoData', this.isNoData) - return s + return [s] }, formatterFunc: function (params, ticket, callback) { const self = this diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 873b1d00b..a05dcc0ff 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -64,7 +64,7 @@ export default { } }, methods: { - initChart (chartOption) { + initChart (chartOption = this.chartOption) { this.legends = [] chartOption.series = this.handleTimeSeries(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends diff --git a/nezha-fronted/src/components/chart/chart/chartTreemap.vue b/nezha-fronted/src/components/chart/chart/chartTreemap.vue index 2f699e46a..00039c264 100644 --- a/nezha-fronted/src/components/chart/chart/chartTreemap.vue +++ b/nezha-fronted/src/components/chart/chart/chartTreemap.vue @@ -77,7 +77,7 @@ export default { } }, methods: { - initChart (chartOption) { + initChart (chartOption = this.chartOption) { this.legends = [] chartOption.series[0] = this.initTreeMapData(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends chartOption.tooltip.formatter = this.formatterFunc diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index b565ec22b..aeca0308e 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -74,6 +74,7 @@ :ref="'chart-fullscreen' + fullscreen.chartInfo.id" :chart-info="fullscreen.chartInfo" :from="from" + :filter="filter" :is-fullscreen="true" @groupShow="groupShow" :panelLock="panelLock" diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index d07195097..1560369a2 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -245,7 +245,7 @@ export default { deep: true, handler (n) { if (n) { - this.initChart(this.chartOption) + this.initChart && this.initChart(this.chartOption) } } } diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index f8033d00e..5b0a2f7b9 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -1,6 +1,6 @@