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

fix：修改 chart diagram打不开的问题

Browse Source
This commit is contained in:
zhangyu
2022-09-02 09:44:16 +08:00
parent 0ff2eec5eb
commit dd8e18afd9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -154,10 +154,9 @@
<CanvasContextMenu :index="topologyIndexF" :props.sync="props"></CanvasContextMenu> <CanvasContextMenu :index="topologyIndexF" :props.sync="props"></CanvasContextMenu>
</div> </div>
<!--所有节点上的小图标--> <!--所有节点上的小图标-->
<div v-for="(item,index) in nodesArr" v-if="!editTopologyFlag&&item.data.iconToolState&&!fromPrev" <div v-for="(item,index) in nodesArr"
:key="index" :key="index"
v-show="(item.rect.y - (48*(fromOverView?penToolTipScale:1)) > -10) && (item.rect.center.x - (24*(fromOverView?penToolTipScale:1)) > - 10)" v-if="false"
:style="{position: 'absolute',top:item.rect.y - (48*(fromOverView?penToolTipScale:1))+'px',left:item.rect.center.x - (24*(fromOverView?penToolTipScale:1)) +'px',transform:'scale('+(fromOverView?penToolTipScale:1)+')'}"
class="network-pop" class="network-pop"
> >
@@ -696,7 +695,8 @@ export default {
if (this.fromTopologyDialog && !this.isPreview) { if (this.fromTopologyDialog && !this.isPreview) {
setTimeout(() => { setTimeout(() => {
this.topologyLoading = false this.topologyLoading = false
getTopology(this.topologyIndex).open(data) console.log(data)
getTopology(this.topologyIndex).open(data || {})
getTopology(this.topologyIndex).centerView() getTopology(this.topologyIndex).centerView()
getTopology(this.topologyIndex).resize() getTopology(this.topologyIndex).resize()
this.editTopology() this.editTopology()
@@ -706,7 +706,7 @@ export default {
if (!getTopology(this.topologyIndex)) { if (!getTopology(this.topologyIndex)) {
return return
} }
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
let flag = false let flag = false
@@ -852,7 +852,8 @@ export default {
gridSize: 10, gridSize: 10,
gridColor: '#ededed', gridColor: '#ededed',
lineWidth: 1, lineWidth: 1,
ruleColor: '#4e4e4e' ruleColor: '#4e4e4e',
pens:[]
} }
this.projectInfoShow = true this.projectInfoShow = true
this.projectAlertShow = true this.projectAlertShow = true
@@ -1750,7 +1751,7 @@ 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) getTopology(this.topologyIndex).open(this.oldTopologyData || {})
} }
let flag = false let flag = false
const position = { const position = {

4
nezha-fronted/src/components/common/project/L5/services/canvas.js
View File

@@ -176,7 +176,7 @@ export const imageTemp = {
} }
} }
export const imageTemp2 = { export const imageTemp2 = {
name: 'rectangleImg', name: 'rectangleImg2',
icon: 'icon-image', icon: 'icon-image',
data: { data: {
type: 0, type: 0,
@@ -193,7 +193,7 @@ export const imageTemp2 = {
color: '#000000', color: '#000000',
background: '#ffffff00', background: '#ffffff00',
animatePos: 0, animatePos: 0,
name: 'rectangleImg', name: 'rectangleImg2',
lineDashOffset: 0, lineDashOffset: 0,
text: '', text: '',
textOffsetX: 0, textOffsetX: 0,

5
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -713,7 +713,7 @@ export default {
if (!getTopology(this.topologyIndex)) { if (!getTopology(this.topologyIndex)) {
return return
} }
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
let flag = false let flag = false
@@ -1551,7 +1551,6 @@ export default {
break break
} }
case 'scale': { case 'scale': {
let dom = document.getElementById('topology-canvas' + this.topologyIndexF) let dom = document.getElementById('topology-canvas' + this.topologyIndexF)
let domRect = dom ? dom.getBoundingClientRect() : {} let domRect = dom ? dom.getBoundingClientRect() : {}
if (getTopology(this.topologyIndex)) { if (getTopology(this.topologyIndex)) {
@@ -2222,7 +2221,7 @@ 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) getTopology(this.topologyIndex).open(this.oldTopologyData || {})
} }
let flag = false let flag = false