Merge remote-tracking branch 'origin/codeCheck' into codeCheck

# Conflicts:
#	nezha-fronted/src/components/charts/chart-alert-list.vue
#	nezha-fronted/src/components/charts/chart-single-stat.vue
#	nezha-fronted/src/components/charts/chart-table.vue
#	nezha-fronted/src/components/charts/chart-url.vue
#	nezha-fronted/src/components/charts/line-chart-block.vue
#	nezha-fronted/src/components/charts/text-chart.vue
This commit is contained in:
chenjinsong
2020-12-15 21:21:35 +08:00
35 changed files with 1323 additions and 180 deletions

View File

@@ -874,7 +874,9 @@
*/
},
beforeDestroy(){
this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
if(this.scrollbarWrap){
this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
}
}
}