merge from panzheng

demo/dev.html

@@ -9,7 +9,9 @@
     
 </body>
 <script>
-    minder = new km.KityMinder();
+    minder = new KityMinder.Minder(null,{
+        
+    });
 
     minder.importData({
         data: {
@@ -38,6 +40,6 @@
             }]
         }]
     });
-    minder.update();
+    minder.execCommand( 'renderroot' );
 </script>
 </html>
\ No newline at end of file

dist/dev.php

@@ -3,9 +3,16 @@
 $dependency = Array(
     'src/core/km.js',
     'src/core/command.js',
-    'src/core/mindernode.js',
-    'src/core/minderevent.js',
-    'src/core/kityminder.js',
+    'src/core/node.js',
+    'src/core/module.js',
+    'src/core/event.js',
+    'src/core/minder.js',
+    'src/core/minder.data.js',
+    'src/core/minder.event.js',
+    'src/core/minder.module.js',
+    'src/core/minder.command.js',
+    'src/core/minder.node.js',
+    'src/core/minder.select.js',
     'src/module/connect.js',
     'src/module/history.js',
     'src/module/icon.js',

src/core/minder.command.js

 kity.extendClass( Minder, {
+	_getCommand: function ( name ) {
+		return this._commands[ name.toLowerCase() ];
+	},
+	_getQuery: function ( name ) {
+		if ( !this._query[ name ] ) {
+			var Cmd = this._getCommand( name );
+			this._query[ name ] = new Cmd();
+		}
+		return this._query[ name ];
+	},
+	_queryCommand: function ( name, type ) {
+		var me = this;
+		var query = this._getQuery( name );
+		var queryFunc = query[ name ][ "state" + type ];
+		if ( queryFunc ) {
+			return queryFunc( me );
+		} else {
+			return 0;
+		}
+	},
 	execCommand: function ( name ) {
 		var TargetCommand, command, cmdArgs, eventParams, stoped;
 
 		TargetCommand = this._getCommand( name );
+		if ( !TargetCommand ) {
+			return false;
+		}
 		command = new TargetCommand();
 
 		cmdArgs = Array.prototype.slice.call( arguments, 1 );
@@ -33,6 +56,7 @@ kity.extendClass( Minder, {
 				if ( command.isSelectionChanged() ) {
 					this._firePharse( new MinderEvent( 'selectionchange' ) );
 				}
+				this._firePharse( new MinderEvent( 'interactchange' ) );
 			}
 
 			this._executingCommand = null;
@@ -42,31 +66,10 @@ kity.extendClass( Minder, {
 	},
 
 	queryCommandState: function ( name ) {
-		if ( !_commands[ name.toLowerCase() ] ) {
-			return false;
-		}
-		if ( !_query[ name ] ) {
-			_query[ name ] = new _commands[ name ]();
-		}
-		if ( _query[ name ].queryState ) {
-			return _query[ name ].queryState( this );
-		} else {
-			return 0;
-		}
+		return this._queryCommand( name, "State" );
 	},
 
 	queryCommandValue: function ( name ) {
-		if ( !_commands[ name.toLowerCase() ] ) {
-			return false;
-		}
-		if ( !_query[ name ] ) {
-			_query[ name ] = new _commands[ name ]();
-		}
-		if ( _query[ name ].queryValue ) {
-			return _query[ name ].queryValue( this );
-		} else {
-			return 0;
-		}
-
+		return this._queryCommand( name, "Value" );
 	}
 } );
\ No newline at end of file

src/core/minder.js

@@ -16,6 +16,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
         options = Utils.extend( KITYMINDER_CONFIG || {}, MinderDefaultOptions, options || {} );
         // 初始化
         this._initMinder( options );
+        this._initEvents();
         this._initModules( options );
     },
 

src/core/minder.module.js

 // 模块声明周期维护
 kity.extendClass( Minder, {
-    _initModules: function () {
+    _initModules: function ( option ) {
+        this._commands = {};
+        this._query = {};
         var _modules = KityMinder.getModules();
+        var _modulesList = ( function () {
+            var _list = [];
+            for ( var key in _modules ) {
+                _list.push( key );
+            }
+            return _list;
+        } )();
+        var _configModules = option.modules || _modulesList;
         if ( _modules ) {
             var me = this;
-            for ( var key in _modules ) {
+            for ( var i = 0; i < _configModules.length; i++ ) {
+                var key = _configModules[ i ];
                 //执行模块初始化，抛出后续处理对象
                 var moduleDeals = _modules[ key ].call( me );
 
@@ -16,7 +27,7 @@ kity.extendClass( Minder, {
                 var moduleDealsCommands = moduleDeals.commands;
                 if ( moduleDealsCommands ) {
                     for ( var _keyC in moduleDealsCommands ) {
-                        _commands[ _keyC ] = moduleDealsCommands[ _keyC ];
+                        this._commands[ _keyC ] = moduleDealsCommands[ _keyC ];
                     }
                 }
 

src/core/minder.node.js

@@ -25,7 +25,7 @@ kity.extendClass( Minder, {
     },
 
     update: function ( node ) {
-        this.execCommand( 'renderroot', node );
         return this;
     }
+
 } );
\ No newline at end of file

src/core/node.js

-var MinderNode = km.MinderNode = kity.createClass( "MinderNode", {
+var MinderNode = KityMinder.MinderNode = kity.createClass( "MinderNode", {
     constructor: function ( treeNotifyHandler ) {
         this.parent = null;
         this.children = [];