Commit 015d8a1f authored by campaign's avatar campaign

Merge remote-tracking branch 'origin/dev' into dev

parents 53a7ccc6 583ab19d
......@@ -465,8 +465,8 @@ KityMinder.registerModule( "LayoutDefault", function () {
translateNode( set[ i ] );
updateConnectAndshIcon( set[ i ] );
}
if(this.isNodeSelected(node)){
this.highlightNode(node)
if ( this.isNodeSelected( node ) ) {
this.highlightNode( node )
}
},
initStyle: function () {
......@@ -514,10 +514,22 @@ KityMinder.registerModule( "LayoutDefault", function () {
if ( historyPoint ) {
_root.setPoint( historyPoint );
}
//重组结构
for ( var j = 0; j < _cleanbuffer.length; j++ ) {
this.appendChildNode( _cleanbuffer[ j ].getLayout().parent, _cleanbuffer[ j ] );
var j = 0;
var me = this;
var ITV = window.setInterval( function () {
for ( var k = 0; k < 50; k++ ) {
me.appendChildNode( _cleanbuffer[ j ].getLayout().parent, _cleanbuffer[ j ] );
j++;
if ( j === _cleanbuffer.length ) break;
}
if ( j === _cleanbuffer.length ) {
window.clearInterval( ITV );
}
}, 0 );
//重组结构
// for ( var j = 0; j < _cleanbuffer.length; j++ ) {
// this.appendChildNode( _cleanbuffer[ j ].getLayout().parent, _cleanbuffer[ j ] );
// }
_root.setPoint( _root.getLayout().x, _root.getLayout().y );
},
appendChildNode: function ( parent, node, focus, sibling ) {
......
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