Commit dcd8109d authored by Asjoker's avatar Asjoker

feat: 拓扑图 - 自适应高宽 & 标签页图标修改

parent f42530d5
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
sendThis, // 暴露函数 sendThis, // 暴露函数
name: 'click-event-edit', name: 'click-event-edit',
options: { options: {
getEvents () { getEvents() {
return { return {
'node:click': 'onNodeClick', 'node:click': 'onNodeClick',
'node:contextmenu': 'onNodeRightClick', 'node:contextmenu': 'onNodeRightClick',
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
'canvas:click': 'onCanvasClick' 'canvas:click': 'onCanvasClick'
} }
}, },
onNodeClick (event) { onNodeClick(event) {
// todo..."selected"是g6自带的状态,在"drag-add-edge"中的"node:mouseup"事件也会触发,故此处不需要设置"selected"状态 // todo..."selected"是g6自带的状态,在"drag-add-edge"中的"node:mouseup"事件也会触发,故此处不需要设置"selected"状态
// let clickNode = event.item; // let clickNode = event.item;
// clickNode.setState('selected', !clickNode.hasState('selected')); // clickNode.setState('selected', !clickNode.hasState('selected'));
...@@ -35,19 +35,19 @@ export default { ...@@ -35,19 +35,19 @@ export default {
vm.rightMenuShow = false vm.rightMenuShow = false
this.updateVmData(event) this.updateVmData(event)
}, },
onNodeRightClick (event) { onNodeRightClick(event) {
let graph = vm.graph const graph = vm.graph
let clickNode = event.item const clickNode = event.item
let clickNodeModel = clickNode.getModel() const clickNodeModel = clickNode.getModel()
let selectedNodes = graph.findAllByState('node', 'selected') const selectedNodes = graph.findAllByState('node', 'selected')
let selectedNodeIds = selectedNodes.map(item => { const selectedNodeIds = selectedNodes.map(item => {
return item.getModel().id return item.getModel().id
}) })
vm.selectedNode = clickNode vm.selectedNode = clickNode
// 如果当前点击节点是之前选中的某个节点,就进行下面的处理 // 如果当前点击节点是之前选中的某个节点,就进行下面的处理
if (selectedNodes.length > 1 && selectedNodeIds.indexOf(clickNodeModel.id) > -1) { if (selectedNodes.length > 1 && selectedNodeIds.indexOf(clickNodeModel.id) > -1) {
vm.rightMenuShow = true vm.rightMenuShow = true
let rightMenu = vm.$refs.rightMenu const rightMenu = vm.$refs.rightMenu
rightMenu.style.left = event.clientX + 'px' rightMenu.style.left = event.clientX + 'px'
rightMenu.style.top = event.clientY + 'px' rightMenu.style.top = event.clientY + 'px'
} else { } else {
...@@ -64,17 +64,17 @@ export default { ...@@ -64,17 +64,17 @@ export default {
} }
graph.paint() graph.paint()
}, },
onEdgeClick (event) { onEdgeClick(event) {
let clickEdge = event.item const clickEdge = event.item
clickEdge.setState('selected', !clickEdge.hasState('selected')) clickEdge.setState('selected', !clickEdge.hasState('selected'))
vm.currentFocus = 'edge' vm.currentFocus = 'edge'
this.updateVmData(event) this.updateVmData(event)
}, },
onEdgeRightClick (event) { onEdgeRightClick(event) {
let graph = vm.graph const graph = vm.graph
let clickEdge = event.item const clickEdge = event.item
let clickEdgeModel = clickEdge.getModel() const clickEdgeModel = clickEdge.getModel()
let selectedEdges = graph.findAllByState('edge', 'selected') const selectedEdges = graph.findAllByState('edge', 'selected')
// 如果当前点击节点不是之前选中的单个节点,才进行下面的处理 // 如果当前点击节点不是之前选中的单个节点,才进行下面的处理
if (!(selectedEdges.length === 1 && clickEdgeModel.id === selectedEdges[0].getModel().id)) { if (!(selectedEdges.length === 1 && clickEdgeModel.id === selectedEdges[0].getModel().id)) {
// 先取消所有节点的选中状态 // 先取消所有节点的选中状态
...@@ -88,31 +88,31 @@ export default { ...@@ -88,31 +88,31 @@ export default {
} }
// let point = { x: event.x, y: event.y } // let point = { x: event.x, y: event.y }
}, },
onComboClick (event) { onComboClick(event) {
vm.currentFocus = 'combo' vm.currentFocus = 'combo'
this.updateVmData(event) this.updateVmData(event)
}, },
onComboRightClick (event) { onComboRightClick(event) {
vm.rightMenuShow = true vm.rightMenuShow = true
let rightMenu = vm.$refs.rightMenu const rightMenu = vm.$refs.rightMenu
rightMenu.style.left = event.clientX + 'px' rightMenu.style.left = event.clientX + 'px'
rightMenu.style.top = event.clientY + 'px' rightMenu.style.top = event.clientY + 'px'
vm.currentFocus = 'combo' vm.currentFocus = 'combo'
this.updateVmData(event) this.updateVmData(event)
}, },
onCanvasClick () { onCanvasClick() {
vm.currentFocus = 'canvas' vm.currentFocus = 'canvas'
vm.rightMenuShow = false vm.rightMenuShow = false
}, },
updateVmData (event) { updateVmData(event) {
if (event.item._cfg.type === 'node') { if (event.item._cfg.type === 'node') {
// 更新vm的data: selectedNode 和 selectedNodeParams // 更新vm的data: selectedNode 和 selectedNodeParams
let clickNode = event.item const clickNode = event.item
if (clickNode.hasState('selected')) { if (clickNode.hasState('selected')) {
let clickNodeModel = clickNode.getModel() const clickNodeModel = clickNode.getModel()
vm.selectedNode = clickNode vm.selectedNode = clickNode
let nodeAppConfig = { ...vm.nodeAppConfig } const nodeAppConfig = { ...vm.nodeAppConfig }
Object.keys(nodeAppConfig).forEach(function (key) { Object.keys(nodeAppConfig).forEach(function(key) {
nodeAppConfig[key] = '' nodeAppConfig[key] = ''
}) })
vm.selectedNodeParams = { vm.selectedNodeParams = {
...@@ -122,12 +122,12 @@ export default { ...@@ -122,12 +122,12 @@ export default {
} }
} else if (event.item._cfg.type === 'edge') { } else if (event.item._cfg.type === 'edge') {
// 更新vm的data: selectedEdge 和 selectedEdgeParams // 更新vm的data: selectedEdge 和 selectedEdgeParams
let clickEdge = event.item const clickEdge = event.item
if (clickEdge.hasState('selected')) { if (clickEdge.hasState('selected')) {
let clickEdgeModel = clickEdge.getModel() const clickEdgeModel = clickEdge.getModel()
vm.selectedEdge = clickEdge vm.selectedEdge = clickEdge
let edgeAppConfig = { ...vm.edgeAppConfig } const edgeAppConfig = { ...vm.edgeAppConfig }
Object.keys(edgeAppConfig).forEach(function (key) { Object.keys(edgeAppConfig).forEach(function(key) {
edgeAppConfig[key] = '' edgeAppConfig[key] = ''
}) })
vm.selectedEdgeParams = { vm.selectedEdgeParams = {
...@@ -137,8 +137,8 @@ export default { ...@@ -137,8 +137,8 @@ export default {
} }
} else if (event.item._cfg.type === 'combo') { } else if (event.item._cfg.type === 'combo') {
// 更新vm的data: selectedCombo 和 selectedComboParams // 更新vm的data: selectedCombo 和 selectedComboParams
let clickCombo = event.item const clickCombo = event.item
let clickComboModel = clickCombo.getModel() const clickComboModel = clickCombo.getModel()
vm.selectedCombo = clickCombo vm.selectedCombo = clickCombo
vm.selectedComboParams = { vm.selectedComboParams = {
label: clickComboModel.label || '', label: clickComboModel.label || '',
......
This diff is collapsed.
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>monitorLogo.png"> <link rel="icon" href="<%= BASE_URL %>rongchuanglogo.png">
<!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">--> <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">-->
<!-- <title><%= webpackConfig.name %></title>--> <!-- <title><%= webpackConfig.name %></title>-->
<title>网络设备监控管理平台</title> <title>网络设备监控管理平台</title>
......
...@@ -632,7 +632,10 @@ export default { ...@@ -632,7 +632,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.el-container { .el-container {
height: 900px!important; position: absolute;
width: calc(100vw - 228px);
height: calc(92.4vh - 95px);
padding: 0 10px;
.el-header { .el-header {
line-height: 60px; line-height: 60px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment