Fangjie Hu 8 years ago
parent
commit
b0d5500ddf
  1. 1
      designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java
  2. 4
      designer_form/build.gradle

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

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

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

Loading…
Cancel
Save