Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev

designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java

@@ -198,6 +198,7 @@ public class ActiveKeyGenerator {
 		if (!StableUtils.isNum(charStr)) {
 			return 0;
 		}
+
 		return Character.getNumericValue(charStr);
 	}
 	

designer_form/build.gradle

@@ -30,11 +30,10 @@ FileTree files =fileTree(dir:'./',include:'build.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
-
 //ÉùÃ÷ÍⲿÒÀÀµ
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
@@ -63,6 +62,7 @@ task copyFile(type:Copy,dependsOn:compileJava){
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {
+
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}