NEZ-2182 fix:project topology 显示错误
This commit is contained in:
@@ -698,6 +698,9 @@ export default {
|
|||||||
if (this.fromTopologyDialog && !this.isPreview) {
|
if (this.fromTopologyDialog && !this.isPreview) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.topologyLoading = false
|
this.topologyLoading = false
|
||||||
|
if (!data.pens) {
|
||||||
|
data.pens = []
|
||||||
|
}
|
||||||
getTopology(this.topologyIndex).open(data || {})
|
getTopology(this.topologyIndex).open(data || {})
|
||||||
getTopology(this.topologyIndex).centerView()
|
getTopology(this.topologyIndex).centerView()
|
||||||
getTopology(this.topologyIndex).resize()
|
getTopology(this.topologyIndex).resize()
|
||||||
@@ -708,6 +711,9 @@ export default {
|
|||||||
if (!getTopology(this.topologyIndex)) {
|
if (!getTopology(this.topologyIndex)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (!data.pens) {
|
||||||
|
data.pens = []
|
||||||
|
}
|
||||||
getTopology(this.topologyIndex).open(data || {})
|
getTopology(this.topologyIndex).open(data || {})
|
||||||
getTopology(this.topologyIndex).lock(1)
|
getTopology(this.topologyIndex).lock(1)
|
||||||
this.objChange = false
|
this.objChange = false
|
||||||
@@ -1213,7 +1219,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
onUpdateProps (node) {
|
onUpdateProps (node) {
|
||||||
let obj = this.$loadsh.cloneDeep(node)
|
const obj = this.$loadsh.cloneDeep(node)
|
||||||
delete obj.x
|
delete obj.x
|
||||||
delete obj.y
|
delete obj.y
|
||||||
delete obj.center
|
delete obj.center
|
||||||
@@ -1762,7 +1768,10 @@ export default {
|
|||||||
const domRect = dom ? dom.getBoundingClientRect() : {}
|
const domRect = dom ? dom.getBoundingClientRect() : {}
|
||||||
getTopology(this.topologyIndex).canvasPos = domRect
|
getTopology(this.topologyIndex).canvasPos = domRect
|
||||||
if (this.fromOverView) {
|
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
|
let flag = false
|
||||||
const position = {
|
const position = {
|
||||||
|
|||||||
@@ -713,7 +713,10 @@ export default {
|
|||||||
if (!getTopology(this.topologyIndex)) {
|
if (!getTopology(this.topologyIndex)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
getTopology(this.topologyIndex).open(data || {})
|
if (!data.pens) {
|
||||||
|
data.pens = []
|
||||||
|
}
|
||||||
|
getTopology(this.topologyIndex).open(data)
|
||||||
getTopology(this.topologyIndex).lock(1)
|
getTopology(this.topologyIndex).lock(1)
|
||||||
this.objChange = false
|
this.objChange = false
|
||||||
let flag = false
|
let flag = false
|
||||||
@@ -1646,7 +1649,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
onUpdateProps (node) { // 更新pen
|
onUpdateProps (node) { // 更新pen
|
||||||
let obj = this.$loadsh.cloneDeep(node)
|
const obj = this.$loadsh.cloneDeep(node)
|
||||||
console.log(obj)
|
console.log(obj)
|
||||||
delete obj.x
|
delete obj.x
|
||||||
delete obj.y
|
delete obj.y
|
||||||
@@ -2231,7 +2234,10 @@ export default {
|
|||||||
let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
|
let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
|
||||||
getTopology(this.topologyIndex).canvasPos = domRect
|
getTopology(this.topologyIndex).canvasPos = domRect
|
||||||
if (this.fromOverView) {
|
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
|
let flag = false
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div style="height: 100%">
|
||||||
<el-table
|
<el-table
|
||||||
id="roleTable"
|
id="roleTable"
|
||||||
ref="dataTable"
|
ref="dataTable"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div height="100%">
|
<div style="height: 100%">
|
||||||
<el-table
|
<el-table
|
||||||
id="userTable"
|
id="userTable"
|
||||||
ref="dataTable"
|
ref="dataTable"
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
<div v-else> </div>
|
<div v-else> </div>
|
||||||
</template>
|
</template>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
Reference in New Issue
Block a user