Commit 8059418b authored by techird's avatar techird

dist

parent 45c12eac
...@@ -2665,9 +2665,11 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -2665,9 +2665,11 @@ KityMinder.registerModule( "LayoutDefault", function () {
Layout.connect = null; Layout.connect = null;
Layout.shicon = null; Layout.shicon = null;
} else { } else {
try {
_buffer[ 0 ].getRenderContainer().remove(); _buffer[ 0 ].getRenderContainer().remove();
Layout.connect.remove(); Layout.connect.remove();
if ( Layout.shicon ) Layout.shicon.remove(); if ( Layout.shicon ) Layout.shicon.remove();
} catch ( error ) {}
} }
_buffer = _buffer.concat( _buffer[ 0 ].getChildren() ); _buffer = _buffer.concat( _buffer[ 0 ].getChildren() );
_buffer.shift(); _buffer.shift();
...@@ -3327,6 +3329,7 @@ var ViewDragger = kity.createClass( "ViewDragger", { ...@@ -3327,6 +3329,7 @@ var ViewDragger = kity.createClass( "ViewDragger", {
if ( dragger.isEnabled() ) { if ( dragger.isEnabled() ) {
lastPosition = e.getPosition(); lastPosition = e.getPosition();
e.stopPropagation(); e.stopPropagation();
e.originEvent.preventDefault();
} }
// 点击未选中的根节点临时开启 // 点击未选中的根节点临时开启
else if ( e.getTargetNode() == this.getRoot() && else if ( e.getTargetNode() == this.getRoot() &&
...@@ -5475,15 +5478,15 @@ KM.ui.define('dropmenu', { ...@@ -5475,15 +5478,15 @@ KM.ui.define('dropmenu', {
}); });
return this; return this;
}, },
show:function(){ // show:function(){
if(this.trigger('beforeshow') === false){ // if(this.trigger('beforeshow') === false){
return; // return;
}else{ // }else{
this.root().css({display:'block'}); // this.root().css({display:'block'});
this.trigger('aftershow'); // this.trigger('aftershow');
} // }
return this; // return this;
}, // },
init: function (options) { init: function (options) {
var me = this; var me = this;
var eventName = { var eventName = {
......
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