diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 8e4ef237c..f08d154b9 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -449,6 +449,7 @@ .el-dialog__body { height: 100%; padding: 0; + overflow: hidden; } .panel-chart--fullscreen { display: flex; @@ -595,4 +596,4 @@ } .hiddenItem{ box-shadow: $--chart-shadow; -} \ No newline at end of file +} diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index ba60739e1..f96296402 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -27,6 +27,10 @@ export default { showAllData: { type: Boolean, default: false + }, + dialogPadding: { + type: Number, + default: 0 } }, computed: { @@ -133,7 +137,7 @@ export default { } const tagKeysArr = Object.keys(data.metric) tagKeysArr.forEach(tagKey => { - if (tagKey !== '__name__') { + if (tagKey !== '__name__' && tagKey !== 'legend' && tagKey !== 'values' && tagKey !== '$value') { legend += `${tagKey}="${data.metric[tagKey]}",` } }) @@ -333,9 +337,7 @@ export default { deep: true, handler (n) { if (n) { - this.$nextTick(() => { - this.initChart && this.initChart(this.chartOption) - }) + this.initChart && this.initChart(this.chartOption) } } }