Commit 3d090a41 authored by wangqinghua's avatar wangqinghua

style update

parent 57a67aa7
...@@ -47,32 +47,32 @@ TopologyPanel.prototype.resetTopology = function (url) { ...@@ -47,32 +47,32 @@ TopologyPanel.prototype.resetTopology = function (url) {
* @param backImg 拓扑图的背景图片 * @param backImg 拓扑图的背景图片
*/ */
TopologyPanel.prototype.loadTopology = function (response, topologyGuid, backImg,canvasWidth,canvasHeight) { TopologyPanel.prototype.loadTopology = function (response, topologyGuid, backImg,canvasWidth,canvasHeight) {
// 错误处理 // 错误处理
if (!response) { if (!response) {
// 拓扑不存在,创建一个空白的拓扑图 // 拓扑不存在,创建一个空白的拓扑图
var initTopologyJson = { var initTopologyJson = {
'version': '0.4.8', 'version': '0.4.8',
'wheelZoom': 0.95, 'wheelZoom': 0.95,
'width': 972, 'width': 972,
'height': 569, 'height': 569,
'id': 'ST172.19.105.52015100809430700001', 'id': 'ST172.19.105.52015100809430700001',
'childs': [ 'childs': [
{ {
'elementType': 'scene', 'elementType': 'scene',
'id': 'S172.19.105.52015100809430700002', 'id': 'S172.19.105.52015100809430700002',
'translateX': -121.82, 'translateX': -121.82,
'translateY': 306.72, 'translateY': 306.72,
'scaleX': 1.26, 'scaleX': 1.26,
'scaleY': 1.26, 'scaleY': 1.26,
'childs': [] 'childs': []
}
]
} }
editor.init(topologyGuid, backImg, initTopologyJson,canvasWidth,canvasHeight) ]
} else { }
// 拓扑存在,渲染拓扑图 editor.init(topologyGuid, backImg, initTopologyJson,canvasWidth,canvasHeight)
editor.init(topologyGuid, backImg, response,canvasWidth,canvasHeight) } else {
} // 拓扑存在,渲染拓扑图
editor.init(topologyGuid, backImg, response,canvasWidth,canvasHeight)
}
} }
/** /**
...@@ -550,22 +550,26 @@ TopologyEditor.prototype.init = function (topologyGuid, backImg, topologyJson,ca ...@@ -550,22 +550,26 @@ TopologyEditor.prototype.init = function (topologyGuid, backImg, topologyJson,ca
// 鼠标进入事件 // 鼠标进入事件
this.scene.mouseover(function (event) { this.scene.mouseover(function (event) {
console.log(event.target)
Timer.start() Timer.start()
// 进入某个节点 // 进入某个节点
if (event.target != null && event.target instanceof JTopo.Node && event.target.nodeTooltip && editor.stageMode !== 'edit') { if (event.target != null && event.target instanceof JTopo.Node && event.target.description && editor.stageMode !== 'edit') {
$('.node-tooltip span').html(event.target.nodeTooltip) console.log('scene.mouseover.target')
$('.node-infobox span').html(event.target.description);
// 记录鼠标触发位置在canvas中的相对位置 // 记录鼠标触发位置在canvas中的相对位置
var menuY = event.layerY ? event.layerY : event.offsetY var menuY = event.layerY ? event.layerY : event.offsetY
var menuX = event.layerX ? event.layerX : event.offsetX var menuX = event.layerX ? event.layerX : event.offsetX
// 判断边界出是否能完整显示弹出菜单 // 判断边界出是否能完整显示弹出菜单
if (menuX + $('.node-tooltip').width() >= self.stage.width) { if (menuX + $('.node-infobox').width() >= self.stage.width) {
menuX -= $('.node-tooltip').width() menuX -= $('.node-infobox').width()
} }
if (menuY + $('.node-tooltip').height() >= self.stage.height) { if (menuY + $('.node-infobox').height() >= self.stage.height) {
menuY -= $('.node-tooltip').height() menuY -= $('.node-infobox').height()
} }
$('.link-tooltip').css('display', 'none') $('.link-tooltip').css('display', 'none');
$('.node-tooltip').css({ $('.node-infobox').css({
'display': 'block', 'display': 'block',
'margin-top': menuY, 'margin-top': menuY,
'margin-left': menuX, 'margin-left': menuX,
...@@ -592,6 +596,7 @@ TopologyEditor.prototype.init = function (topologyGuid, backImg, topologyJson,ca ...@@ -592,6 +596,7 @@ TopologyEditor.prototype.init = function (topologyGuid, backImg, topologyJson,ca
'cursor': 'pointer' 'cursor': 'pointer'
}) })
} else { } else {
$('.node-infobox').css('display', 'none')
// 鼠标进入别的地方 // 鼠标进入别的地方
} }
}) })
...@@ -1381,14 +1386,14 @@ editor.utils = { ...@@ -1381,14 +1386,14 @@ editor.utils = {
}, },
// 查找节点,便居中闪动显示 // 查找节点,便居中闪动显示
findNodeAndFlash: function (text) { findNodeAndFlash: function (text) {
if (!text) return if (!text) return;
// var self = this // var self = this
text = text.trim() text = text.trim();
var nodes = editor.stage.find('node[text="' + text + '"]') var nodes = editor.stage.find('node[text="' + text + '"]')
if (nodes.length > 0) { if (nodes.length > 0) {
var node = nodes[0] var node = nodes[0];
this.unSelectAllNodeExcept(node) this.unSelectAllNodeExcept(node)
node.selected = true node.selected = true;
var location = node.getCenterLocation() var location = node.getCenterLocation()
// 查询到的节点居中显示 // 查询到的节点居中显示
editor.stage.setCenter(location.x, location.y) editor.stage.setCenter(location.x, location.y)
......
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