+
@@ -660,12 +660,11 @@ export default {
this.chartGetData = []
const axiosArr = []
const promiseArr = []
- const self = this
const pensPromise = (pen, arr, index) => {
- return new Promise(function (resolve, reject) {
+ return new Promise((resolve, reject) => {
Promise.all(arr).then((res) => {
- self.chartGetData[index].res = self.computeData(res, pen.data.aggregation, pen)
- self.setAnimation(pen, self.chartGetData[index].res)
+ this.chartGetData[index].res = this.computeData(res, pen.data.aggregation, pen)
+ this.setAnimation(pen, this.chartGetData[index].res)
resolve()
})
})
@@ -774,9 +773,10 @@ export default {
return
}
if (!getTopology(this.topologyIndex)) {
- const canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions)
+ let canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions)
canvas.open(data)
setTopology(this.topologyIndex, canvas)
+ canvas = null
} else {
getTopology(this.topologyIndex).open(data)
}
@@ -801,7 +801,7 @@ export default {
if (!res.data) {
return
}
- let data = res.data.topo
+ let data = JSON.parse(JSON.stringify(res.data.topo))
if (!res.data.topo || !res.data.topo.pens.length) {
this.showNoData = true
} else {
@@ -846,12 +846,11 @@ export default {
const arr = data.pens.filter(item => !item.type)
this.addNodeInit(arr)
}
- const timer = setInterval(() => {
+ let timer = setInterval(() => {
if (!this.imgInit) {
return
}
const promiseArr = []
- const self = this
for (let i = 0; i < data.pens.length; i++) {
const line = data.pens[i]
if (line.type === 1) {
@@ -914,13 +913,15 @@ export default {
}
}
})
- self.saveData = { ...data }
+ this.saveData = { ...data }
resolve(data)
clearInterval(timer)
+ timer = null
}).catch(res => {
- self.saveData = { ...data }
+ this.saveData = { ...data }
resolve(data)
clearInterval(timer)
+ timer = null
})
}, 100)
}
@@ -1062,7 +1063,6 @@ export default {
},
getNodesArr () {
- const arr = []
if (!getTopology(this.topologyIndex)) return
this.offsetX = getTopology(this.topologyIndex).data.x
this.offsetY = getTopology(this.topologyIndex).data.y
@@ -1556,7 +1556,7 @@ export default {
fileList = fileList.splice(fileList.length - 1, 1)
return false
}
- const isSize = new Promise(function (resolve, reject) {
+ new Promise(function (resolve, reject) {
const width = 0
const height = 0
const _URL = window.URL || window.webkitURL
@@ -1839,8 +1839,7 @@ export default {
// resolve(img)
// })
})
- .catch(err => {
- })
+ .catch()
})
}
},
@@ -2250,8 +2249,13 @@ export default {
}
}
},
- destroyed () {
+ beforeDestroy () {
+ if (this.timer) {
+ clearInterval(this.timer)
+ this.timer = null
+ }
if (getTopology(this.topologyIndex)) {
+ getTopology(this.topologyIndex).off('contextmenu', this.onContextMenu)
getTopology(this.topologyIndex).destroy()
setTopology(this.topologyIndex, null)
}
@@ -2259,7 +2263,7 @@ export default {
document.getElementById('topology-canvas' + this.topologyIndexF).removeEventListener('mousemove', this.canvasMove)
}
window.removeEventListener('resize', this.winResize)
- window.removeEventListener('resize', this.contextmenuNone)
+ window.removeEventListener('click', this.contextmenuNone)
}
}