by zhanyi

src/module/editor.js

@@ -83,7 +83,43 @@ KityMinder.registerModule( "TextEditModule", function () {
             },
             'stopTextEdit':function(){
                 sel.setHide();
+                receiver.clear().setTextEditStatus(false);
+            },
+            'execCommand':function(e){
+                var cmds = {
+                    'appendchildnode':1,
+                    'appendsiblingnode':1
+                };
+                if(cmds[e.commandName]){
+
+                    var node = km.getSelectedNode();
+
+                    var textShape = node.getTextShape();
+
+                    textShape.setStyle('cursor','default');
+                    node.getTextShape().setStyle('cursor','text');
+                    receiver.setTextEditStatus(true)
+                        .setSelection(sel)
+                        .setKityMinder(this)
+                        .setMinderNode(node)
+                        .setTextShape(textShape)
+                        .setBaseOffset()
+                        .setContainerStyle()
+                        .setSelectionHeight()
+                        .getTextOffsetData()
+                        .setIndex(0)
+                        .updateSelection()
+                        .setRange(range);
+
+                    sel.setStartOffset(0);
+                    sel.setEndOffset(textShape.getContent().length);
+                    sel.setShow();
 
+                    receiver.updateSelectionShow(1)
+                        .updateRange(range);
+
+
+                }
             }
         }
     };

src/module/editor.receiver.js

@@ -77,8 +77,10 @@ Minder.Receiver = kity.createClass('Receiver',{
                     switch(keyCode){
                         case keymap.Enter:
                         case keymap.Tab:
-                            this.setTextEditStatus(false);
-                            this.clear();
+                            if(this.keydownNode === this.minderNode){
+                                this.setTextEditStatus(false);
+                                this.clear();
+                            }
                             e.preventDefault();
                             return;
                         case keymap.Shift:
@@ -263,5 +265,9 @@ Minder.Receiver = kity.createClass('Receiver',{
         range.setEnd(node,this.selection.endOffset);
         range.select();
         return this;
+    },
+    setIndex:function(index){
+        this.index = index;
+        return this
     }
 });
\ No newline at end of file

src/module/keyboard.js

@@ -67,6 +67,7 @@ KityMinder.registerModule( "KeyboardModule", function () {
                 buildPositionNetwork( this.getRoot() );
             },
             keydown: function ( e ) {
+
                 var keys = KityMinder.keymap;
                 if ( this.receiver.isTextEditStatus() ) {
                     switch ( e.originEvent.keyCode ) {
@@ -85,6 +86,8 @@ KityMinder.registerModule( "KeyboardModule", function () {
                     }
                     return;
                 }
+                var node = e.getTargetNode();
+                this.receiver.keydownNode = node;
                 switch ( e.originEvent.keyCode ) {
                 case keys.Enter:
                     this.execCommand( 'appendSiblingNode', new MinderNode( 'Topic' ) );