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

Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.11

Browse Source
This commit is contained in:
zyh
2024-07-03 11:17:23 +08:00
parent 08b183d525 ab0f42b8c8
commit a4488fd7a2
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
View File

@@ -174,9 +174,11 @@ export default {
let charts = this.$lodash.cloneDeep(this.$refs.notebookList.copyDataList) let charts = this.$lodash.cloneDeep(this.$refs.notebookList.copyDataList)
charts = charts.filter(item => item.name !== 'groupTemp') charts = charts.filter(item => item.name !== 'groupTemp')
charts.forEach(item => { charts.forEach(item => {
if (item.datasource == 'metrics' || item.datasource == 'log') {
item.elements.forEach((subItem, subIndex) => { item.elements.forEach((subItem, subIndex) => {
subItem.expression = item.oldElements[subIndex].expression subItem.expression = item.oldElements[subIndex].expression
}) })
}
delete item.x delete item.x
delete item.y delete item.y
delete item.modifiedName delete item.modifiedName
@@ -251,14 +253,10 @@ export default {
this.chart.position = { position: 'after', id: data.id } this.chart.position = { position: 'after', id: data.id }
this.chart.panelName = this.showPanel.name this.chart.panelName = this.showPanel.name
this.chart.id = '' this.chart.id = ''
if (this.chart.datasource == 'metrics' || this.chart.datasource == 'log') {
this.chart.elements.forEach((item, index) => { this.chart.elements.forEach((item, index) => {
item.expression = this.chart.oldElements[index].expression item.expression = this.chart.oldElements[index].expression
item.id = ''
item.chartId = ''
delete item.seq
}) })
if (this.chart.datasource !== 'metrics' && this.chart.datasource !== 'log') {
delete this.chart.elements
} }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addChartModal.isStable = 'stable' this.$refs.addChartModal.isStable = 'stable'
@@ -266,9 +264,11 @@ export default {
} else { } else {
this.chart = JSON.parse(JSON.stringify(data)) this.chart = JSON.parse(JSON.stringify(data))
this.chart.panelName = this.showPanel.name this.chart.panelName = this.showPanel.name
if (this.chart.datasource == 'metrics' || this.chart.datasource == 'log') {
this.chart.elements.forEach((item, index) => { this.chart.elements.forEach((item, index) => {
item.expression = this.chart.oldElements[index].expression item.expression = this.chart.oldElements[index].expression
}) })
}
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addChartModal.isStable = 'stable' this.$refs.addChartModal.isStable = 'stable'
}) })