Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6

This commit is contained in:
zhangyu
2023-04-18 15:20:13 +08:00
4 changed files with 17 additions and 7 deletions

View File

@@ -599,6 +599,10 @@ export default {
} else {
this.isPopoverDisabled = false
}
},
refresh () {
this.setSearchTime(this.nowTimeType.type, this.nowTimeType.value, this.searchTime)
this.$emit('change', this.searchTime)
}
},
watch: {
@@ -610,6 +614,7 @@ export default {
if (showTime) {
this.showTime = Object.assign({}, showTime)
this.searchTime = this.$parent.searchTime
this.nowTimeType = this.showTime
}
if (this.showEmpty && this.defaultPick === 12) {
this.searchTime = []