Merge branch 'dev' of https://github.com/fex-team/kityminder-core into dev

src/core/layout.js

@@ -509,7 +509,7 @@ define(function(require, exports, module) {
             }
             apply(root, root.parent ? root.parent.getGlobalLayoutTransform() : new kity.Matrix());
             return this;
-        },
+        }
     });
 
     module.exports = Layout;

src/module/expand.js

@@ -77,7 +77,8 @@ define(function(require, exports, module) {
             },
 
             queryState: function(km) {
-                return km.getSelectedNode() ? 0 : -1;
+                var node = km.getSelectedNode();
+                return node && !node.isRoot() && !node.isExpanded() ? 0 : -1;
             }
         });
 
@@ -100,6 +101,31 @@ define(function(require, exports, module) {
             enableReadOnly: true
         });
 
+        /**
+         * @command Collapse
+         * @description 收起当前节点的子树
+         * @state
+         *   0: 当前有选中的节点
+         *  -1: 当前没有选中的节点
+         */
+        var CollapseCommand = kity.createClass('CollapseCommand', {
+            base: Command,
+
+            execute: function(km) {
+                var node = km.getSelectedNode();
+                if (!node) return;
+
+                node.collapse();
+                node.renderTree();
+                km.layout();
+            },
+
+            queryState: function(km) {
+                var node = km.getSelectedNode();
+                return node && !node.isRoot() && node.isExpanded() ? 0 : -1;
+            }
+        });
+
         var Expander = kity.createClass('Expander', {
             base: kity.Group,
 
@@ -175,10 +201,12 @@ define(function(require, exports, module) {
                 this.expander.setTranslate(position);
             }
         });
+
         return {
             commands: {
                 'expand': ExpandCommand,
-                'expandtolevel': ExpandToLevelCommand
+                'expandtolevel': ExpandToLevelCommand,
+                'collapse': CollapseCommand
             },
             events: {
                 'layoutapply': function(e) {

src/module/priority.js

@@ -117,7 +117,7 @@ define(function(require, exports, module) {
         });
         return {
             'commands': {
-                'priority': PriorityCommand,
+                'priority': PriorityCommand
             },
             'renderers': {
                 left: kity.createClass('PriorityRenderer', {