NEZ-784 NEZ-770 :endpoint 名字拼接后过长从中间截取一部分 ,以及新增 Diagram 图表类型

This commit is contained in:
zhangyu
2021-07-01 19:15:08 +08:00
parent b2e6175cca
commit c778cf2eb4
10 changed files with 407 additions and 195 deletions

View File

@@ -6,7 +6,7 @@
<div class="project-box list-page" v-loading="topologyLoading" v-has="'topo_list'">
<div class="main-list">
<div class="main-container" :class="fromOverView?'from-overview':'from-project'" style="background: #fff">
<div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);">
<div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);display: inline-block">
<!--工具栏-->
<span v-if="!isPreview" class="project-topology-tool">
<el-dropdown trigger="click" size="small" placement="bottom-start" v-has="'topo_icon_list'">
@@ -202,11 +202,11 @@
<!--节点连线相关的 tooltip-->
<div v-if="tooltipPosition.show&&!editTopologyFlag"
ref="topoTooltip"
:style="{position:'absolute',top:tooltipPosition.top+'px',left:tooltipPosition.left+'px','z-index':10,height:tooltipPosition.height+'px'}"
:style="{position:isScreen?'fixed' : 'absolute',top:tooltipPosition.top+'px',left:tooltipPosition.left+'px','z-index':10,height:tooltipPosition.height+'px'}"
@mouseout="tooltipOut"
@mouseover="tooltipOver"
>
<topoTooltip :chartDataParent="chartData" :filterTime="filterTime"/>
<topoTooltip :chartDataParent="chartData" :filterTime="filterTime" :isPanel="isPanel"/>
</div>
</div>
<!--endpoint-->
@@ -517,6 +517,14 @@ export default {
fromTopologyDialog: {
type: Boolean,
default: false
},
isPanel: {
type: Boolean,
default: false
},
isScreen: {
type: Boolean,
default: false
}
},
watch: {
@@ -1138,6 +1146,7 @@ export default {
setTimeout(() => {
this.tooltipPosition.show = true
const ePosition = window.ePosition
console.log(ePosition)
const boxWidth = document.getElementsByClassName('page')[0].offsetWidth
const boxHeight = document.getElementsByClassName('page')[0].offsetHeight
this.tooltipPosition.left = ePosition.layerX + 20
@@ -1155,6 +1164,10 @@ export default {
this.tooltipPosition.top = ePosition.layerY - this.$refs.topoTooltip.offsetHeight
}
}
if (this.isScreen) {
this.tooltipPosition.left = ePosition.offsetX + 50
this.tooltipPosition.top = ePosition.offsetY + 80
}
})
}, 100)
break
@@ -1753,6 +1766,14 @@ export default {
return true
}
})
item.data.expressAllArr = item.data.expressAllArr.filter((expression, i) => {
if (!expression) {
item.data.legendsAll.splice(i, 1)
return false
} else {
return true
}
})
})
if (this.penToolTipScale == getTopology(this.topologyIndex).data.scale) {
getTopology(this.topologyIndex).data.scale = this.oldScale