Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/module/nodetext.js

src/module/layout.bottom.js

@@ -154,7 +154,7 @@ KityMinder.registerModule( "LayoutBottom", function () {
 		default:
 			break;
 		}
-		contRc.setTransform( new kity.Matrix().translate( nodeStyle.padding[ 3 ], nodeStyle.padding[ 0 ] ) );
+		contRc.setTransform( new kity.Matrix().translate( nodeStyle.padding[ 3 ], nodeStyle.padding[ 0 ] + _contRCHeight / 2 ) );
 	};
 	var updateLayoutMain = function () {
 		var _root = minder.getRoot();

src/module/layout.default.js

@@ -176,7 +176,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
 		default:
 			break;
 		}
-		contRc.setTransform( new kity.Matrix().translate( nodeStyle.padding[ 3 ], nodeStyle.padding[ 0 ] ) );
+		contRc.setTransform( new kity.Matrix().translate( nodeStyle.padding[ 3 ], nodeStyle.padding[ 0 ] + _contRCHeight / 2 ) );
 	};
 	//计算节点在垂直方向的位置
 	var updateLayoutVertical = function ( node, parent, action ) {

src/module/nodetext.js

@@ -10,7 +10,7 @@ KityMinder.registerModule( "NodeText", function () {
                 node.getContRc().appendShape( textShape );
                 var style = this.getCurrentLayoutStyle()[node.getType()];
                 textShape.fill(style.color).setSize(style.fontSize);
-                textShape.setPosition(width,textShape.getHeight() * 0.25)
+                textShape.setPosition(width,textShape.getHeight()*.81)
             }
         }
     }