NEZ-2182 fix:project topology 显示错误

This commit is contained in:
zhangyu
2022-09-07 14:07:13 +08:00
parent 87e631080c
commit 4766d70a4c
4 changed files with 23 additions and 8 deletions

View File

@@ -698,6 +698,9 @@ export default {
if (this.fromTopologyDialog && !this.isPreview) {
setTimeout(() => {
this.topologyLoading = false
if (!data.pens) {
data.pens = []
}
getTopology(this.topologyIndex).open(data || {})
getTopology(this.topologyIndex).centerView()
getTopology(this.topologyIndex).resize()
@@ -708,6 +711,9 @@ export default {
if (!getTopology(this.topologyIndex)) {
return
}
if (!data.pens) {
data.pens = []
}
getTopology(this.topologyIndex).open(data || {})
getTopology(this.topologyIndex).lock(1)
this.objChange = false
@@ -1213,7 +1219,7 @@ export default {
},
onUpdateProps (node) {
let obj = this.$loadsh.cloneDeep(node)
const obj = this.$loadsh.cloneDeep(node)
delete obj.x
delete obj.y
delete obj.center
@@ -1762,6 +1768,9 @@ export default {
const domRect = dom ? dom.getBoundingClientRect() : {}
getTopology(this.topologyIndex).canvasPos = domRect
if (this.fromOverView) {
if (this.oldTopologyData && !this.oldTopologyData.pens) {
this.oldTopologyData.pens = []
}
getTopology(this.topologyIndex).open(this.oldTopologyData || {})
}
let flag = false

View File

@@ -713,7 +713,10 @@ export default {
if (!getTopology(this.topologyIndex)) {
return
}
getTopology(this.topologyIndex).open(data || {})
if (!data.pens) {
data.pens = []
}
getTopology(this.topologyIndex).open(data)
getTopology(this.topologyIndex).lock(1)
this.objChange = false
let flag = false
@@ -1646,7 +1649,7 @@ export default {
},
onUpdateProps (node) { // 更新pen
let obj = this.$loadsh.cloneDeep(node)
const obj = this.$loadsh.cloneDeep(node)
console.log(obj)
delete obj.x
delete obj.y
@@ -2231,7 +2234,10 @@ export default {
let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
getTopology(this.topologyIndex).canvasPos = domRect
if (this.fromOverView) {
getTopology(this.topologyIndex).open(this.oldTopologyData || {})
if (this.oldTopologyData && !this.oldTopologyData.pens) {
this.oldTopologyData.pens = []
}
getTopology(this.topologyIndex).open(this.oldTopologyData)
}
let flag = false

View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="height: 100%">
<el-table
id="roleTable"
ref="dataTable"

View File

@@ -1,5 +1,5 @@
<template>
<div height="100%">
<div style="height: 100%">
<el-table
id="userTable"
ref="dataTable"
@@ -118,7 +118,7 @@
<div v-else>&nbsp;</div>
</template>
</el-table>
</div>
</div>
</template>
<script>