gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangyu
2023-03-24 15:44:31 +08:00
parent c1ec320091 efd85c0cf0
commit 57cc7f70d1
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
View File

@@ -236,7 +236,7 @@ export default {
disabled: false disabled: false
}, { }, {
name: this.$t('overall.acknowledge'), name: this.$t('overall.acknowledge'),
type: 'selectString', type: 'select',
label: 'ack', label: 'ack',
readonly: true, readonly: true,
disabled: false disabled: false

2
nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
View File

@@ -253,7 +253,7 @@ export default {
const config = this.obj.configs.find(c => c.type === 'logs') const config = this.obj.configs.find(c => c.type === 'logs')
const hasLog = config && config.enable === 1 const hasLog = config && config.enable === 1
const tabs = [ const tabs = [
{ prop: 'dashboardTab', name: this.$t('overall.detail') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'endpointAlertMessage', name: this.$t('overall.alert') }, { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
{ prop: 'endpointQuery', name: this.$t('overall.metrics') } { prop: 'endpointQuery', name: this.$t('overall.metrics') }
] ]

10
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -597,7 +597,15 @@ export default {
}) })
} }
} }
this.editChart = obj if (obj.elements && obj.elements.length) {
obj.elements.forEach((item, index) => {
item.orderNum = index
delete item.seq
delete item.buildIn
delete item.chartId
})
}
this.editChart = this.$loadsh.cloneDeep(obj)
this.oldData = this.$loadsh.cloneDeep(obj) this.oldData = this.$loadsh.cloneDeep(obj)
if (this.stableTime) { if (this.stableTime) {
clearTimeout(this.stableTime) clearTimeout(this.stableTime)