Merge branch 'dev' into gh-pages

configure.js

@@ -63,7 +63,7 @@
         'KITYMINDER_HOME_URL': getKMBasePath(),
         //定义工具栏
         toolbars: [
-            'hand zoom-in zoom-out | undo redo | bold italic | fontfamily fontsize forecolor | saveto | markers | node | layout'
+            'hand zoom-in zoom-out | undo redo | bold italic | fontfamily fontsize forecolor | saveto | markers | node | switchlayout'
         ]
 
         //设置主题

dist/dev.php

@@ -66,6 +66,7 @@ $dependency = Array(
     ,'src/adapter/node.js'
     ,'src/protocal/plain.js'
     ,'src/protocal/json.js'
+    ,'src/protocal/png.js'
 );
 
 $content = "";

lang/zh-cn/zh-cn.js

@@ -16,7 +16,7 @@ KityMinder.LANG[ 'zh-cn' ] = {
         'zoom-in': '放大',
         'zoom-out': '缩小',
         'markers': '添加标签',
-        'layout': '切换主题'
+        'switchlayout': '切换主题'
     },
     'popupcolor': {
         'clearColor': '清空颜色',

src/adapter/layout.js

-KM.registerToolbarUI( 'layout', function ( name ) {
+KM.registerToolbarUI( 'switchlayout', function ( name ) {
+
     var me = this,
         label = me.getLang( 'tooltips.' + name ),
         options = {
@@ -8,7 +9,8 @@ KM.registerToolbarUI( 'layout', function ( name ) {
             items: me.getLayoutStyleItems() || [],
             itemStyles: [],
             value: me.getLayoutStyleItems(),
-            autowidthitem: []
+            autowidthitem: [],
+            enabledRecord:false
         },
         $combox = null;
     if ( options.items.length == 0 ) {
@@ -20,12 +22,25 @@ KM.registerToolbarUI( 'layout', function ( name ) {
     comboboxWidget = $combox.kmui();
 
     comboboxWidget.on( 'comboboxselect', function ( evt, res ) {
-        me.execCommand( "switchlayout", res.value );
+        me.execCommand( name, res.value );
     } ).on( "beforeshow", function () {
         if ( $combox.parent().length === 0 ) {
             $combox.appendTo( me.$container.find( '.kmui-dialog-container' ) );
         }
+
     } );
+    //状态反射
+    me.on( 'interactchange', function () {
+        var state = this.queryCommandState( name ),
+            value = this.queryCommandValue( name );
+        //设置按钮状态
+        comboboxWidget.button().kmui().disabled( state == -1 ).active( state == 1 );
 
+        if ( value ) {
+            //设置label
+            value = value.replace( /['"]/g, '' ).toLowerCase().split( /['|"]?\s*,\s*[\1]?/ );
+            comboboxWidget.selectItemByLabel( value );
+        }
+    } );
     return comboboxWidget.button().addClass( 'kmui-combobox' );
 } );
\ No newline at end of file

src/adapter/saveto.js

@@ -24,11 +24,59 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
         options.autowidthitem.push( $.wordCountAdaptive( text ), true );
     } );
 
+
     //实例化
     $combox = $.kmuibuttoncombobox( options ).css( 'zIndex', me.getOptions( 'zIndex' ) + 1 );
     comboboxWidget = $combox.kmui();
 
     comboboxWidget.on( 'comboboxselect', function ( evt, res ) {
+        if ( res.value === "png" ) {
+            var svghtml = $( "#kityminder .kmui-editor-body" ).html();
+            var rootBox = me.getRoot().getRenderContainer().getRenderBox();
+            var svg = $( svghtml ).attr( {
+                width: rootBox.x + me.getRenderContainer().getWidth() + 20,
+                height: rootBox.y + me.getRenderContainer().getHeight() + 20,
+                viewBox: null
+            } );
+            var div = $( "<div></div>" ).append( svg );
+            svghtml = div.html();
+            var canvas = $( '<canvas style="border:2px solid black;" width="' + svg.attr( "width" ) + '" height="' + svg.attr( "height" ) + '"></canvas>' );
+            var ctx = canvas[ 0 ].getContext( "2d" );
+            var DOMURL = self.URL || self.webkitURL || self;
+            var img = new Image();
+            var svg = new Blob( [ svghtml ], {
+                type: "image/svg+xml;charset=utf-8"
+            } );
+            var url = DOMURL.createObjectURL( svg );
+            img.onload = function () {
+                ctx.drawImage( img, 0, 0 );
+                DOMURL.revokeObjectURL( url );
+                var type = 'png';
+                var imgData = canvas[ 0 ].toDataURL( type );
+                var _fixType = function ( type ) {
+                    type = type.toLowerCase().replace( /jpg/i, 'jpeg' );
+                    var r = type.match( /png|jpeg|bmp|gif/ )[ 0 ];
+                    return 'image/' + r;
+                };
+                imgData = imgData.replace( _fixType( type ), 'image/octet-stream' );
+                var saveFile = function ( data, filename ) {
+                    var save_link = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'a' );
+                    save_link.href = data;
+                    save_link.download = filename;
+
+                    var event = document.createEvent( 'MouseEvents' );
+                    event.initMouseEvent( 'click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null );
+                    save_link.dispatchEvent( event );
+                };
+
+                // 下载后的问题名
+                var filename = 'kityminder_' + ( new Date() ).getTime() + '.' + type;
+                // download
+                saveFile( imgData, filename );
+            };
+            img.src = url;
+            return "png";
+        }
         var data = me.exportData( res.value );
         var p = KityMinder.findProtocal( res.value );
         var a = downloadLink;
@@ -39,15 +87,8 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
         if ( $combox.parent().length === 0 ) {
             $combox.appendTo( me.$container.find( '.kmui-dialog-container' ) );
         }
-        var combox = $combox.kmui();
-
-        combox.traverseItems( function ( label, value ) {
-            if ( me.queryCommandState( value ) == -1 ) {
-                combox.disableItemByLabel( label )
-            } else {
-                combox.enableItemByLabel( label )
-            }
-        } )
+    } ).on( 'aftercomboboxselect', function () {
+        this.setLabelWithDefaultValue();
     } );
 
 

src/module/dragtree.js

@@ -32,7 +32,7 @@ var MoveToParentCommand = kity.createClass( 'MoveToParentCommand', {
 
 
 function boxMapper( node ) {
-	return node.getRenderContainer().getRenderBox();
+	return node.getRenderContainer().getRenderBox( 'top' );
 }
 
 // 对拖动对象的一个替代盒子，控制整个拖放的逻辑，包括：

src/module/editor.js

@@ -12,9 +12,13 @@ KityMinder.registerModule( "TextEditModule", function () {
 
     var lastEvtPosition,dir = 1;
 
+
+
     km.isTextEditStatus = function(){
         return km.receiver.isTextEditStatus();
-    }
+    };
+
+    var selectionByClick = false;
 
     return {
         //插入光标
@@ -25,12 +29,19 @@ KityMinder.registerModule( "TextEditModule", function () {
             'beforemousedown':function(e){
                 sel.setHide();
                 var node = e.getTargetNode();
+                if(!node){
+                    var selectionShape = e.kityEvent.targetShape;
+                    if(selectionShape && selectionShape.getType() == 'Selection'){
+                        selectionByClick = true;
+                        node = selectionShape.getData('relatedNode');
+                        e.stopPropagationImmediately();
+                    }
+                }
                 if(node){
                     var textShape = node.getTextShape();
                     textShape.setStyle('cursor','default');
 
                     if ( this.isSingleSelect() && node.isSelected()) {// && e.kityEvent.targetShape.getType().toLowerCase()== 'text'
-
                         sel.collapse();
                         node.getTextShape().setStyle('cursor','text');
                         receiver.setTextEditStatus(true)
@@ -44,15 +55,24 @@ KityMinder.registerModule( "TextEditModule", function () {
                             .setCurrentIndex(e.getPosition())
                             .updateSelection()
                             .setRange(range);
+                        sel.setData('relatedNode',node);
                         mouseDownStatus = true;
                         lastEvtPosition = e.getPosition();
+                        if(selectionByClick){
+                            sel.setShow();
+                            selectionByClick = false;
+                        }
                     }
                 }
             },
             'mouseup':function(e){
-                if(!sel.collapsed && mouseDownStatus){
+                if(mouseDownStatus){
+                    if(!sel.collapsed ){
                         receiver.updateRange(range)
+                    }else
+                       sel.setShow()
                 }
+
                 mouseDownStatus = false;
                 oneTime = 0;
             },
@@ -62,7 +82,7 @@ KityMinder.registerModule( "TextEditModule", function () {
 
                     var offset = e.getPosition();
 
-                    if(Math.abs(offset.y - lastEvtPosition.y) > 2){
+                    if(Math.abs(offset.y - lastEvtPosition.y) > 2 && Math.abs(lastEvtPosition.x - offset.x) < 1 ){
                         sel.setHide();
                         mouseDownStatus = false;
                         return;
@@ -70,7 +90,7 @@ KityMinder.registerModule( "TextEditModule", function () {
                     dir = offset.x > lastEvtPosition.x  ? 1 : (offset.x  < lastEvtPosition.x ? -1 : dir);
                     receiver.updateSelectionByMousePosition(offset,dir)
                         .updateSelectionShow(dir);
-                    sel.stroke('none',0);
+
                     lastEvtPosition = e.getPosition();
 
                 }

src/module/editor.selection.js

@@ -5,9 +5,9 @@ Minder.Selection = kity.createClass( 'Selection', {
         this.callBase();
         this.height = height || 20;
 
-        this.stroke( color || 'blue', width || 1 );
-        this.width = 1;
-        this.fill('#99C8FF');
+        this.stroke( color || 'rgb(27,171,255)', width || 1 );
+        this.width = 0;
+        this.fill('rgb(27,171,255)');
         this.setHide();
         this.timer = null;
         this.collapsed = true;
@@ -17,7 +17,8 @@ Minder.Selection = kity.createClass( 'Selection', {
     },
     collapse : function(toEnd){
 
-        this.stroke( 'blue', 1 );
+        this.stroke( 'rgb(27,171,255)', 1 );
+        this.setOpacity(1);
         this.width = 1;
         this.collapsed = true;
         if(toEnd){
@@ -38,7 +39,8 @@ Minder.Selection = kity.createClass( 'Selection', {
             return this;
         }
         this.collapsed = false;
-        this.stroke('none');
+        this.stroke('none',0);
+        this.setOpacity(0.5);
         return this;
     },
     setEndOffset:function(offset){
@@ -52,10 +54,14 @@ Minder.Selection = kity.createClass( 'Selection', {
             return this;
         }
         this.collapsed = false;
-        this.stroke('none');
+        this.stroke('none',0);
+        this.setOpacity(0.5);
         return this;
     },
     updateShow : function(offset,width){
+        if(width){
+            this.setShowHold();
+        }
         this.setPosition(offset).setWidth(width);
         return this;
     },

src/module/layout.bottom.js

@@ -464,6 +464,11 @@ KityMinder.registerModule( "LayoutBottom", function () {
 					translateNode( set[ j ] );
 					updateConnectAndshIcon( set[ j ] );
 				}
+				var set1 = updateLayoutMain();
+				for ( var k = 0; k < set1.length; k++ ) {
+					translateNode( set1[ k ] );
+					updateConnectAndshIcon( set1[ k ] );
+				}
 				var _buffer = [ nodes[ 0 ] ];
 				while ( _buffer.length !== 0 ) {
 					_buffer = _buffer.concat( _buffer[ 0 ].getChildren() );

src/module/layout.js

@@ -94,7 +94,10 @@ KityMinder.registerModule( "LayoutModule", function () {
 	var SwitchLayoutCommand = kity.createClass( "SwitchLayoutCommand", ( function () {
 		return {
 			base: Command,
-			execute: switchLayout
+			execute: switchLayout,
+			queryValue: function ( km ) {
+				return km.getCurrentStyle();
+			}
 		};
 	} )() );
 	var AppendChildNodeCommand = kity.createClass( "AppendChildNodeCommand", ( function () {

src/protocal/png.js

+KityMinder.registerProtocal( "png", function () {
+	var LINE_ENDING = '\n',
+		TAB_CHAR = '\t';
+
+	function repeat( s, n ) {
+		var result = "";
+		while ( n-- ) result += s;
+		return result;
+	}
+
+	function encode( json, level ) {
+		var local = "";
+		level = level || 0;
+		local += repeat( TAB_CHAR, level );
+		local += json.data.text + LINE_ENDING;
+		if ( json.children ) {
+			json.children.forEach( function ( child ) {
+				local += encode( child, level + 1 );
+			} );
+		}
+		return local;
+	}
+
+	function isEmpty( line ) {
+		return !/\S/.test( line );
+	}
+
+	function getLevel( line ) {
+		var level = 0;
+		while ( line.charAt( level ) === TAB_CHAR ) level++;
+		return level;
+	}
+
+	function getNode( line ) {
+		return {
+			data: {
+				text: line.replace( new RegExp( '^' + TAB_CHAR + '*' ), '' )
+			}
+		};
+	}
+
+	function decode( local ) {
+		var json,
+			parentMap = {},
+			lines = local.split( LINE_ENDING ),
+			line, level, node;
+
+		function addChild( parent, child ) {
+			var children = parent.children || ( parent.children = [] );
+			children.push( child );
+		}
+
+		for ( var i = 0; i < lines.length; i++ ) {
+			line = lines[ i ];
+			if ( isEmpty( line ) ) continue;
+
+			level = getLevel( line );
+			node = getNode( line );
+
+			if ( level === 0 ) {
+				if ( json ) {
+					throw new Error( 'Invalid local format' );
+				}
+				json = node;
+			} else {
+				if ( !parentMap[ level - 1 ] ) {
+					throw new Error( 'Invalid local format' );
+				}
+				addChild( parentMap[ level - 1 ], node );
+			}
+			parentMap[ level ] = node;
+		}
+		return json;
+	}
+	var lastTry, lastResult;
+
+	function recognize( local ) {
+		if ( !Utils.isString( local ) ) return false;
+		lastTry = local;
+		try {
+			lastResult = decode( local );
+		} catch ( e ) {
+			lastResult = null;
+		}
+		return !!lastResult;
+	}
+	return {
+		fileDescription: 'png',
+		fileExtension: '.png',
+		encode: function ( json ) {
+			return encode( json, 0 );
+		},
+		decode: function ( local ) {
+			if ( lastTry == local && lastResult ) {
+				return lastResult;
+			}
+			return decode( local );
+		},
+		recognize: recognize,
+		recognizePriority: -1
+	};
+} );
\ No newline at end of file

src/ui/combobox.js

@@ -134,9 +134,7 @@
              */
             select: function( index ){
 
-                if(!this.data('options').enabledRecord){
-                    return this;
-                }
+
                 var options = this.data( 'options' ),
                     itemCount = options.itemCount,
                     items = options.autowidthitem;
@@ -166,6 +164,7 @@
 
                 this.trigger( 'changebefore', items[ index ] );
 
+
                 this._update( index );
 
                 this.trigger( 'changeafter', items[ index ] );
@@ -334,6 +333,7 @@
                 var options = this.data("options"),
                     newStack = [];
 
+                if(this.data('options').enabledRecord){
                     $.each( options.recordStack, function( i, item ){
 
                         if( item != index ) {
@@ -350,6 +350,8 @@
                     }
 
                     options.recordStack = newStack;
+                }
+
                 options.selected = index;
 
                 this._repaint();