From 4ac3681fce2c8d339e430ba300d308a99bb066fd Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 18:33:47 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 9b4b7eb21..9932a8085 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -31,6 +31,11 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) + +FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar" +jars.each{File file-> +println "-----------this jar path is ${file.path}----------" +} //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') @@ -63,6 +68,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') } } From 978320be1599832be10f1493b64907675efcef65 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 18:52:34 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 9932a8085..492f59c10 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,14 +32,15 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) -FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar" +FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar' + jars.each{File file-> println "-----------this jar path is ${file.path}----------" } //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar' testCompile 'junit:junit:4.12' } From bec91c734689d76738e51de81d1da764848ddaec Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 15 Aug 2016 18:52:37 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=20=E4=BE=9D=E8=B5=96lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java index 084ace48f..8d58515ce 100644 --- a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java +++ b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java @@ -195,7 +195,7 @@ public class ActiveKeyGenerator { //鑾峰彇char瀵瑰簲鐨刬nt鍊 private static int getCharIntValue(char charStr){ - if (!StableUtils.isNum(charStr)) { + if (!BaseUtils.isNum(charStr)) { return 0; } return Character.getNumericValue(charStr); From 8ce3b33f62123d75b057de261be0bdb0058555ff Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 15 Aug 2016 18:53:49 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=20=E4=BE=9D=E8=B5=96lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java index 8d58515ce..39c3faf9f 100644 --- a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java +++ b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java @@ -198,6 +198,7 @@ public class ActiveKeyGenerator { if (!BaseUtils.isNum(charStr)) { return 0; } + return Character.getNumericValue(charStr); } From bd14f453d526802a4bfc72bbccb67367745b70c6 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 18:58:38 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 492f59c10..7a2201ba1 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -40,7 +40,7 @@ println "-----------this jar path is ${file.path}----------" //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar' +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").excludes 'finereport-design-stable/${branchName}/build/libs/*.jar' testCompile 'junit:junit:4.12' } From 038c500b113b7f4cff0b5c267a0d927086544eec Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:01:39 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 7a2201ba1..e71a09a76 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,7 +32,7 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) -FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar' +FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes 'finereport-design-stable/${branchName}/build/libs/*.jar' jars.each{File file-> println "-----------this jar path is ${file.path}----------" @@ -40,7 +40,7 @@ println "-----------this jar path is ${file.path}----------" //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").excludes 'finereport-design-stable/${branchName}/build/libs/*.jar' +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes 'finereport-design-stable/${branchName}/build/libs/*.jar' testCompile 'junit:junit:4.12' } From 41f9fbdbe968185109d0b8e3c79b97d0314f53db Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:04:06 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index e71a09a76..2933b2e4d 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,7 +32,7 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) -FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes 'finereport-design-stable/${branchName}/build/libs/*.jar' +FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes "finereport-design-stable/${branchName}/build/libs/*.jar" jars.each{File file-> println "-----------this jar path is ${file.path}----------" @@ -40,7 +40,7 @@ println "-----------this jar path is ${file.path}----------" //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes 'finereport-design-stable/${branchName}/build/libs/*.jar' +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes "finereport-design-stable/${branchName}/build/libs/*.jar" testCompile 'junit:junit:4.12' } From f8de4c794bd9783e57bdceb240e0f5f509c172bd Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:05:47 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95--02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 2933b2e4d..339f570d4 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,7 +32,7 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) -FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes "finereport-design-stable/${branchName}/build/libs/*.jar" +FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").exclude "finereport-design-stable/${branchName}/build/libs/*.jar" jars.each{File file-> println "-----------this jar path is ${file.path}----------" @@ -40,7 +40,7 @@ println "-----------this jar path is ${file.path}----------" //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").excludes "finereport-design-stable/${branchName}/build/libs/*.jar" +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").exclude "finereport-design-stable/${branchName}/build/libs/*.jar" testCompile 'junit:junit:4.12' } From 4fecedbe770972e8bdc6dea88f7b854abfd527a9 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:08:55 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20--03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangdong sun --- designer_form/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 339f570d4..c0b8da4fe 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,15 +32,15 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) -FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").exclude "finereport-design-stable/${branchName}/build/libs/*.jar" +//FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").exclude "finereport-design-stable/${branchName}/build/libs/*.jar" -jars.each{File file-> -println "-----------this jar path is ${file.path}----------" -} +//jars.each{File file-> +//println "-----------this jar path is ${file.path}----------" +//} //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").exclude "finereport-design-stable/${branchName}/build/libs/*.jar" +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar"){exclude "finereport-design-stable/${branchName}/build/libs/*.jar"} testCompile 'junit:junit:4.12' } From 30feb958db5d31a9c2d1c4464d63d233bb14d78f Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:11:08 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95--04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index c0b8da4fe..cd65b5a12 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -40,7 +40,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar"){exclude "finereport-design-stable/${branchName}/build/libs/*.jar"} +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar",exclude "finereport-design-stable/${branchName}/build/libs/*.jar") testCompile 'junit:junit:4.12' } From 40502ab070b85954cc12e7fe90726d47ed990760 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:12:54 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95--05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index cd65b5a12..38f90c059 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -40,7 +40,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar",exclude "finereport-design-stable/${branchName}/build/libs/*.jar") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar",exclude:"finereport-design-stable/${branchName}/build/libs/*.jar") testCompile 'junit:junit:4.12' } From f814922fa1c8fd323ec781bdd3d442dbb9d6c1c5 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 15 Aug 2016 19:18:19 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95--06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 38f90c059..f6c634dd1 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -30,17 +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) - - -//FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar").exclude "finereport-design-stable/${branchName}/build/libs/*.jar" - -//jars.each{File file-> -//println "-----------this jar path is ${file.path}----------" -//} //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar",exclude:"finereport-design-stable/${branchName}/build/libs/*.jar") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar") testCompile 'junit:junit:4.12' } From eabc5247ce7bdef46eeb040dbb68081c33178717 Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 15 Aug 2016 20:00:17 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=20=E4=BE=9D=E8=B5=96lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java index 39c3faf9f..3a57b11ec 100644 --- a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java +++ b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java @@ -195,7 +195,7 @@ public class ActiveKeyGenerator { //鑾峰彇char瀵瑰簲鐨刬nt鍊 private static int getCharIntValue(char charStr){ - if (!BaseUtils.isNum(charStr)) { + if (!StableUtils.isNum(charStr)) { return 0; }