Merge branch 'dev-3.9' of git.mesalab.cn:nezha/nezha-fronted into dev-3.10
This commit is contained in:
@@ -174,6 +174,9 @@ 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 => {
|
||||||
|
item.elements.forEach((subItem, subIndex) => {
|
||||||
|
subItem.expression = item.oldElements[subIndex].expression
|
||||||
|
})
|
||||||
delete item.x
|
delete item.x
|
||||||
delete item.y
|
delete item.y
|
||||||
delete item.modifiedName
|
delete item.modifiedName
|
||||||
@@ -248,7 +251,8 @@ 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 = ''
|
||||||
this.chart.elements.forEach((item) => {
|
this.chart.elements.forEach((item, index) => {
|
||||||
|
item.expression = this.chart.oldElements[index].expression
|
||||||
item.id = ''
|
item.id = ''
|
||||||
item.chartId = ''
|
item.chartId = ''
|
||||||
delete item.seq
|
delete item.seq
|
||||||
@@ -262,6 +266,9 @@ 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
|
||||||
|
this.chart.elements.forEach((item, index) => {
|
||||||
|
item.expression = this.chart.oldElements[index].expression
|
||||||
|
})
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.addChartModal.isStable = 'stable'
|
this.$refs.addChartModal.isStable = 'stable'
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user