From 479116088873f89a3dc9131116e69f37aa99dddc Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 29 Jul 2016 14:26:52 +0800 Subject: [PATCH 001/140] sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index f3ad57a2d6..05253b02f3 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.projectKey=finereport.design # this is the name displayed in the SonarQube UI sonar.projectName=finereport.design sonar.projectVersion=1.0 -sonar.branch=master +sonar.branch=dev # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. From 2f00e100b9c0050edbd7c6201ac62c687e4e1cec Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Fri, 29 Jul 2016 15:09:15 +0800 Subject: [PATCH 002/140] =?UTF-8?q?=E4=BF=AE=E6=94=B9build.gradle=E4=B8=AD?= =?UTF-8?q?jar=E5=8C=85=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 319cc17f29..bbf5bea8bd 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -44,7 +44,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../build',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2a667bf827..4bfcf85a64 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -42,7 +42,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../build',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 1a87cbf95b..4a59d04d53 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -46,7 +46,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../build',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From 406227f46d118519fbe91659ef2ba19e0b679d2b Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sat, 30 Jul 2016 20:01:41 +0800 Subject: [PATCH 003/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20build.gradle=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BE=9D=E8=B5=96=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 8 +++----- designer_chart/build.gradle | 8 +++----- designer_form/build.gradle | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index bbf5bea8bd..be559ab93a 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -10,8 +10,8 @@ jar{ } -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." + sourceSets{ main{ @@ -24,8 +24,6 @@ sourceSets{ dependencies{ compile fileTree(dir:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } @@ -44,7 +42,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../build',includes:'**/*.jar') + fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 4bfcf85a64..6df2154618 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -6,8 +6,8 @@ tasks.withType(JavaCompile){ version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." + jar{ @@ -23,8 +23,6 @@ sourceSets{ } dependencies{ compile fileTree(dir:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } @@ -42,7 +40,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../build',includes:'**/*.jar') + fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 4a59d04d53..f87ff3d9cf 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -6,8 +6,8 @@ tasks.withType(JavaCompile){ version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." + jar{ @@ -24,8 +24,6 @@ sourceSets{ } dependencies{ compile fileTree(dir:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } @@ -46,7 +44,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../build',includes:'**/*.jar') + fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From 425fa2bbcabb79029d242495a3d09f9ca3bfb1b4 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sat, 30 Jul 2016 20:28:34 +0800 Subject: [PATCH 004/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9build.gradle=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 5 ++++- designer_chart/build.gradle | 4 +++- designer_form/build.gradle | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index be559ab93a..4277b09c95 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -23,7 +23,10 @@ sourceSets{ dependencies{ -compile fileTree(dir:'../../',include:'**/*.jar') + +compile fileTree(dir:'../../fr-lib-8.0-gradle',include:'**/*.jar') +compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') + testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 6df2154618..bd9fb7baca 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -22,7 +22,9 @@ sourceSets{ } } dependencies{ -compile fileTree(dir:'../../',include:'**/*.jar') +compile fileTree(dir:'../../fr-lib-8.0-gradle',include:'**/*.jar') +compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') + testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index f87ff3d9cf..2b610a67e3 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -23,7 +23,9 @@ sourceSets{ } } dependencies{ -compile fileTree(dir:'../../',include:'**/*.jar') +compile fileTree(dir:'../../fr-lib-8.0-gradle',include:'**/*.jar') +compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') + testCompile 'junit:junit:4.12' } From b87f8d3c122dc14b8db846d28fe50b242897d6c3 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sat, 30 Jul 2016 21:53:45 +0800 Subject: [PATCH 005/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20build.gradle=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=BA=90=E7=A0=81=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 6 +++--- designer_chart/build.gradle | 6 +++--- designer_form/build.gradle | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 4277b09c95..0cb85a86b4 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -16,7 +16,7 @@ def srcDir="." sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_base/src"] + srcDirs=["${srcDir}/src"] } } } @@ -32,7 +32,7 @@ compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_base/src"){ + from ("${srcDir}/src"){ exclude '**/*.java' } into 'build/classes/main' @@ -49,7 +49,7 @@ task compressJS{ } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer_base/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index bd9fb7baca..cec293c5d9 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -17,7 +17,7 @@ jar{ sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_chart/src"] + srcDirs=["${srcDir}/src"] } } } @@ -30,7 +30,7 @@ compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_chart/src"){ + from ("${srcDir}/src"){ exclude '**/*.java' } into 'build/classes/main' @@ -46,7 +46,7 @@ task compressJS{ } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer_chart/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 2b610a67e3..eda33def05 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -17,8 +17,8 @@ jar{ sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer/src", -"${srcDir}/designer_form/src"] + srcDirs=["${srcDir}/src", +"${srcDir}_form/src"] } } } @@ -32,10 +32,10 @@ compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer/src"){ + from ("${srcDir}/src"){ exclude '**/*.java' } - from ("${srcDir}/designer_form/src") + from ("${srcDir}_form/src") into ('build/classes/main') } @@ -50,11 +50,11 @@ task compressJS{ } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } - fileset (dir:"${srcDir}/designer_form/src"){ + fileset (dir:"${srcDir}_form/src"){ include (name:'**/*.js') } From 63e1fb91a9106f200ebf5df471b728433e3d4356 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sat, 30 Jul 2016 21:57:47 +0800 Subject: [PATCH 006/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9build.grable=E4=B8=AD?= =?UTF-8?q?=E6=BA=90=E7=A0=81=E7=9A=84=E8=B7=AF=E5=BE=84--02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index eda33def05..c7c138dfe9 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -18,7 +18,7 @@ sourceSets{ main{ java{ srcDirs=["${srcDir}/src", -"${srcDir}_form/src"] +"${srcDir}/src"] } } } @@ -35,7 +35,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ from ("${srcDir}/src"){ exclude '**/*.java' } - from ("${srcDir}_form/src") + from ("${srcDir}/src") into ('build/classes/main') } @@ -54,7 +54,7 @@ task compressJS{ include (name:'**/*.js') } - fileset (dir:"${srcDir}_form/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } From 542cc216d3bcb7671c0f5272e29bdb3397aeab8f Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sun, 31 Jul 2016 13:15:37 +0800 Subject: [PATCH 007/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9build.gradle=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=BA=90=E7=A0=81=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index c7c138dfe9..3560bb4641 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -18,7 +18,7 @@ sourceSets{ main{ java{ srcDirs=["${srcDir}/src", -"${srcDir}/src"] +"${srcDir}/../designer/src"] } } } @@ -35,7 +35,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ from ("${srcDir}/src"){ exclude '**/*.java' } - from ("${srcDir}/src") + from ("${srcDir}/../designer/src") into ('build/classes/main') } @@ -54,7 +54,7 @@ task compressJS{ include (name:'**/*.js') } - fileset (dir:"${srcDir}/src"){ + fileset (dir:"${srcDir}/../designer/src"){ include (name:'**/*.js') } From 763f64c33cb3939f0783aefa624a4bb12dcd8ad5 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sun, 31 Jul 2016 13:28:06 +0800 Subject: [PATCH 008/140] =?UTF-8?q?build.gradle=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 3560bb4641..d8ec1fe58e 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -35,7 +35,9 @@ task copyFile(type:Copy,dependsOn:compileJava){ from ("${srcDir}/src"){ exclude '**/*.java' } - from ("${srcDir}/../designer/src") + from ("${srcDir}/../designer/src"){ + exclude '**/*.java' + } into ('build/classes/main') } From f89d3807844bd6ce381198cb54282c0d7b3ae069 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 1 Aug 2016 11:03:41 +0800 Subject: [PATCH 009/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9build.gradle=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B7=A5=E7=A8=8B=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 6 +++--- designer_chart/build.gradle | 6 +++--- designer_form/build.gradle | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 0cb85a86b4..0d7516c67a 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -24,8 +24,8 @@ sourceSets{ dependencies{ -compile fileTree(dir:'../../fr-lib-8.0-gradle',include:'**/*.jar') -compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') +compile fileTree(dir:'../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } @@ -45,7 +45,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') + fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index cec293c5d9..1cdfdc8bd3 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -22,8 +22,8 @@ sourceSets{ } } dependencies{ -compile fileTree(dir:'../../fr-lib-8.0-gradle',include:'**/*.jar') -compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') +compile fileTree(dir:'../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } @@ -42,7 +42,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') + fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index d8ec1fe58e..c29d30c7d7 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -23,8 +23,8 @@ sourceSets{ } } dependencies{ -compile fileTree(dir:'../../fr-lib-8.0-gradle',include:'**/*.jar') -compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') +compile fileTree(dir:'../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } @@ -48,7 +48,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') + fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From 7744f49fe2b559ef59fea551ebfffde0a3030972 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 2 Aug 2016 16:21:44 +0800 Subject: [PATCH 010/140] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=9A=84jdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 0d7516c67a..36753c97cc 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -3,8 +3,11 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包版本 version='8.0' - +//生成jar包重命名 jar{ baseName='fr-designer-core' } @@ -12,7 +15,7 @@ jar{ def srcDir="." - +//指定源码路径 sourceSets{ main{ java{ @@ -21,7 +24,7 @@ sourceSets{ } } - +//声明外部依赖 dependencies{ compile fileTree(dir:'../../finereport-lib-stable',include:'**/*.jar') @@ -29,7 +32,7 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } - +//复制非.java文件到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ From 5ce422e7f48ec5c65895a2f1dfe72b14390399f7 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 2 Aug 2016 16:25:28 +0800 Subject: [PATCH 011/140] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=9A=84jdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_chart/build.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 1cdfdc8bd3..5daf8d856d 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -3,12 +3,14 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } - +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包的版本 version='8.0' def srcDir="." - +//对生成的jar包进行重命名 jar{ baseName='fr-designer-chart' @@ -21,13 +23,14 @@ sourceSets{ } } } +//指定外部依赖 dependencies{ compile fileTree(dir:'../../finereport-lib-stable',include:'**/*.jar') compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } - +//将非.java 文件复制到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ From 16d6df77c2c25d3fac436520604d7dee08aa4e2d Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 2 Aug 2016 16:30:04 +0800 Subject: [PATCH 012/140] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=9A=84jdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index c29d30c7d7..c17cb4cf65 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -3,17 +3,19 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } - +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成的jar包版本 version='8.0' def srcDir="." - +//指明生成jar包的名字 jar{ baseName='fr-designer-report' } - +//源码所在位置 sourceSets{ main{ java{ @@ -22,6 +24,7 @@ sourceSets{ } } } +//声明外部依赖 dependencies{ compile fileTree(dir:'../../finereport-lib-stable',include:'**/*.jar') compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') @@ -29,7 +32,7 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } - +//将非.java文件复制到classes文件夹下 参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ From 40e05379742c954a8ccbc11e4f66e4958df6bdd1 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Thu, 4 Aug 2016 13:59:11 +0800 Subject: [PATCH 013/140] =?UTF-8?q?=E7=A7=BB=E9=99=A4jar=E5=8C=85=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 4 ++-- designer_chart/build.gradle | 5 +++-- designer_form/build.gradle | 22 ++++++++++++++-------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 36753c97cc..d44d269d59 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -36,7 +36,7 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ - exclude '**/*.java' + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' } into 'build/classes/main' } @@ -54,7 +54,7 @@ task compressJS{ ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 5daf8d856d..2880776557 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -34,7 +34,8 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ - exclude '**/*.java' + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } into 'build/classes/main' } @@ -51,7 +52,7 @@ task compressJS{ ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index c17cb4cf65..b7a91f1137 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,15 +32,20 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } +//指明无法编译文件所在路径 +def dataContent ={def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} + //将非.java文件复制到classes文件夹下 参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/src"){ - exclude '**/*.java' - } - from ("${srcDir}/../designer/src"){ - exclude '**/*.java' - } + with dataContent.call("${srcDir}/src") + with dataContent.call("${srcDir}/../designer/src") into ('build/classes/main') } @@ -54,14 +59,15 @@ task compressJS{ fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') + include (name:'**/*.css') } fileset (dir:"${srcDir}/../designer/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } From e8565f9845d4c84691d6a8c9599cd62562e2e81e Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 10:46:33 +0800 Subject: [PATCH 014/140] =?UTF-8?q?=E7=94=9F=E6=88=90fr-applet-8.0.jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 build.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..bb8ea07d96 --- /dev/null +++ b/build.gradle @@ -0,0 +1,89 @@ +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} + +task appletJar{ + + ant{ + + delete(dir:'classes') + delete(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'classes') + copy(todir:'classes'){ + fileset(dir=../finereport-core-stable/build/classes){ + include(name:'**/*.*') + } + fileset(dir=../finereport-chart-stable/build/classes){ + include(name:'**/*.*') + } + fileset(dir=../finereport-desgin-stable/build/classes){ + include(name:'**/*.*') + } + + fileset(dir=../finereport-platform-stable/build/classes){ + include(name:'**/*.*') + } + fileset(dir=../finereport-performance-stable/build/classes){ + include(name:'**/*.*') + } + + + } + unjar(src:'../finereport-lib-stable/3rd.jar' dest='finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/servlet-api.jar' dest='finereport-lib-stable/tmp') + jar(jarfile:'build/libs/fr-applet-8.0.jar'){ + fileset(dir:'classes'){ + exclude(name:'*.*') + exclude(name:'bin/*.*') + exclude(name:'classes/**') + exclude(name:'com/fr/schedule/**') + exclude(name:'com/fr/cell/**') + exclude(name:'com/fr/dialog/**') + exclude(name:'com/fr/view/**') + exclude(name:'com/fr/web/**') + exclude(name:'om/fr/fs/**') + exclude(name:'com/fr/design/**') + exclude(name:'com/fr/start/**') + exclude(name:'com/fr/process/**') + } + fileset(dir:'../finereport-lib-stable/tmp'){ + include(name:'javax/mail/**') + include(name:'javax/servlet/**') + include(name:'org/freehep/**') + include(name:'com/fr/third/JAI/**') + include(name:'com/fr/third/antlr/**') + include(name:'com/fr/third/javax/**') + include(name:'com/sun/xml/**') + include(name:'javax/xml/**') + + } + fileset(dir:'classes'){ + include(name:'com/fr/web/*.class') + include(name:'com/fr/web/attr/*.class') + } + } + delete(dir:'../finereport-lib-stable/tmp') + property(name:'jdk1.6.home',value:'D:\FineReport\develop\java\jdk1.6u35') + property(name:'keystore',value:'frapplet.store') + property(name:'keycert',value:'fr.cert') + property(name:'keypasssword',value:'123456') + property(name:'keyalias',value:'fr') + exec(executable:"${jdk1.6.home}\bin\keytool"){ + arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") + } + exec(executable:"${jdk1.6.home}\bin\keytool"){ + arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") + } + + exec(executable:"${jdk1.6.home}\bin\jarsigner"){ + arg(line:"-keystore ${keystore} -storepass ${keypassword} ${applet_jar} ${keyalias}") + } + delete(file:"${keystore}") + delete(file:"${keycert}") + delete(dir:'classes') + + } + +} \ No newline at end of file From 5c3fb792e6e37dcb858f197e125ad588e96bdbb4 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 10:53:26 +0800 Subject: [PATCH 015/140] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20applet=20=20jar?= =?UTF-8?q?=E5=8C=85=20=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index bb8ea07d96..5766af4254 100644 --- a/build.gradle +++ b/build.gradle @@ -12,20 +12,20 @@ task appletJar{ mkdir(dir:'../finereport-lib-stable/tmp') mkdir(dir:'classes') copy(todir:'classes'){ - fileset(dir=../finereport-core-stable/build/classes){ + fileset(dir='../finereport-core-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir=../finereport-chart-stable/build/classes){ + fileset(dir='../finereport-chart-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir=../finereport-desgin-stable/build/classes){ + fileset(dir='../finereport-desgin-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir=../finereport-platform-stable/build/classes){ + fileset(dir='../finereport-platform-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir=../finereport-performance-stable/build/classes){ + fileset(dir='../finereport-performance-stable/build/classes'){ include(name:'**/*.*') } From 90afa00af2272e1a57a3fe5d4913e295f301f925 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 10:58:44 +0800 Subject: [PATCH 016/140] =?UTF-8?q?=E8=B0=83=E8=AF=95=20applet=20jar?= =?UTF-8?q?=E5=8C=85=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81--02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5766af4254..bdf7ba9b88 100644 --- a/build.gradle +++ b/build.gradle @@ -31,8 +31,8 @@ task appletJar{ } - unjar(src:'../finereport-lib-stable/3rd.jar' dest='finereport-lib-stable/tmp') - unjar(src:'../finereport-lib-stable/servlet-api.jar' dest='finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/3rd.jar',dest='finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/servlet-api.jar',dest='finereport-lib-stable/tmp') jar(jarfile:'build/libs/fr-applet-8.0.jar'){ fileset(dir:'classes'){ exclude(name:'*.*') From 8623d886474287b92fd784ae5279c5e689b66066 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 11:02:21 +0800 Subject: [PATCH 017/140] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=88applet=EF=BC=89--03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index bdf7ba9b88..60adc1a3bc 100644 --- a/build.gradle +++ b/build.gradle @@ -65,19 +65,19 @@ task appletJar{ } } delete(dir:'../finereport-lib-stable/tmp') - property(name:'jdk1.6.home',value:'D:\FineReport\develop\java\jdk1.6u35') + property(name:'jdk1.6.home',value:'D:/FineReport/develop/java/jdk1.6u35') property(name:'keystore',value:'frapplet.store') property(name:'keycert',value:'fr.cert') property(name:'keypasssword',value:'123456') property(name:'keyalias',value:'fr') - exec(executable:"${jdk1.6.home}\bin\keytool"){ + exec(executable:"${jdk1.6.home}/bin/keytool"){ arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") } - exec(executable:"${jdk1.6.home}\bin\keytool"){ + exec(executable:"${jdk1.6.home}/bin/keytool"){ arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") } - exec(executable:"${jdk1.6.home}\bin\jarsigner"){ + exec(executable:"${jdk1.6.home}/bin/jarsigner"){ arg(line:"-keystore ${keystore} -storepass ${keypassword} ${applet_jar} ${keyalias}") } delete(file:"${keystore}") From 1f04d500487a7e489ee4490b01bbdce109e660f8 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 11:21:40 +0800 Subject: [PATCH 018/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 60adc1a3bc..daa7ab1b28 100644 --- a/build.gradle +++ b/build.gradle @@ -65,19 +65,25 @@ task appletJar{ } } delete(dir:'../finereport-lib-stable/tmp') - property(name:'jdk1.6.home',value:'D:/FineReport/develop/java/jdk1.6u35') - property(name:'keystore',value:'frapplet.store') - property(name:'keycert',value:'fr.cert') - property(name:'keypasssword',value:'123456') - property(name:'keyalias',value:'fr') - exec(executable:"${jdk1.6.home}/bin/keytool"){ + def jdk6home= 'D:/FineReport/develop/java/jdk1.6u35' + def keystore='frapplet.store' + def keycert='fr.cert' + def keypassword='123456' + def keyalias='fr' +//property(name:'jdk1.6.home',value:'D:/FineReport/develop/java/jdk1.6u35') + //property(name:'keystore',value:'frapplet.store') + //property(name:'keycert',value:'fr.cert') + //property(name:'keypasssword',value:'123456') + //property(name:'keyalias',value:'fr') + + exec(executable:"${jdk6home}/bin/keytool"){ arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") } - exec(executable:"${jdk1.6.home}/bin/keytool"){ + exec(executable:"${jdk6home}/bin/keytool"){ arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") } - exec(executable:"${jdk1.6.home}/bin/jarsigner"){ + exec(executable:"${jdk6home}/bin/jarsigner"){ arg(line:"-keystore ${keystore} -storepass ${keypassword} ${applet_jar} ${keyalias}") } delete(file:"${keystore}") From 0fa3e656f36f0ccb061d1b38ef58930979c9df71 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 11:26:49 +0800 Subject: [PATCH 019/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index daa7ab1b28..96cef386db 100644 --- a/build.gradle +++ b/build.gradle @@ -12,20 +12,20 @@ task appletJar{ mkdir(dir:'../finereport-lib-stable/tmp') mkdir(dir:'classes') copy(todir:'classes'){ - fileset(dir='../finereport-core-stable/build/classes'){ + fileset(dir:'../finereport-core-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir='../finereport-chart-stable/build/classes'){ + fileset(dir:'../finereport-chart-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir='../finereport-desgin-stable/build/classes'){ + fileset(dir:'../finereport-desgin-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir='../finereport-platform-stable/build/classes'){ + fileset(dir:'../finereport-platform-stable/build/classes'){ include(name:'**/*.*') } - fileset(dir='../finereport-performance-stable/build/classes'){ + fileset(dir:'../finereport-performance-stable/build/classes'){ include(name:'**/*.*') } From 8b2f1df30b7d6815d4aec7db70cf3a1088e93f5e Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 11:29:50 +0800 Subject: [PATCH 020/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 96cef386db..0e3bdf4173 100644 --- a/build.gradle +++ b/build.gradle @@ -31,8 +31,8 @@ task appletJar{ } - unjar(src:'../finereport-lib-stable/3rd.jar',dest='finereport-lib-stable/tmp') - unjar(src:'../finereport-lib-stable/servlet-api.jar',dest='finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/3rd.jar',dest:'finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/servlet-api.jar',dest:'finereport-lib-stable/tmp') jar(jarfile:'build/libs/fr-applet-8.0.jar'){ fileset(dir:'classes'){ exclude(name:'*.*') From c9108bf604e118d08c09a46839738389ca8b25fb Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 11:41:00 +0800 Subject: [PATCH 021/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0e3bdf4173..70d17df5ae 100644 --- a/build.gradle +++ b/build.gradle @@ -2,15 +2,17 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } +ant{ + delete(dir:'classes') + delete(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'classes') +} task appletJar{ ant{ - delete(dir:'classes') - delete(dir:'../finereport-lib-stable/tmp') - mkdir(dir:'../finereport-lib-stable/tmp') - mkdir(dir:'classes') copy(todir:'classes'){ fileset(dir:'../finereport-core-stable/build/classes'){ include(name:'**/*.*') From 1a83df3b82d325d042866216de4c057aa25b801a Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 11:48:11 +0800 Subject: [PATCH 022/140] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 70d17df5ae..0a9864a349 100644 --- a/build.gradle +++ b/build.gradle @@ -2,32 +2,30 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -ant{ - delete(dir:'classes') - delete(dir:'../finereport-lib-stable/tmp') - mkdir(dir:'../finereport-lib-stable/tmp') - mkdir(dir:'classes') -} task appletJar{ ant{ + delete(dir:'classes') + delete(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'build/classes') copy(todir:'classes'){ - fileset(dir:'../finereport-core-stable/build/classes'){ + fileset(dir:'../finereport-core-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-chart-stable/build/classes'){ + fileset(dir:'../finereport-chart-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-desgin-stable/build/classes'){ + fileset(dir:'../finereport-desgin-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-platform-stable/build/classes'){ + fileset(dir:'../finereport-platform-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-performance-stable/build/classes'){ + fileset(dir:'../finereport-performance-stable/build/classes/main'){ include(name:'**/*.*') } From 7d1093dec8c9f15628e3996bbc6384915939f354 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 12:05:43 +0800 Subject: [PATCH 023/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0a9864a349..37d566a5b0 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ task appletJar{ delete(dir:'classes') delete(dir:'../finereport-lib-stable/tmp') mkdir(dir:'../finereport-lib-stable/tmp') - mkdir(dir:'build/classes') - copy(todir:'classes'){ + mkdir(dir:'build/classes/main') + copy(todir:'build/classes/main'){ fileset(dir:'../finereport-core-stable/build/classes/main'){ include(name:'**/*.*') } @@ -25,7 +25,7 @@ task appletJar{ fileset(dir:'../finereport-platform-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-performance-stable/build/classes/main'){ + fileset(dir:'../finereport-performance-stable/build/classes'){ include(name:'**/*.*') } From f523a73cc2ff881f2080640b91600d33e74dff2e Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 12:56:19 +0800 Subject: [PATCH 024/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 37d566a5b0..50b83419f1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -task appletJar{ +task appletJar<<{ ant{ From 04ba2dec275f5c0a0454dee077bf503fba0b882a Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 13:04:14 +0800 Subject: [PATCH 025/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 50b83419f1..dff25361d3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,19 +6,16 @@ tasks.withType(JavaCompile){ task appletJar<<{ ant{ - - delete(dir:'classes') - delete(dir:'../finereport-lib-stable/tmp') mkdir(dir:'../finereport-lib-stable/tmp') - mkdir(dir:'build/classes/main') - copy(todir:'build/classes/main'){ + mkdir(dir:'build/classes/') + copy(todir:'build/classes/'){ fileset(dir:'../finereport-core-stable/build/classes/main'){ include(name:'**/*.*') } fileset(dir:'../finereport-chart-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-desgin-stable/build/classes/main'){ + fileset(dir:'../finereport-report-stable/build/classes/main'){ include(name:'**/*.*') } @@ -34,7 +31,7 @@ task appletJar<<{ unjar(src:'../finereport-lib-stable/3rd.jar',dest:'finereport-lib-stable/tmp') unjar(src:'../finereport-lib-stable/servlet-api.jar',dest:'finereport-lib-stable/tmp') jar(jarfile:'build/libs/fr-applet-8.0.jar'){ - fileset(dir:'classes'){ + fileset(dir:'build/classes'){ exclude(name:'*.*') exclude(name:'bin/*.*') exclude(name:'classes/**') @@ -59,7 +56,7 @@ task appletJar<<{ include(name:'javax/xml/**') } - fileset(dir:'classes'){ + fileset(dir:'buildclasses'){ include(name:'com/fr/web/*.class') include(name:'com/fr/web/attr/*.class') } @@ -88,7 +85,7 @@ task appletJar<<{ } delete(file:"${keystore}") delete(file:"${keycert}") - delete(dir:'classes') + delete(dir:'build/classes') } From c9f7b304596a09b794f277f6c5626cf2a619d2e0 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 8 Aug 2016 13:42:37 +0800 Subject: [PATCH 026/140] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E8=BF=9C=E7=A8=8B=E4=B8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=8F=96=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../series/PlotSeries/MapCustomPane.java | 86 ++++++++++++------- .../PlotSeries/MapDefiAreaNamePane.java | 52 +++++------ 2 files changed, 77 insertions(+), 61 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java index 0a922d34e1..be5fdad601 100644 --- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java +++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java @@ -1,37 +1,36 @@ package com.fr.design.chart.series.PlotSeries; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JFileChooser; -import javax.swing.JPanel; -import javax.swing.SwingConstants; - +import com.fr.base.FRContext; +import com.fr.base.TableData; import com.fr.base.Utils; import com.fr.chart.base.MapSvgAttr; +import com.fr.data.impl.EmbeddedTableData; +import com.fr.design.beans.BasicBeanPane; import com.fr.design.data.DesignTableDataManager; -import com.fr.data.TableDataSource; -import com.fr.data.core.DataCoreUtils; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; -import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.FilterComboBox; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; +import com.fr.general.ComparatorUtils; +import com.fr.general.GeneralUtils; import com.fr.general.Inter; +import com.fr.general.data.DataModel; import com.fr.stable.StringUtils; import org.apache.batik.swing.svg.SVGFileFilter; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * 鑷畾涔夊湴鍥剧晫闈. * @@ -131,22 +130,51 @@ refreshAreaNameBox(); String colName = Utils.objectToString(areaString.getSelectedItem()); TableDataWrapper tableDataWrappe = tableDataNameBox.getTableDataWrapper(); - TableDataSource source = DesignTableDataManager.getEditingTableDataSource(); - if (tableDataWrappe == null || source == null) { - return; - } - - String[] values = DataCoreUtils.getColValuesInData(source, tableDataWrappe.getTableDataName(), colName); - ArrayList list = new ArrayList(); - for(int i = 0; i < values.length; i++) { - list.add(values[i]); - } - imageShowPane.refreshFromDataList(list); + imageShowPane.refreshFromDataList(getColValuesInData(tableDataWrappe, colName)); } } }; + public static List getColValuesInData(TableDataWrapper tableDataWrappe, String colName) { + List colValues = new ArrayList<>(); + + EmbeddedTableData embeddedTableData = null; + try { + embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tableDataWrappe.getTableData(), TableData.RESULT_ALL, false); + } catch (Exception ee) { + FRContext.getLogger().error(ee.getMessage(), ee); + } + + if(embeddedTableData == null){ + return colValues; + } + + int columnIndex = getColumnIndex(embeddedTableData, colName); + + if(columnIndex == DataModel.COLUMN_NAME_NOT_FOUND){ + return colValues; + } + + for (int rowIndex = 0, rowCount = embeddedTableData.getRowCount(); rowIndex < rowCount; rowIndex++) { + String colValueName = GeneralUtils.objectToString(embeddedTableData.getValueAt(rowIndex, columnIndex)); + if (!colValues.contains(colValueName)) { + colValues.add(colValueName); + } + } + + return colValues; + } + + private static int getColumnIndex(EmbeddedTableData tableData, String colName) { + for (int columnIndex = 0, columnCount = tableData.getColumnCount(); columnIndex < columnCount; columnIndex++) { + if (ComparatorUtils.tableDataColumnNameEquals(tableData.getColumnName(columnIndex), colName)) { + return columnIndex; + } + } + return DataModel.COLUMN_NAME_NOT_FOUND; + } + /** * 閫変腑鏂瑰紡: 鍖哄煙鎴栬呯偣 */ diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java index 515527eaf8..b3cb2d811d 100644 --- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java +++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java @@ -1,43 +1,33 @@ package com.fr.design.chart.series.PlotSeries; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.swing.AbstractCellEditor; -import javax.swing.JPanel; -import javax.swing.JTable; -import javax.swing.SwingConstants; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; - +import com.fr.base.Utils; import com.fr.chart.base.MapSvgAttr; import com.fr.chart.base.MapSvgXMLHelper; -import com.fr.base.Utils; -import com.fr.design.data.DesignTableDataManager; -import com.fr.data.TableDataSource; -import com.fr.data.core.DataCoreUtils; -import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.data.tabledata.wrapper.TableDataWrapper; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; +import com.fr.design.editor.editor.Editor; +import com.fr.design.editor.editor.TextEditor; import com.fr.design.gui.icombobox.FilterComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.UIArrayTableModel; import com.fr.design.gui.itableeditorpane.UITableEditorPane; -import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; -import com.fr.design.editor.ValueEditorPane; -import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.xcombox.ComboBoxUseEditor; -import com.fr.design.editor.editor.Editor; -import com.fr.design.editor.editor.TextEditor; +import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; import com.fr.general.Inter; import com.fr.third.org.apache.poi.hssf.record.formula.functions.T; +import javax.swing.*; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import java.awt.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * 鍦板浘, 瀹氫箟鍖哄煙鍚. * @@ -114,12 +104,10 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc String columnName = Utils.objectToString(columnBox.getSelectedItem()); TableDataWrapper tableDataWrappe = tableDataBox.getTableDataWrapper(); - TableDataSource source = DesignTableDataManager.getEditingTableDataSource(); - if (tableDataWrappe == null || source == null) { - return; - } - initNames = DataCoreUtils.getColValuesInData(source, tableDataWrappe.getTableDataName(), columnName); + List list = MapCustomPane.getColValuesInData(tableDataWrappe, columnName); + + initNames = list.toArray(initNames); if (tableEditorModel != null) { tableEditorModel.stopCellEditing();// 鍙槸鐢ㄦ潵鍒锋柊鍒楄〃鐨刢ombox From 3612abd016068a74dfc1e92b7733c5a1c16788b7 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 8 Aug 2016 14:00:28 +0800 Subject: [PATCH 027/140] update --- .../fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java index b3cb2d811d..ca8d3a67dd 100644 --- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java +++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java @@ -16,7 +16,6 @@ import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.xcombox.ComboBoxUseEditor; import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; import com.fr.general.Inter; -import com.fr.third.org.apache.poi.hssf.record.formula.functions.T; import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; @@ -80,7 +79,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc tableDataBox.setPreferredSize(new Dimension(200, 20)); northPane.add(tableDataBox); - columnBox = new FilterComboBox(); + columnBox = new FilterComboBox<>(); columnBox.setPreferredSize(new Dimension(40, 20)); columnBox.addItemListener(columnChange); From 6f2e9ecde0736719e714ca94914ab402b11353d8 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 14:01:31 +0800 Subject: [PATCH 028/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index dff25361d3..b37695b4cf 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ task appletJar<<{ fileset(dir:'../finereport-platform-stable/build/classes/main'){ include(name:'**/*.*') } - fileset(dir:'../finereport-performance-stable/build/classes'){ + fileset(dir:'../finereport-performance-stable/build/classes/main'){ include(name:'**/*.*') } @@ -56,7 +56,7 @@ task appletJar<<{ include(name:'javax/xml/**') } - fileset(dir:'buildclasses'){ + fileset(dir:'build/classes'){ include(name:'com/fr/web/*.class') include(name:'com/fr/web/attr/*.class') } From a58b3572686136ce1bdde92fb205a95cf66dc799 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 14:07:06 +0800 Subject: [PATCH 029/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b37695b4cf..8583c7249d 100644 --- a/build.gradle +++ b/build.gradle @@ -81,7 +81,7 @@ task appletJar<<{ } exec(executable:"${jdk6home}/bin/jarsigner"){ - arg(line:"-keystore ${keystore} -storepass ${keypassword} ${applet_jar} ${keyalias}") + arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") } delete(file:"${keystore}") delete(file:"${keycert}") From e9a322342e7f76b13f6a4e389583f3419e9b4d2d Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 14:25:52 +0800 Subject: [PATCH 030/140] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88applet=EF=BC=89--15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 8583c7249d..eb3d0a6f60 100644 --- a/build.gradle +++ b/build.gradle @@ -6,30 +6,31 @@ tasks.withType(JavaCompile){ task appletJar<<{ ant{ + patternset(id:'') mkdir(dir:'../finereport-lib-stable/tmp') mkdir(dir:'build/classes/') copy(todir:'build/classes/'){ - fileset(dir:'../finereport-core-stable/build/classes/main'){ - include(name:'**/*.*') - } - fileset(dir:'../finereport-chart-stable/build/classes/main'){ - include(name:'**/*.*') - } - fileset(dir:'../finereport-report-stable/build/classes/main'){ - include(name:'**/*.*') - } + fileset(dir:'../finereport-core-stable/build/classes/main') + + + fileset(dir:'../finereport-chart-stable/build/classes/main') + + + fileset(dir:'../finereport-report-stable/build/classes/main') + + - fileset(dir:'../finereport-platform-stable/build/classes/main'){ - include(name:'**/*.*') - } - fileset(dir:'../finereport-performance-stable/build/classes/main'){ - include(name:'**/*.*') - } + fileset(dir:'../finereport-platform-stable/build/classes/main') + + + fileset(dir:'../finereport-performance-stable/build/classes/main') + + } - unjar(src:'../finereport-lib-stable/3rd.jar',dest:'finereport-lib-stable/tmp') - unjar(src:'../finereport-lib-stable/servlet-api.jar',dest:'finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/3rd.jar',dest:'../finereport-lib-stable/tmp') + unjar(src:'../finereport-lib-stable/servlet-api.jar',dest:'../finereport-lib-stable/tmp') jar(jarfile:'build/libs/fr-applet-8.0.jar'){ fileset(dir:'build/classes'){ exclude(name:'*.*') @@ -67,11 +68,6 @@ task appletJar<<{ def keycert='fr.cert' def keypassword='123456' def keyalias='fr' -//property(name:'jdk1.6.home',value:'D:/FineReport/develop/java/jdk1.6u35') - //property(name:'keystore',value:'frapplet.store') - //property(name:'keycert',value:'fr.cert') - //property(name:'keypasssword',value:'123456') - //property(name:'keyalias',value:'fr') exec(executable:"${jdk6home}/bin/keytool"){ arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") From 0be37aeb73c54cb99401cbc2b5bbb11206e2886b Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Mon, 8 Aug 2016 17:17:19 +0800 Subject: [PATCH 031/140] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index eb3d0a6f60..6d3190518e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ tasks.withType(JavaCompile){ task appletJar<<{ ant{ - patternset(id:'') mkdir(dir:'../finereport-lib-stable/tmp') mkdir(dir:'build/classes/') copy(todir:'build/classes/'){ @@ -41,7 +40,7 @@ task appletJar<<{ exclude(name:'com/fr/dialog/**') exclude(name:'com/fr/view/**') exclude(name:'com/fr/web/**') - exclude(name:'om/fr/fs/**') + exclude(name:'com/fr/fs/**') exclude(name:'com/fr/design/**') exclude(name:'com/fr/start/**') exclude(name:'com/fr/process/**') From 80bfeba2f59f1de4be6a3e2b52a2caeea906bab7 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 9 Aug 2016 10:31:59 +0800 Subject: [PATCH 032/140] =?UTF-8?q?bugfix=EF=BC=9A=E8=AE=BA=E5=9D=9B?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=94=B9=E5=8F=98=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=88=90=E5=8A=9F=E6=A0=87=E5=BF=97=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java index 2845ccece3..5140ea15ad 100644 --- a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java +++ b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java @@ -36,7 +36,6 @@ public class BBSLoginDialog extends UIDialog { private static final int DIALOG_WIDTH = 400; private static final int DIALOG_HEIGHT = 200; - private static final String LOGIN_SUCCESS_FLAG = "http://bbs.finereport.com"; private static final Font DEFAULT_FONT = FRFont.getInstance(FRFont.DEFAULT_FONTNAME, 0, 14); private static final int TIME_OUT = 10000; @@ -287,12 +286,13 @@ public class BBSLoginDialog extends UIDialog { FRLogger.getLogger().error(e.getMessage()); } String url = SiteCenter.getInstance().acquireUrlByKind("bbs.login") + "&username=" + username + "&password=" + password; + String loginSuccessFlag = SiteCenter.getInstance().acquireUrlByKind("bbs"); HttpClient client = new HttpClient(url); client.setTimeout(TIME_OUT); if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) { try { String res = client.getResponseText(EncodeConstants.ENCODING_GBK); - if (res.contains(LOGIN_SUCCESS_FLAG)) { + if (res.contains(loginSuccessFlag)) { return true; } } catch (Exception e) { From 98f853326293d45321a7a0c34b002c65c28697ff Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 9 Aug 2016 19:09:02 +0800 Subject: [PATCH 033/140] =?UTF-8?q?build.gradle=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 85 +++++++++++++++++++++++++++++++++++++ designer_base/build.gradle | 37 ++++++++++------ designer_chart/build.gradle | 35 +++++++++------ designer_form/build.gradle | 54 +++++++++++++++-------- 4 files changed, 166 insertions(+), 45 deletions(-) create mode 100644 build.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..11222785bc --- /dev/null +++ b/build.gradle @@ -0,0 +1,85 @@ +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +def libDir='${libDir}' +def basicDir='../../' +//获取什么分支名 +FileTree files =fileTree(dir:'./',include:'build.gradle') +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) +def branchName=buildDir.substring(build.DirlastIndexOf ('\\')+1) + +task appletJar<<{ + + ant{ + mkdir(dir:'${libDir}/tmp') + mkdir(dir:'build/classes/') + copy(todir:'build/classes/'){ + fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-chart-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-report-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-platform-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main') + + } + unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp') + unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/tmp') + jar(jarfile:'build/libs/fr-applet-8.0.jar'){ + fileset(dir:'build/classes'){ + exclude(name:'*.*') + exclude(name:'bin/*.*') + exclude(name:'classes/**') + exclude(name:'com/fr/schedule/**') + exclude(name:'com/fr/cell/**') + exclude(name:'com/fr/dialog/**') + exclude(name:'com/fr/view/**') + exclude(name:'com/fr/web/**') + exclude(name:'com/fr/fs/**') + exclude(name:'com/fr/design/**') + exclude(name:'com/fr/start/**') + exclude(name:'com/fr/process/**') + } + fileset(dir:'${libDir}/tmp'){ + include(name:'javax/mail/**') + include(name:'javax/servlet/**') + include(name:'org/freehep/**') + include(name:'com/fr/third/JAI/**') + include(name:'com/fr/third/antlr/**') + include(name:'com/fr/third/javax/**') + include(name:'com/sun/xml/**') + include(name:'javax/xml/**') + + } + fileset(dir:'build/classes'){ + include(name:'com/fr/web/*.class') + include(name:'com/fr/web/attr/*.class') + } + } + delete(dir:'${libDir}/tmp') + def jdk6home= 'D:/FineReport/develop/java/jdk1.6u35' + def keystore='frapplet.store' + def keycert='fr.cert' + def keypassword='123456' + def keyalias='fr' + + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") + } + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") + } + + exec(executable:"${jdk6home}/bin/jarsigner"){ + arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") + } + delete(file:"${keystore}") + delete(file:"${keycert}") + delete(dir:'build/classes') + + } + +} \ No newline at end of file diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 319cc17f29..731deebe3f 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -3,36 +3,45 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包版本 version='8.0' - +//生成jar包重命名 jar{ baseName='fr-designer-core' } -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." +//指定源码路径 sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_base/src"] + srcDirs=["${srcDir}/src"] } } } +//获取什么分支名 +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:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') + +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') + testCompile 'junit:junit:4.12' } - +//复制非.java文件到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_base/src"){ - exclude '**/*.java' + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' } into 'build/classes/main' } @@ -44,13 +53,13 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer_base/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2a667bf827..92e221f194 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -3,12 +3,14 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } - +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包的版本 version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." +//对生成的jar包进行重命名 jar{ baseName='fr-designer-chart' @@ -17,21 +19,28 @@ jar{ sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_chart/src"] + srcDirs=["${srcDir}/src"] } } } +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:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/${branchName}/**/*.jar') + testCompile 'junit:junit:4.12' } - +//将非.java 文件复制到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_chart/src"){ - exclude '**/*.java' + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } into 'build/classes/main' } @@ -42,13 +51,13 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer_chart/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 1a87cbf95b..118215fc8a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -3,39 +3,56 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } - +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成的jar包版本 version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." +//指明生成jar包的名字 jar{ baseName='fr-designer-report' } - +//源码所在位置 sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer/src", -"${srcDir}/designer_form/src"] + srcDirs=["${srcDir}/src", +"${srcDir}/../designer/src"] } } } + +//获取什么分支名 +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:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') + testCompile 'junit:junit:4.12' } +//指明无法编译文件所在路径 +def dataContent ={def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} +//将非.java文件复制到classes文件夹下 参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer/src"){ - exclude '**/*.java' - } - from ("${srcDir}/designer_form/src") + with dataContent.call("${srcDir}/src") + with dataContent.call("${srcDir}/../designer/src") into ('build/classes/main') } @@ -46,17 +63,18 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer/src"){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') + include (name:'**/*.css') } - fileset (dir:"${srcDir}/designer_form/src"){ + fileset (dir:"${srcDir}/../designer/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } From 7e6ee95b53b67f9480bafe13381e829cf6dc3c3a Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 9 Aug 2016 19:47:59 +0800 Subject: [PATCH 034/140] =?UTF-8?q?build.gradle=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 36 +++++++++++++++++------------------- designer_base/build.gradle | 11 ++++++++--- designer_chart/build.gradle | 11 ++++++++--- designer_form/build.gradle | 13 ++++++++++--- 4 files changed, 43 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 6d3190518e..11222785bc 100644 --- a/build.gradle +++ b/build.gradle @@ -2,34 +2,32 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } +def libDir='${libDir}' +def basicDir='../../' +//获取什么分支名 +FileTree files =fileTree(dir:'./',include:'build.gradle') +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) +def branchName=buildDir.substring(build.DirlastIndexOf ('\\')+1) task appletJar<<{ ant{ - mkdir(dir:'../finereport-lib-stable/tmp') + mkdir(dir:'${libDir}/tmp') mkdir(dir:'build/classes/') copy(todir:'build/classes/'){ - fileset(dir:'../finereport-core-stable/build/classes/main') + fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-chart-stable/${branchName}/build/classes/main') + fileset(dir:'${basicDir}/finereport-report-stable/${branchName}/build/classes/main') - fileset(dir:'../finereport-chart-stable/build/classes/main') - - - fileset(dir:'../finereport-report-stable/build/classes/main') - - - - fileset(dir:'../finereport-platform-stable/build/classes/main') - - - fileset(dir:'../finereport-performance-stable/build/classes/main') + fileset(dir:'${basicDir}/finereport-platform-stable/${branchName}/build/classes/main') - - + fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main') } - unjar(src:'../finereport-lib-stable/3rd.jar',dest:'../finereport-lib-stable/tmp') - unjar(src:'../finereport-lib-stable/servlet-api.jar',dest:'../finereport-lib-stable/tmp') + unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp') + unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/tmp') jar(jarfile:'build/libs/fr-applet-8.0.jar'){ fileset(dir:'build/classes'){ exclude(name:'*.*') @@ -45,7 +43,7 @@ task appletJar<<{ exclude(name:'com/fr/start/**') exclude(name:'com/fr/process/**') } - fileset(dir:'../finereport-lib-stable/tmp'){ + fileset(dir:'${libDir}/tmp'){ include(name:'javax/mail/**') include(name:'javax/servlet/**') include(name:'org/freehep/**') @@ -61,7 +59,7 @@ task appletJar<<{ include(name:'com/fr/web/attr/*.class') } } - delete(dir:'../finereport-lib-stable/tmp') + delete(dir:'${libDir}/tmp') def jdk6home= 'D:/FineReport/develop/java/jdk1.6u35' def keystore='frapplet.store' def keycert='fr.cert' diff --git a/designer_base/build.gradle b/designer_base/build.gradle index d44d269d59..731deebe3f 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -23,12 +23,17 @@ sourceSets{ } } } +//获取什么分支名 +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/**/*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } @@ -48,7 +53,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2880776557..92e221f194 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -23,10 +23,15 @@ sourceSets{ } } } +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/**/*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/${branchName}/**/*.jar') testCompile 'junit:junit:4.12' } @@ -46,7 +51,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index b7a91f1137..118215fc8a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -24,10 +24,17 @@ sourceSets{ } } } + +//获取什么分支名 +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/**/*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } @@ -56,7 +63,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From fc8c4d7c794a209e02cd62c80fe32a4d1d23ad99 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 9 Aug 2016 20:01:12 +0800 Subject: [PATCH 035/140] =?UTF-8?q?build.gradle=E5=A4=9A=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 11222785bc..27199c49a6 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,9 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -def libDir='${libDir}' + def basicDir='../../' +def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) From 6b48ce010d453faa18e6d51541c73436bf31514d Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 9 Aug 2016 20:04:40 +0800 Subject: [PATCH 036/140] =?UTF-8?q?build.gradle=E5=A4=9A=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95=20--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 11222785bc..3ab04c1e27 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,9 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -def libDir='${libDir}' + def basicDir='../../' +def libDir='${basicDir}/finereport-lib-stable' //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) From 1580d643a4ca80ce859af516719fc00eb822ed46 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:42:49 +0800 Subject: [PATCH 037/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 100 ++++++++++++++++++------------------ designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 3ab04c1e27..4cfb0fc7a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,71 +1,71 @@ -apply plugin: 'java' +apply plugin: "java" tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' + options.encoding = "UTF-8" } -def basicDir='../../' -def libDir='${basicDir}/finereport-lib-stable' +def basicDir="../../" +def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 -FileTree files =fileTree(dir:'./',include:'build.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -def branchName=buildDir.substring(build.DirlastIndexOf ('\\')+1) +FileTree files =fileTree(dir:"./",include:"build.gradle") +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) +def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:'${libDir}/tmp') - mkdir(dir:'build/classes/') - copy(todir:'build/classes/'){ - fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main') + mkdir(dir:"${libDir}/tmp") + mkdir(dir:"build/classes/") + copy(todir:"build/classes/"){ + fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-chart-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-report-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-platform-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp') - unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/tmp') - jar(jarfile:'build/libs/fr-applet-8.0.jar'){ - fileset(dir:'build/classes'){ - exclude(name:'*.*') - exclude(name:'bin/*.*') - exclude(name:'classes/**') - exclude(name:'com/fr/schedule/**') - exclude(name:'com/fr/cell/**') - exclude(name:'com/fr/dialog/**') - exclude(name:'com/fr/view/**') - exclude(name:'com/fr/web/**') - exclude(name:'com/fr/fs/**') - exclude(name:'com/fr/design/**') - exclude(name:'com/fr/start/**') - exclude(name:'com/fr/process/**') + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp") + jar(jarfile:"build/libs/fr-applet-8.0.jar"){ + fileset(dir:"build/classes"){ + exclude(name:"*.*") + exclude(name:"bin/*.*") + exclude(name:"classes/**") + exclude(name:"com/fr/schedule/**") + exclude(name:"com/fr/cell/**") + exclude(name:"com/fr/dialog/**") + exclude(name:"com/fr/view/**") + exclude(name:"com/fr/web/**") + exclude(name:"com/fr/fs/**") + exclude(name:"com/fr/design/**") + exclude(name:"com/fr/start/**") + exclude(name:"com/fr/process/**") } - fileset(dir:'${libDir}/tmp'){ - include(name:'javax/mail/**') - include(name:'javax/servlet/**') - include(name:'org/freehep/**') - include(name:'com/fr/third/JAI/**') - include(name:'com/fr/third/antlr/**') - include(name:'com/fr/third/javax/**') - include(name:'com/sun/xml/**') - include(name:'javax/xml/**') + fileset(dir:"${libDir}/tmp"){ + include(name:"javax/mail/**") + include(name:"javax/servlet/**") + include(name:"org/freehep/**") + include(name:"com/fr/third/JAI/**") + include(name:"com/fr/third/antlr/**") + include(name:"com/fr/third/javax/**") + include(name:"com/sun/xml/**") + include(name:"javax/xml/**") } - fileset(dir:'build/classes'){ - include(name:'com/fr/web/*.class') - include(name:'com/fr/web/attr/*.class') + fileset(dir:"build/classes"){ + include(name:"com/fr/web/*.class") + include(name:"com/fr/web/attr/*.class") } } - delete(dir:'${libDir}/tmp') - def jdk6home= 'D:/FineReport/develop/java/jdk1.6u35' - def keystore='frapplet.store' - def keycert='fr.cert' - def keypassword='123456' - def keyalias='fr' + delete(dir:"${libDir}/tmp") + def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" + def keystore="frapplet.store" + def keycert="fr.cert" + def keypassword="123456" + def keyalias="fr" exec(executable:"${jdk6home}/bin/keytool"){ arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") @@ -79,7 +79,7 @@ task appletJar<<{ } delete(file:"${keystore}") delete(file:"${keycert}") - delete(dir:'build/classes') + delete(dir:"build/classes") } diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 731deebe3f..b57b6f5695 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 92e221f194..2c836c3514 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,7 @@ 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}/**/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 118215fc8a..ade1e3efc5 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -34,7 +34,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } From 39895bb1e650d92e639492351d12cb2f0b16cbc4 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:45:52 +0800 Subject: [PATCH 038/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 98 ++++++++++++++++++------------------- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 27199c49a6..4cfb0fc7a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,71 +1,71 @@ -apply plugin: 'java' +apply plugin: "java" tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' + options.encoding = "UTF-8" } -def basicDir='../../' +def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 -FileTree files =fileTree(dir:'./',include:'build.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -def branchName=buildDir.substring(build.DirlastIndexOf ('\\')+1) +FileTree files =fileTree(dir:"./",include:"build.gradle") +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) +def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:'${libDir}/tmp') - mkdir(dir:'build/classes/') - copy(todir:'build/classes/'){ - fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main') + mkdir(dir:"${libDir}/tmp") + mkdir(dir:"build/classes/") + copy(todir:"build/classes/"){ + fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-chart-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-report-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-platform-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp') - unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/tmp') - jar(jarfile:'build/libs/fr-applet-8.0.jar'){ - fileset(dir:'build/classes'){ - exclude(name:'*.*') - exclude(name:'bin/*.*') - exclude(name:'classes/**') - exclude(name:'com/fr/schedule/**') - exclude(name:'com/fr/cell/**') - exclude(name:'com/fr/dialog/**') - exclude(name:'com/fr/view/**') - exclude(name:'com/fr/web/**') - exclude(name:'com/fr/fs/**') - exclude(name:'com/fr/design/**') - exclude(name:'com/fr/start/**') - exclude(name:'com/fr/process/**') + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp") + jar(jarfile:"build/libs/fr-applet-8.0.jar"){ + fileset(dir:"build/classes"){ + exclude(name:"*.*") + exclude(name:"bin/*.*") + exclude(name:"classes/**") + exclude(name:"com/fr/schedule/**") + exclude(name:"com/fr/cell/**") + exclude(name:"com/fr/dialog/**") + exclude(name:"com/fr/view/**") + exclude(name:"com/fr/web/**") + exclude(name:"com/fr/fs/**") + exclude(name:"com/fr/design/**") + exclude(name:"com/fr/start/**") + exclude(name:"com/fr/process/**") } - fileset(dir:'${libDir}/tmp'){ - include(name:'javax/mail/**') - include(name:'javax/servlet/**') - include(name:'org/freehep/**') - include(name:'com/fr/third/JAI/**') - include(name:'com/fr/third/antlr/**') - include(name:'com/fr/third/javax/**') - include(name:'com/sun/xml/**') - include(name:'javax/xml/**') + fileset(dir:"${libDir}/tmp"){ + include(name:"javax/mail/**") + include(name:"javax/servlet/**") + include(name:"org/freehep/**") + include(name:"com/fr/third/JAI/**") + include(name:"com/fr/third/antlr/**") + include(name:"com/fr/third/javax/**") + include(name:"com/sun/xml/**") + include(name:"javax/xml/**") } - fileset(dir:'build/classes'){ - include(name:'com/fr/web/*.class') - include(name:'com/fr/web/attr/*.class') + fileset(dir:"build/classes"){ + include(name:"com/fr/web/*.class") + include(name:"com/fr/web/attr/*.class") } } - delete(dir:'${libDir}/tmp') - def jdk6home= 'D:/FineReport/develop/java/jdk1.6u35' - def keystore='frapplet.store' - def keycert='fr.cert' - def keypassword='123456' - def keyalias='fr' + delete(dir:"${libDir}/tmp") + def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" + def keystore="frapplet.store" + def keycert="fr.cert" + def keypassword="123456" + def keyalias="fr" exec(executable:"${jdk6home}/bin/keytool"){ arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") @@ -79,7 +79,7 @@ task appletJar<<{ } delete(file:"${keystore}") delete(file:"${keycert}") - delete(dir:'build/classes') + delete(dir:"build/classes") } diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 731deebe3f..b57b6f5695 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 92e221f194..2c836c3514 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,7 @@ 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}/**/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 118215fc8a..ade1e3efc5 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -34,7 +34,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } From 0b5d39e2652ea0d08d7173571e5cf537bed075e4 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:52:03 +0800 Subject: [PATCH 039/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4cfb0fc7a3..0dc1b07b16 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1) +def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ From e865f12868c8c4ae713e63501715cb52bf36e30b Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:53:38 +0800 Subject: [PATCH 040/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4cfb0fc7a3..0dc1b07b16 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1) +def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ From 02d62d990a0b3bbb2544dbc0dbf00fe7b2e4e6c8 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:59:18 +0800 Subject: [PATCH 041/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index b57b6f5695..926e87e430 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -26,7 +26,7 @@ sourceSets{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') 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) //声明外部依赖 diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2c836c3514..46717d4acb 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -25,7 +25,7 @@ sourceSets{ } FileTree files =fileTree(dir:'./',include:'build.gradle') 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) //指定外部依赖 diff --git a/designer_form/build.gradle b/designer_form/build.gradle index ade1e3efc5..4409495b9b 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -28,7 +28,7 @@ sourceSets{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') 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) //声明外部依赖 From 578ee8eb397035fc60d0d24192a809ff3dce727f Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 10:00:06 +0800 Subject: [PATCH 042/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index b57b6f5695..926e87e430 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -26,7 +26,7 @@ sourceSets{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') 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) //声明外部依赖 diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2c836c3514..46717d4acb 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -25,7 +25,7 @@ sourceSets{ } FileTree files =fileTree(dir:'./',include:'build.gradle') 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) //指定外部依赖 diff --git a/designer_form/build.gradle b/designer_form/build.gradle index ade1e3efc5..4409495b9b 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -28,7 +28,7 @@ sourceSets{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') 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) //声明外部依赖 From a518e638488f180532be5bd60cb0112c128f0673 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 10:10:18 +0800 Subject: [PATCH 043/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0dc1b07b16..633739a745 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:"${libDir}/tmp") + mkdir(dir:"${libDir}/tmp-${branchName}") mkdir(dir:"build/classes/") copy(todir:"build/classes/"){ fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") @@ -27,8 +27,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp") + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") @@ -44,7 +44,7 @@ task appletJar<<{ exclude(name:"com/fr/start/**") exclude(name:"com/fr/process/**") } - fileset(dir:"${libDir}/tmp"){ + fileset(dir:"${libDir}/tmp-${branchName}"){ include(name:"javax/mail/**") include(name:"javax/servlet/**") include(name:"org/freehep/**") @@ -60,7 +60,7 @@ task appletJar<<{ include(name:"com/fr/web/attr/*.class") } } - delete(dir:"${libDir}/tmp") + delete(dir:"${libDir}/tmp-${branchName}") def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" def keystore="frapplet.store" def keycert="fr.cert" From d07401997f5b9b44c25c59b2522845e12a4e86d8 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 10:10:55 +0800 Subject: [PATCH 044/140] =?UTF-8?q?=E5=A4=9A=E5=8A=9F=E8=83=BD=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0dc1b07b16..633739a745 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:"${libDir}/tmp") + mkdir(dir:"${libDir}/tmp-${branchName}") mkdir(dir:"build/classes/") copy(todir:"build/classes/"){ fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") @@ -27,8 +27,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp") + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") @@ -44,7 +44,7 @@ task appletJar<<{ exclude(name:"com/fr/start/**") exclude(name:"com/fr/process/**") } - fileset(dir:"${libDir}/tmp"){ + fileset(dir:"${libDir}/tmp-${branchName}"){ include(name:"javax/mail/**") include(name:"javax/servlet/**") include(name:"org/freehep/**") @@ -60,7 +60,7 @@ task appletJar<<{ include(name:"com/fr/web/attr/*.class") } } - delete(dir:"${libDir}/tmp") + delete(dir:"${libDir}/tmp-${branchName}") def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" def keystore="frapplet.store" def keycert="fr.cert" From 916b706e88565fe4c0e2ef681b1823428cb2b6a0 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 11:05:41 +0800 Subject: [PATCH 045/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95=20--03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 4409495b9b..bc3c89a11b 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -30,7 +30,8 @@ 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) - +println "this brance name is ${branchName}" +println "this path is buildDir" //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') From 8dc887960d5361eaeb119725064cec36209a4074 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 11:37:30 +0800 Subject: [PATCH 046/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index bc3c89a11b..ac73a01e78 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -30,8 +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) -println "this brance name is ${branchName}" -println "this path is buildDir" + +FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar" +println "${jars}" + //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') From 948f7a349a4d1c37f5ff517f9d13cbd0fb03a709 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 11:41:43 +0800 Subject: [PATCH 047/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index ac73a01e78..94b5eed3f0 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,7 +32,10 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar" -println "${jars}" +jars.each{File file-> +println "-----------this jar path is ${file.path}----------" +} + //声明外部依赖 dependencies{ From 59b5e8d6faf62603313aa63ef21a45c32bf67005 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Thu, 11 Aug 2016 09:34:24 +0800 Subject: [PATCH 048/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 926e87e430..a48a4d2c5b 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -53,7 +53,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 46717d4acb..2b465eca9c 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -51,7 +51,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 94b5eed3f0..5a02f311fa 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -69,7 +69,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From 202e54cb0b77378b087b07f35b3c41d754acf76f Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Thu, 11 Aug 2016 09:41:56 +0800 Subject: [PATCH 049/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 926e87e430..a48a4d2c5b 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -53,7 +53,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 46717d4acb..2b465eca9c 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -51,7 +51,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 4409495b9b..9b4b7eb21a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -63,7 +63,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From c1a1b8b5dc65f2ca101fb9f797934ab13650008a Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Thu, 11 Aug 2016 10:48:51 +0800 Subject: [PATCH 050/140] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95--00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index a39f9589ed..9932a80853 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -31,15 +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) -<<<<<<< HEAD + FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar" jars.each{File file-> println "-----------this jar path is ${file.path}----------" } - - -======= ->>>>>>> adaabb5817789ef492696721df369702adeb9971 //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') From 2703f372f10a9fed2623e2d1bc0311641f2a8723 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 11 Aug 2016 15:30:59 +0800 Subject: [PATCH 051/140] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A1=86=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java index 46245560ac..9d278d0482 100644 --- a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java +++ b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java @@ -32,7 +32,7 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt private void initComponents() { JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced")); - advancedPane.setPreferredSize(new Dimension(600,300)); + advancedPane.setPreferredSize(new Dimension(600, 341)); JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4)); this.add(advancedPane); From 455166016db1f124decda92ba3570648bbf6a485 Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 11 Aug 2016 16:53:12 +0800 Subject: [PATCH 052/140] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=87=8D=E5=86=99=E7=88=B6=E7=B1=BB=E4=B8=AD=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=96=B9=E6=B3=95=EF=BC=88=E9=83=BD=E6=98=AF=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80=E4=B8=AD=E5=8E=9F=E6=9D=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=89=8D=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/FRParameterLayoutAdapter.java | 69 ++++++++++++++++++- .../designer/creator/XWParameterLayout.java | 9 +++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java index 65858c2992..c88579c414 100644 --- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java +++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java @@ -1,14 +1,20 @@ package com.fr.design.designer.beans.adapters.layout; import com.fr.design.beans.GroupModel; +import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.beans.HoverPainter; import com.fr.design.designer.beans.painters.FRParameterLayoutPainter; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.form.parameter.RootDesignGroupModel; +import com.fr.design.utils.ComponentUtils; +import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.container.WParameterLayout; +import java.awt.*; + /** * 琛ㄥ崟鍙傛暟鐣岄潰鐨勭洃鍚櫒 */ @@ -39,5 +45,66 @@ public class FRParameterLayoutAdapter extends FRAbsoluteLayoutAdapter { WParameterLayout wabs = (WParameterLayout)container.toData(); wabs.refreshTagList(); } - + + /** + * 鏄惁鑳藉湪鎸囧畾浣嶇疆娣诲姞缁勪欢 + * + * @param creator 缁勪欢 + * @param x 鍧愭爣x + * @param y 鍧愭爣y + * @return 鑳藉垯杩斿洖true + */ + @Override + public boolean accept(XCreator creator, int x, int y) { + return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight() + && creator.getWidth() <= container.getWidth(); + } + + @Override + protected void addComp(XCreator creator, int x, int y) { + if (XCreatorUtils.getParentXLayoutContainer(creator) != null) { + Rectangle r = ComponentUtils.getRelativeBounds(container); + Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator); + x = creatorRectangle.x - r.x; + y = creatorRectangle.y - r.y; + } else { + int w = creator.getWidth() / 2; + int h = creator.getHeight() / 2; + x = x - w; + y = y - h; + } + + fix(creator, x, y); + container.add(creator); + LayoutUtils.layoutRootContainer(container); + } + + /** + * 璋冩暣缁勪欢澶у皬鍒板悎閫傚昂瀵镐綅缃 + * + * @param creator 缁勪欢 + * @param x 鍧愭爣x + * @param y 鍧愭爣y + */ + @Override + public void fix(XCreator creator, int x, int y) { + if (x < 0) { + x = 0; + } else if (x + creator.getWidth() > container.getWidth()) { + x = container.getWidth() - creator.getWidth(); + } + + if (y < 0) { + y = 0; + } else if (y + creator.getHeight() > container.getHeight()) { + y = container.getHeight() - creator.getHeight(); + } + + creator.setLocation(x, y); + } + + @Override + public ConstraintsGroupModel getLayoutConstraints(XCreator creator) { + return super.getLayoutConstraints(creator); + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java index 890612ccc5..e1ab80b7c4 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java @@ -174,4 +174,13 @@ public class XWParameterLayout extends XWAbsoluteLayout { public XLayoutContainer getTopLayout() { return this; } + + /** + * 鏂板鍒犻櫎鎷変几鍚庢洿鏂版瘡涓粍浠剁殑BoundsWidget + * + * @param xCreator + */ + @Override + public void updateBoundsWidget(XCreator xCreator) { + } } \ No newline at end of file From a37a903212f2816d2d8da341adfab62d81106373 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 12 Aug 2016 15:04:51 +0800 Subject: [PATCH 053/140] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/build.gradle | 60 ++++++++++++-------------------------- 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 9932a80853..1a87cbf95b 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -3,61 +3,39 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 -sourceCompatibility=1.8 -//指定生成的jar包版本 + version='8.0' -def srcDir="." +def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" +def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" -//指明生成jar包的名字 jar{ baseName='fr-designer-report' } -//源码所在位置 + sourceSets{ main{ java{ - srcDirs=["${srcDir}/src", -"${srcDir}/../designer/src"] + srcDirs=["${srcDir}/designer/src", +"${srcDir}/designer_form/src"] } } } - -//获取什么分支名 -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}/**/*.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:'**/*.jar') +compile fileTree(dir:libDir,include:'*.jar') +compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } -//指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} -//将非.java文件复制到classes文件夹下 参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - with dataContent.call("${srcDir}/src") - with dataContent.call("${srcDir}/../designer/src") + from ("${srcDir}/designer/src"){ + exclude '**/*.java' + } + from ("${srcDir}/designer_form/src") into ('build/classes/main') } @@ -68,19 +46,17 @@ 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') + fileset(dir:'../../lib',includes:'*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/designer/src"){ include (name:'**/*.js') - include (name:'**/*.css') } - fileset (dir:"${srcDir}/../designer/src"){ + fileset (dir:"${srcDir}/designer_form/src"){ include (name:'**/*.js') - include (name:'**/*.css') + } } From a62467bdf988b2da418beea9d74671ab432503ed Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 12 Aug 2016 18:06:31 +0800 Subject: [PATCH 054/140] l --- designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java index 1d7a29ac3e..084ace48fe 100644 --- a/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java +++ b/designer/src/com/fr/design/mainframe/ActiveKeyGenerator.java @@ -4,6 +4,7 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.mainframe.bbs.BBSConstants; import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; +import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.core.UUID; @@ -194,7 +195,7 @@ public class ActiveKeyGenerator { //鑾峰彇char瀵瑰簲鐨刬nt鍊 private static int getCharIntValue(char charStr){ - if (!BaseUtils.isNum(charStr)) { + if (!StableUtils.isNum(charStr)) { return 0; } return Character.getNumericValue(charStr); From 7797035bd18bd4fd5931594c322ae2b70dbd7e1c Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 16 Aug 2016 10:32:53 +0800 Subject: [PATCH 055/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- build.gradle.bak | 86 +++++++++++++++++++++++++++++++++ designer_base/build.gradle | 16 +++--- designer_base/build.gradle.bak | 70 +++++++++++++++++++++++++++ designer_chart/build.gradle | 12 ++--- designer_chart/build.gradle.bak | 66 +++++++++++++++++++++++++ designer_form/build.gradle | 18 +++---- designer_form/build.gradle.bak | 83 +++++++++++++++++++++++++++++++ 8 files changed, 329 insertions(+), 24 deletions(-) create mode 100644 build.gradle.bak create mode 100644 designer_base/build.gradle.bak create mode 100644 designer_chart/build.gradle.bak create mode 100644 designer_form/build.gradle.bak diff --git a/build.gradle b/build.gradle index 633739a745..659130f9ef 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ tasks.withType(JavaCompile){ def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" -//获取什么分支名 +//鑾峰彇浠涔堝垎鏀悕 FileTree files =fileTree(dir:"./",include:"build.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) diff --git a/build.gradle.bak b/build.gradle.bak new file mode 100644 index 0000000000..633739a745 --- /dev/null +++ b/build.gradle.bak @@ -0,0 +1,86 @@ +apply plugin: "java" +tasks.withType(JavaCompile){ + options.encoding = "UTF-8" +} + +def basicDir="../../" +def libDir="${basicDir}/finereport-lib-stable" +//获取什么分支名 +FileTree files =fileTree(dir:"./",include:"build.gradle") +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) +def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) + +task appletJar<<{ + + ant{ + mkdir(dir:"${libDir}/tmp-${branchName}") + mkdir(dir:"build/classes/") + copy(todir:"build/classes/"){ + fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") + + } + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + jar(jarfile:"build/libs/fr-applet-8.0.jar"){ + fileset(dir:"build/classes"){ + exclude(name:"*.*") + exclude(name:"bin/*.*") + exclude(name:"classes/**") + exclude(name:"com/fr/schedule/**") + exclude(name:"com/fr/cell/**") + exclude(name:"com/fr/dialog/**") + exclude(name:"com/fr/view/**") + exclude(name:"com/fr/web/**") + exclude(name:"com/fr/fs/**") + exclude(name:"com/fr/design/**") + exclude(name:"com/fr/start/**") + exclude(name:"com/fr/process/**") + } + fileset(dir:"${libDir}/tmp-${branchName}"){ + include(name:"javax/mail/**") + include(name:"javax/servlet/**") + include(name:"org/freehep/**") + include(name:"com/fr/third/JAI/**") + include(name:"com/fr/third/antlr/**") + include(name:"com/fr/third/javax/**") + include(name:"com/sun/xml/**") + include(name:"javax/xml/**") + + } + fileset(dir:"build/classes"){ + include(name:"com/fr/web/*.class") + include(name:"com/fr/web/attr/*.class") + } + } + delete(dir:"${libDir}/tmp-${branchName}") + def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" + def keystore="frapplet.store" + def keycert="fr.cert" + def keypassword="123456" + def keyalias="fr" + + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") + } + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") + } + + exec(executable:"${jdk6home}/bin/jarsigner"){ + arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") + } + delete(file:"${keystore}") + delete(file:"${keycert}") + delete(dir:"build/classes") + + } + +} \ No newline at end of file diff --git a/designer_base/build.gradle b/designer_base/build.gradle index a48a4d2c5b..bd5f62e8e1 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成jar包版本 +//鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' -//生成jar包重命名 +//鐢熸垚jar鍖呴噸鍛藉悕 jar{ baseName='fr-designer-core' } @@ -15,7 +15,7 @@ jar{ def srcDir="." -//指定源码路径 +//鎸囧畾婧愮爜璺緞 sourceSets{ main{ java{ @@ -23,13 +23,13 @@ sourceSets{ } } } -//获取什么分支名 +//鑾峰彇浠涔堝垎鏀悕 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') @@ -37,7 +37,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/* testCompile 'junit:junit:4.12' } -//复制非.java文件到classes文件夹下参与打包 +//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ @@ -49,7 +49,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak new file mode 100644 index 0000000000..a48a4d2c5b --- /dev/null +++ b/designer_base/build.gradle.bak @@ -0,0 +1,70 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包版本 +version='8.0' +//生成jar包重命名 +jar{ + baseName='fr-designer-core' +} + + +def srcDir="." + +//指定源码路径 +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src"] + } + } +} +//获取什么分支名 +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") + + testCompile 'junit:junit:4.12' +} +//复制非.java文件到classes文件夹下参与打包 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + into 'build/classes/main' + } + +} + + +//压缩项目中的js文件 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + } + } + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + } + + } +} +jar.dependsOn compressJS + + + diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2b465eca9c..2a97773711 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成jar包的版本 +//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' def srcDir="." -//对生成的jar包进行重命名 +//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 jar{ baseName='fr-designer-chart' @@ -28,14 +28,14 @@ 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") testCompile 'junit:junit:4.12' } -//将非.java 文件复制到classes文件夹下参与打包 +//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ @@ -47,7 +47,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak new file mode 100644 index 0000000000..2b465eca9c --- /dev/null +++ b/designer_chart/build.gradle.bak @@ -0,0 +1,66 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包的版本 +version='8.0' + +def srcDir="." + +//对生成的jar包进行重命名 + +jar{ + baseName='fr-designer-chart' +} + +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src"] + } + } +} +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") + + testCompile 'junit:junit:4.12' +} +//将非.java 文件复制到classes文件夹下参与打包 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + + } + into 'build/classes/main' + } + +} + +//压缩项目中的js文件 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + } + } + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + } + + } +} +jar.dependsOn compressJS + diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 9b4b7eb21a..59b20a5b32 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -3,19 +3,19 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成的jar包版本 +//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' def srcDir="." -//指明生成jar包的名字 +//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 jar{ baseName='fr-designer-report' } -//源码所在位置 +//婧愮爜鎵鍦ㄤ綅缃 sourceSets{ main{ java{ @@ -25,13 +25,13 @@ sourceSets{ } } -//获取什么分支名 +//鑾峰彇浠涔堝垎鏀悕 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") @@ -39,7 +39,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/* testCompile 'junit:junit:4.12' } -//指明无法编译文件所在路径 +//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 def dataContent ={def dir -> copySpec{ from ("${dir}"){ @@ -48,7 +48,7 @@ def dataContent ={def dir -> } } -//将非.java文件复制到classes文件夹下 参与打包 +//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ with dataContent.call("${srcDir}/src") @@ -59,7 +59,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak new file mode 100644 index 0000000000..9b4b7eb21a --- /dev/null +++ b/designer_form/build.gradle.bak @@ -0,0 +1,83 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成的jar包版本 +version='8.0' + +def srcDir="." + + +//指明生成jar包的名字 +jar{ + baseName='fr-designer-report' +} +//源码所在位置 +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src", +"${srcDir}/../designer/src"] + } + } +} + +//获取什么分支名 +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") + + testCompile 'junit:junit:4.12' +} + +//指明无法编译文件所在路径 +def dataContent ={def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} + +//将非.java文件复制到classes文件夹下 参与打包 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + with dataContent.call("${srcDir}/src") + with dataContent.call("${srcDir}/../designer/src") + into ('build/classes/main') + } + +} + + +//压缩项目中的js文件 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + } + } + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + + } + fileset (dir:"${srcDir}/../designer/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + } + + } +} +jar.dependsOn compressJS + From 0362a977ea2aecc7f671d0df2900c12dfab48b7b Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Thu, 18 Aug 2016 19:17:28 +0800 Subject: [PATCH 056/140] =?UTF-8?q?=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 18 +++++++++--------- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index bd5f62e8e1..cbaf1a6953 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -56,7 +56,7 @@ task compressJS{ fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') include (name:'**/*.css') diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index a48a4d2c5b..cbaf1a6953 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -3,11 +3,11 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成jar包版本 +//鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' -//生成jar包重命名 +//鐢熸垚jar鍖呴噸鍛藉悕 jar{ baseName='fr-designer-core' } @@ -15,7 +15,7 @@ jar{ def srcDir="." -//指定源码路径 +//鎸囧畾婧愮爜璺緞 sourceSets{ main{ java{ @@ -23,13 +23,13 @@ sourceSets{ } } } -//获取什么分支名 +//鑾峰彇浠涔堝垎鏀悕 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') @@ -37,7 +37,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/* testCompile 'junit:junit:4.12' } -//复制非.java文件到classes文件夹下参与打包 +//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ @@ -49,14 +49,14 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') include (name:'**/*.css') diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2a97773711..9466491957 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -54,7 +54,7 @@ task compressJS{ fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') include (name:'**/*.css') diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 2b465eca9c..2a97773711 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -3,14 +3,14 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成jar包的版本 +//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' def srcDir="." -//对生成的jar包进行重命名 +//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 jar{ baseName='fr-designer-chart' @@ -28,14 +28,14 @@ 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") testCompile 'junit:junit:4.12' } -//将非.java 文件复制到classes文件夹下参与打包 +//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ @@ -47,7 +47,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { From 1201193874c2c788d0b03b59336c613679b69762 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Fri, 19 Aug 2016 17:04:02 +0800 Subject: [PATCH 057/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9jdk=E7=89=88=E6=9C=AC?= =?UTF-8?q?1.8->1.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index cbaf1a6953..3bcedbc3ba 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' //鐢熸垚jar鍖呴噸鍛藉悕 diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 9466491957..3d495ce12b 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 2a97773711..9466491957 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -54,7 +54,7 @@ task compressJS{ fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') include (name:'**/*.css') diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 59b20a5b32..d38c7a2d5e 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index 9b4b7eb21a..59b20a5b32 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -3,19 +3,19 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成的jar包版本 +//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' def srcDir="." -//指明生成jar包的名字 +//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 jar{ baseName='fr-designer-report' } -//源码所在位置 +//婧愮爜鎵鍦ㄤ綅缃 sourceSets{ main{ java{ @@ -25,13 +25,13 @@ sourceSets{ } } -//获取什么分支名 +//鑾峰彇浠涔堝垎鏀悕 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") @@ -39,7 +39,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/* testCompile 'junit:junit:4.12' } -//指明无法编译文件所在路径 +//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 def dataContent ={def dir -> copySpec{ from ("${dir}"){ @@ -48,7 +48,7 @@ def dataContent ={def dir -> } } -//将非.java文件复制到classes文件夹下 参与打包 +//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ with dataContent.call("${srcDir}/src") @@ -59,7 +59,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { From 4c3b74469fdc08e2e469f4d3ced8675f9f297bf6 Mon Sep 17 00:00:00 2001 From: zhouping Date: Mon, 29 Aug 2016 13:39:24 +0800 Subject: [PATCH 058/140] =?UTF-8?q?release=E5=88=86=E6=94=AF=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B8=8A=E5=B1=8F=E8=94=BD=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/gui/core/FormWidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index 214d2cd679..fef70c588d 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file +package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file From be94670f8c77e49286158e88ad2a4c5e5a14eaab Mon Sep 17 00:00:00 2001 From: sunmondong Date: Mon, 29 Aug 2016 17:30:26 +0800 Subject: [PATCH 059/140] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 3bcedbc3ba..afbfce790e 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 3d495ce12b..a01d57c3dc 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 9466491957..3d495ce12b 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' diff --git a/designer_form/build.gradle b/designer_form/build.gradle index d38c7a2d5e..5a52b09f0a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -34,7 +34,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index 59b20a5b32..d38c7a2d5e 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' From 05fa04516be0225bf79d0f8fa681529e3b557ff4 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Mon, 29 Aug 2016 17:38:14 +0800 Subject: [PATCH 060/140] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 20 ++++++++++---------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index cbaf1a6953..285295c56d 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index bd5f62e8e1..cbaf1a6953 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -56,7 +56,7 @@ task compressJS{ fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') include (name:'**/*.css') diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 9466491957..ec39e786a0 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 2a97773711..9466491957 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -54,7 +54,7 @@ task compressJS{ fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') include (name:'**/*.css') diff --git a/designer_form/build.gradle b/designer_form/build.gradle index ca89333a40..6c0df949c4 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -33,7 +33,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") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index f6c634dd1d..d3db947e01 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -3,19 +3,19 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -//指定构建的jdk版本 +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 sourceCompatibility=1.8 -//指定生成的jar包版本 +//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' def srcDir="." -//指明生成jar包的名字 +//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 jar{ baseName='fr-designer-report' } -//源码所在位置 +//婧愮爜鎵鍦ㄤ綅缃 sourceSets{ main{ java{ @@ -25,20 +25,20 @@ sourceSets{ } } -//获取什么分支名 +//鑾峰彇浠涔堝垎鏀悕 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}/**/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' } -//指明无法编译文件所在路径 +//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 def dataContent ={def dir -> copySpec{ from ("${dir}"){ @@ -47,7 +47,7 @@ def dataContent ={def dir -> } } -//将非.java文件复制到classes文件夹下 参与打包 +//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 task copyFile(type:Copy,dependsOn:compileJava){ copy{ with dataContent.call("${srcDir}/src") @@ -58,7 +58,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ } -//压缩项目中的js文件 +//鍘嬬缉椤圭洰涓殑js鏂囦欢 task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { From 49b3b70a744d97236dbcdd596c6e49758b798aa6 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Mon, 29 Aug 2016 17:39:08 +0800 Subject: [PATCH 061/140] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=BC=A9=E5=B0=8F?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 4 ++-- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index afbfce790e..b1014f8e2e 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index cbaf1a6953..afbfce790e 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' //鐢熸垚jar鍖呴噸鍛藉悕 @@ -33,7 +33,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index a01d57c3dc..4b76224d6a 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 3d495ce12b..a01d57c3dc 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -31,7 +31,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 5a52b09f0a..7210a96e41 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -34,7 +34,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index d38c7a2d5e..5a52b09f0a 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -34,7 +34,7 @@ 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") testCompile 'junit:junit:4.12' } From 9437dbd7a1f7c645c7aa3942ff3f6eded7f75dff Mon Sep 17 00:00:00 2001 From: sunmondong Date: Mon, 29 Aug 2016 18:06:33 +0800 Subject: [PATCH 062/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunmondong --- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index b1014f8e2e..afbfce790e 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index afbfce790e..b1014f8e2e 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -33,7 +33,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 4b76224d6a..a01d57c3dc 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index a01d57c3dc..4b76224d6a 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -31,7 +31,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 7210a96e41..5a52b09f0a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -34,7 +34,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index 5a52b09f0a..7210a96e41 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -34,7 +34,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar") testCompile 'junit:junit:4.12' } From 4a09ba2985936f5719a5b5d1a3bcc8ac17d5b3ba Mon Sep 17 00:00:00 2001 From: sunmondong Date: Mon, 29 Aug 2016 18:08:06 +0800 Subject: [PATCH 063/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 285295c56d..e7c5a8e1ff 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index cbaf1a6953..285295c56d 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -33,7 +33,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index ec39e786a0..92f0551624 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 9466491957..ec39e786a0 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -31,7 +31,7 @@ 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") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 6c0df949c4..4204c2415e 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -33,7 +33,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index d3db947e01..6c0df949c4 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -33,7 +33,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") testCompile 'junit:junit:4.12' } From 444446ad051cc1dd874ae238d14a4907cc0c9622 Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 30 Aug 2016 16:21:36 +0800 Subject: [PATCH 064/140] =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/beans/location/AccessDirection.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java b/designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java index dde93b4efd..a9d7007703 100644 --- a/designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java +++ b/designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java @@ -33,6 +33,9 @@ public abstract class AccessDirection implements Direction { protected int[] sorption(int x, int y,Rectangle current_bounds, FormDesigner designer) { // 鑷傚簲甯冨眬涓嶉渶瑕佸惛闄勭嚎锛屼絾闇瑕佸榻愮嚎锛屽榻愮嚎鍚庨潰澶勭悊 if (!designer.hasWAbsoluteLayout()) { + designer.getStateModel().setEquidistantLine(null); + designer.getStateModel().setXAbsorptionline(null); + designer.getStateModel().setYAbsorptionline(null); return new int[] { x, y }; } else { int posy = current_bounds.y; @@ -111,6 +114,7 @@ public abstract class AccessDirection implements Direction { designer.getStateModel().setXAbsorptionline(findInX && current_bounds.getWidth() > MoveUtils.SORPTION_UNIT ? Absorptionline.createXAbsorptionline(point.x) : null); designer.getStateModel().setYAbsorptionline(findInY && current_bounds.getHeight() > MoveUtils.SORPTION_UNIT ? Absorptionline.createYAbsorptionline(point.y) : null); + designer.getStateModel().setEquidistantLine(null); } private Rectangle getWidgetRelativeBounds(Rectangle bounds, FormSelection selection){ From 4883e89a3cb6affac977460d41f22f1cef761ba9 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 2 Sep 2016 11:37:42 +0800 Subject: [PATCH 065/140] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + build.gradle.bak | 4 ++-- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 2 +- designer_form/build.gradle | 4 ++-- designer_form/build.gradle.bak | 4 ++-- .../design/designer/creator/XWParameterLayout.java | 12 ------------ 9 files changed, 11 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index abc9815956..659130f9ef 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ apply plugin: "java" tasks.withType(JavaCompile){ options.encoding = "UTF-8" } + def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //鑾峰彇浠涔堝垎鏀悕 diff --git a/build.gradle.bak b/build.gradle.bak index 67a8a0e70f..633739a745 100644 --- a/build.gradle.bak +++ b/build.gradle.bak @@ -2,10 +2,10 @@ apply plugin: "java" tasks.withType(JavaCompile){ options.encoding = "UTF-8" } -sourceCompatibility=1.7 + def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" -//鑾峰彇浠涔堝垎鏀悕 +//获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index e7c5a8e1ff..afbfce790e 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' //鐢熸垚jar鍖呴噸鍛藉悕 diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index 285295c56d..b1014f8e2e 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' //鐢熸垚jar鍖呴噸鍛藉悕 diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 92f0551624..a01d57c3dc 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index ec39e786a0..4b76224d6a 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 4204c2415e..5a52b09f0a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' @@ -30,6 +30,7 @@ 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') @@ -62,7 +63,6 @@ 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') } } diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index 6c0df949c4..7210a96e41 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' @@ -30,6 +30,7 @@ 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') @@ -62,7 +63,6 @@ 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') } } diff --git a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java index d85c610ac9..e1ab80b7c4 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java @@ -183,16 +183,4 @@ public class XWParameterLayout extends XWAbsoluteLayout { @Override public void updateBoundsWidget(XCreator xCreator) { } - - /** - * 鏂板鍒犻櫎鎷変几鍚庢瘡涓粍浠剁殑BoundsWidget - */ - @Override - public void updateBoundsWidget() { - } - - @Override - protected String getIconName() { - return "layout_absolute.png"; - } } \ No newline at end of file From 27f554cb8c0ee3f06a39277bba15969297aa53cb Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 2 Sep 2016 14:26:07 +0800 Subject: [PATCH 066/140] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/creator/XWParameterLayout.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java index e1ab80b7c4..d85c610ac9 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java @@ -183,4 +183,16 @@ public class XWParameterLayout extends XWAbsoluteLayout { @Override public void updateBoundsWidget(XCreator xCreator) { } + + /** + * 鏂板鍒犻櫎鎷変几鍚庢瘡涓粍浠剁殑BoundsWidget + */ + @Override + public void updateBoundsWidget() { + } + + @Override + protected String getIconName() { + return "layout_absolute.png"; + } } \ No newline at end of file From cf723aa0474e4dcfc10c5e0fb53a337ecd178a3e Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 7 Sep 2016 11:08:31 +0800 Subject: [PATCH 067/140] =?UTF-8?q?toolKit=E6=94=BE=E5=88=B0xwabsolute?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/designer/creator/XWAbsoluteLayout.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java index a1fc32c402..210343f8ed 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -75,7 +75,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { xConnectorMap.put(connector, new XConnector(connector, this)); } - initPercent(); + initPercent(widget); } /** @@ -89,13 +89,14 @@ public class XWAbsoluteLayout extends XLayoutContainer { } //鏍规嵁灞忓箷澶у皬鏉ョ‘瀹氭樉绀虹殑鐧惧垎姣, 1440*900榛樿100%, 1366*768缂╂斁90% - private void initPercent(){ + private void initPercent(WAbsoluteLayout widget){ Toolkit toolkit = Toolkit.getDefaultToolkit(); Dimension scrnsize = toolkit.getScreenSize(); double screenValue = FRScreen.getByDimension(scrnsize).getValue(); if(screenValue != FormArea.DEFAULT_SLIDER){ this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER); } + widget.setDesigningResolution(scrnsize); } /** From 953ee859c41135d785fc22b0df8aca336933d510 Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 8 Sep 2016 09:27:08 +0800 Subject: [PATCH 068/140] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index d0177d4046..4cf231d59e 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -326,7 +326,7 @@ public abstract class ToolBarMenuDock { shortCuts.add(new SignAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } - private MenuDef createHelpMenuDef() { + public MenuDef createHelpMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); for (ShortCut shortCut : otherHelpShortCuts) { @@ -335,7 +335,7 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.HELP); return menuDef; } - private MenuDef createCommunityMenuDef() { + public MenuDef createCommunityMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); for (ShortCut shortCut : otherCommunityShortCuts) { From 00e778f1c12cc4608dc9e0b4e64221b13753e3d5 Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 8 Sep 2016 09:31:25 +0800 Subject: [PATCH 069/140] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 4cf231d59e..7eaa5cd665 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -120,7 +120,7 @@ public abstract class ToolBarMenuDock { ///////////////////////////////menu below///////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// - private MenuDef[] menus(final ToolBarMenuDockPlus plus) { + public MenuDef[] menus(final ToolBarMenuDockPlus plus) { java.util.List menuList = new java.util.ArrayList(); // 娣诲姞鏂囦欢鑿滃崟 menuList.add(createFileMenuDef(plus)); From b9c1e4ec9afedc3ff90e8e61d3be4476244a5b36 Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 8 Sep 2016 09:38:25 +0800 Subject: [PATCH 070/140] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 7eaa5cd665..5392f2dfe8 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -142,7 +142,7 @@ public abstract class ToolBarMenuDock { return menuList.toArray(new MenuDef[menuList.size()]); } - private void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { + public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { // 缁欒彍鍗曞姞鎻掍欢鍏ュ彛 for (MenuDef m : menuDefs) { switch (m.getAnchor()) { @@ -171,7 +171,7 @@ public abstract class ToolBarMenuDock { return plus.menus4Target(); } - private MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { + public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F'); ShortCut[] scs = new ShortCut[0]; From bca32e9cab13e02eac1759e9d9cab6feb9759e87 Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 8 Sep 2016 16:24:15 +0800 Subject: [PATCH 071/140] =?UTF-8?q?bug104400=E4=BC=A0master(=E7=B4=A7?= =?UTF-8?q?=E6=80=A5bug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/layout/FRBodyLayoutAdapter.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java index b5dbb34855..313c08b02b 100644 --- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java +++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java @@ -911,23 +911,23 @@ public class FRBodyLayoutAdapter extends AbstractLayoutAdapter{ minUpH = getUpMinHeightComp(cY, x); minDownH = getDownMinHeightComp(currentComp, y); dealTrisectAtTop(child, minUpH, minDownH); - } else if(ComparatorUtils.equals(trisectAreaDirect, COMP_BOTTOM)) { - minUpH = getUpMinHeightComp(cY+cH+actualVal, x); - if (cY+cH+DEFAULT_AREA_LENGTH margin.getLeft()) { - Component targetRightComp = container.getLeftComp(cX, y); - minLeftW = getMinLeftWidth(targetRightComp, cX-DEFAULT_AREA_LENGTH); + minRightW = getMinRightWidth(cX, 0, y); + if (cX - DEFAULT_AREA_LENGTH > margin.getLeft()) { + Component targetRightComp = container.getLeftComp(cX, y); + minLeftW = getMinLeftWidth(targetRightComp, cX - DEFAULT_AREA_LENGTH - actualVal);//bug104400娌＄畻涓婇棿闅 } dealTrisectAtRight(child, minLeftW, minRightW); } From fb3a4724cbb8b975aa83419166f3a0a32f33e512 Mon Sep 17 00:00:00 2001 From: hugh Date: Wed, 14 Sep 2016 12:04:04 +0800 Subject: [PATCH 072/140] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=96=B9=E6=B3=95=E4=BE=BF=E4=BA=8EOEM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrame.java | 73 ++++++++++++------- .../src/com/fr/start/BaseDesigner.java | 2 +- 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index a1f5f16a4b..6caa27a15f 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -115,7 +115,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private int contentWidth = (int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth()); private int contentHeight = (int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight()); - + private WindowAdapter windowAdapter = new WindowAdapter() { public void windowOpened(WindowEvent e) { HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setComposite(); @@ -166,11 +166,52 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta protected DesktopCardPane getCenterTemplateCardPane() { return centerTemplateCardPane; } - + + /** + * 鐢熸垚frame鐨勬柟娉 + * @param ad + * @return + */ + public static DesignerFrame getNewInstance(ToolBarMenuDock ad){ + DesignerFrame frame = new DesignerFrame(ad); + frame.initMenuPane(ad); + return frame; + } + + /** + * 鍒濆menuPane鐨勬柟娉 鏂逛究OEM鏃朵慨鏀硅缁勪欢 + * @param ad + */ + protected void initMenuPane(ToolBarMenuDock ad){ + menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); + menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); + basePane.add(menuPane, BorderLayout.NORTH); + this.resetToolkitByPlus(null); + } + /** - * Constructor. + * @param ad + * @return */ - public DesignerFrame(ToolBarMenuDock ad) { + protected JPanel initNorthEastPane(final ToolBarMenuDock ad){ + //hugh: private淇敼涓簆rotected鏂逛究oem鐨勬椂鍊欎慨鏀瑰彸涓婄殑缁勪欢鏋勬垚 + //椤堕儴鏃ュ織+鐧婚檰鎸夐挳 + final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + GeneralContext.addPluginReadListener(new PluginReadListener() { + @Override + public void success() { + TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); + if (processor == null) { + processor = new DefaultTitlePlace(); + } + processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); + } + }); + return northEastPane; + } + + protected DesignerFrame(ToolBarMenuDock ad) { setName(DESIGNER_FRAME_NAME); this.ad = ad; this.initTitleIcon(); @@ -182,9 +223,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta // the content pane basePane.setLayout(new BorderLayout()); - menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); - menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); + toolbarPane = new JPanel() { public Dimension getPreferredSize() { @@ -211,7 +250,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta centerPane.add(centerTemplateCardPane = new DesktopCardPane(), BorderLayout.CENTER); centerPane.add(toolbarPane, BorderLayout.NORTH); - basePane.add(menuPane, BorderLayout.NORTH); + basePane.add(centerPane, BorderLayout.CENTER); laoyoutWestPane(); basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.EAST); @@ -222,7 +261,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta // 璋冩暣Window澶у皬 modWindowBounds(); - this.resetToolkitByPlus(null); + // p:妫鏌ユ墍鏈夋寜閽殑鍙鎬у拰鏄惁鍙互缂栬緫鎬. checkToolbarMenuEnable(); @@ -256,22 +295,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); } } - - private JPanel initNorthEastPane(final ToolBarMenuDock ad){ - //椤堕儴鏃ュ織+鐧婚檰鎸夐挳 - final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - GeneralContext.addPluginReadListener(new PluginReadListener() { - @Override - public void success() { - TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); - if (processor == null) { - processor = new DefaultTitlePlace(); - } - processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); - } - }); - return northEastPane; - } private void addWindowListeners(ArrayList listeners){ for(WindowListener listener : listeners){ diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 470affb44f..45c90a0862 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -148,7 +148,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } protected DesignerFrame createDesignerFrame() { - return new DesignerFrame(this); + return DesignerFrame.getNewInstance(this); } protected int getStartPort() { From 1fcca594cb2c12b812c4cbb21c86cbcde2f9b0b2 Mon Sep 17 00:00:00 2001 From: hugh Date: Wed, 14 Sep 2016 14:39:01 +0800 Subject: [PATCH 073/140] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=96=B9=E4=BE=BFOEM?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8F=B3=E4=B8=8A=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=81=9A=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrame.java | 19 ++----------------- .../src/com/fr/start/BaseDesigner.java | 4 +++- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 6caa27a15f..83d26786ac 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -167,22 +167,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta return centerTemplateCardPane; } - /** - * 鐢熸垚frame鐨勬柟娉 - * @param ad - * @return - */ - public static DesignerFrame getNewInstance(ToolBarMenuDock ad){ - DesignerFrame frame = new DesignerFrame(ad); - frame.initMenuPane(ad); - return frame; - } - /** * 鍒濆menuPane鐨勬柟娉 鏂逛究OEM鏃朵慨鏀硅缁勪欢 * @param ad */ - protected void initMenuPane(ToolBarMenuDock ad){ + public void initMenuPane(){ menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); @@ -211,20 +200,16 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta return northEastPane; } - protected DesignerFrame(ToolBarMenuDock ad) { + public DesignerFrame(ToolBarMenuDock ad) { setName(DESIGNER_FRAME_NAME); this.ad = ad; this.initTitleIcon(); this.setTitle();// james:鍥犱负鏈夐粯璁ょ殑浜 - // set this to context. DesignerContext.setDesignerFrame(this); // the content pane basePane.setLayout(new BorderLayout()); - - - toolbarPane = new JPanel() { public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 45c90a0862..92261b6dbc 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -148,7 +148,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } protected DesignerFrame createDesignerFrame() { - return DesignerFrame.getNewInstance(this); + DesignerFrame frame = new DesignerFrame(this); + frame.initMenuPane(); + return frame; } protected int getStartPort() { From d3be97ae904da93c6b69d176ab284167d3fe5c24 Mon Sep 17 00:00:00 2001 From: hugh Date: Wed, 14 Sep 2016 14:53:32 +0800 Subject: [PATCH 074/140] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 5 +++-- designer_base/src/com/fr/start/BaseDesigner.java | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 83d26786ac..a1bffce174 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -171,7 +171,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta * 鍒濆menuPane鐨勬柟娉 鏂逛究OEM鏃朵慨鏀硅缁勪欢 * @param ad */ - public void initMenuPane(){ + protected void initMenuPane(){ menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); @@ -207,7 +207,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta this.setTitle();// james:鍥犱负鏈夐粯璁ょ殑浜 // set this to context. DesignerContext.setDesignerFrame(this); - + // the content pane basePane.setLayout(new BorderLayout()); toolbarPane = new JPanel() { @@ -267,6 +267,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta this.setExtendedState(JFrame.MAXIMIZED_BOTH); this.setDropTarget(new DropTarget(this, DnDConstants.ACTION_MOVE, new FileDropTargetListener(), true)); closeMode = UIConstants.CLOSE_OF_AUTHORITY; + initMenuPane(); } public void initTitleIcon() { diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 92261b6dbc..a116c98644 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -148,9 +148,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } protected DesignerFrame createDesignerFrame() { - DesignerFrame frame = new DesignerFrame(this); - frame.initMenuPane(); - return frame; + return new DesignerFrame(this); } protected int getStartPort() { From a098ae8d6c70128dd6e38e1a287a478fbc593ce6 Mon Sep 17 00:00:00 2001 From: hugh Date: Tue, 20 Sep 2016 11:11:33 +0800 Subject: [PATCH 075/140] =?UTF-8?q?=E6=8A=BD=E5=87=BAstatic=E6=96=B9?= =?UTF-8?q?=E4=BE=BFOEM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/SheetNameTabPane.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java index 350cf9a091..aac628037e 100644 --- a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java @@ -273,7 +273,17 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse leftButton.setEnabled(buttonEnabled); rightButton.setEnabled(buttonEnabled); } - + + /** + * 鎶藉嚭鏉ユ柟渚縊EM + * @return + */ + public Icon getAddWorkSheet(){ + return ADD_WORK_SHEET; + } + public Icon getWorkSheetIcon(){ + return WORK_SHEET_ICON; + } @Override /** * 鐢籘ab @@ -290,7 +300,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse double textHeight = this.getSize().getHeight() - 1; widthArray = calculateWidthArray(); - int operationWidth = GRAP + ADD_WORK_SHEET.getIconWidth() + ICON_SEP_DISTANCE + ADD_POLY_SHEET.getIconWidth(); + int operationWidth = GRAP + getAddWorkSheet().getIconWidth() + ICON_SEP_DISTANCE + ADD_POLY_SHEET.getIconWidth(); double maxWidth = getWidth() - operationWidth - buttonPane.getWidth();// 鏈澶у搴 paintBackgroundAndLine(g2d, textHeight, maxWidth, charWidth, textAscent); checkButton(showCount < widthArray.length); @@ -321,7 +331,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName(); isNeedPaintedAuthority = templateReport.getWorkSheetPrivilegeControl().checkInvisible(selectedRoles); } - sheeticon = templateReport instanceof WorkSheet ? WORK_SHEET_ICON : POLY_SHEET_ICON; + sheeticon = templateReport instanceof WorkSheet ? getWorkSheetIcon() : POLY_SHEET_ICON; String sheetName = workBook.getReportName(i); if (i == selectedIndex) { paintSelectedTab(g2d, sheeticon, textHeight, textX, sheetName, charWidth, textAscent, isNeedPaintedAuthority); @@ -352,8 +362,8 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse } protected void paintAddButton(Graphics2D g2d){ - ADD_WORK_SHEET.paintIcon(this, g2d, iconLocation, 3); - ADD_POLY_SHEET.paintIcon(this, g2d, iconLocation + ADD_WORK_SHEET.getIconWidth() + ICON_SEP_DISTANCE, 3); + getAddWorkSheet().paintIcon(this, g2d, iconLocation, 3); + ADD_POLY_SHEET.paintIcon(this, g2d, iconLocation + getAddWorkSheet().getIconWidth() + ICON_SEP_DISTANCE, 3); } /** @@ -757,7 +767,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse widthArray = calculateWidthArray(); int width = widthArray[i]; textX += width + 1; - int operationWidth = GRAP + ADD_WORK_SHEET.getIconWidth() + ICON_SEP_DISTANCE + ADD_POLY_SHEET.getIconWidth(); + int operationWidth = GRAP + getAddWorkSheet().getIconWidth() + ICON_SEP_DISTANCE + ADD_POLY_SHEET.getIconWidth(); double maxWidth = getWidth() - operationWidth - buttonPane.getWidth();// 鏈澶у搴 if (i < widthArray.length - 1 && textX + widthArray[i + 1] + 1 > maxWidth) { isOvertakeWidth = true; From 3d5880b7cb83067262fb674237a743fa613b4dd6 Mon Sep 17 00:00:00 2001 From: zhouping Date: Fri, 23 Sep 2016 09:41:24 +0800 Subject: [PATCH 076/140] =?UTF-8?q?=E5=8F=AA=E5=BC=80=E6=94=BE=E7=BB=99?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=A2=E6=88=B7=E6=B5=8B=E8=AF=95=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B8=8A=E5=85=88=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/gui/core/FormWidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index 214d2cd679..fef70c588d 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file +package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file From 94dec668df5e7d063475e321c60a17cbd7b700c1 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 26 Sep 2016 11:57:53 +0800 Subject: [PATCH 077/140] ct --- .../fr/design/mainframe/toolbar/ToolBarMenuDock.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index b04e1e5b12..5392f2dfe8 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -120,7 +120,7 @@ public abstract class ToolBarMenuDock { ///////////////////////////////menu below///////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// - private MenuDef[] menus(final ToolBarMenuDockPlus plus) { + public MenuDef[] menus(final ToolBarMenuDockPlus plus) { java.util.List menuList = new java.util.ArrayList(); // 娣诲姞鏂囦欢鑿滃崟 menuList.add(createFileMenuDef(plus)); @@ -142,7 +142,7 @@ public abstract class ToolBarMenuDock { return menuList.toArray(new MenuDef[menuList.size()]); } - private void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { + public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { // 缁欒彍鍗曞姞鎻掍欢鍏ュ彛 for (MenuDef m : menuDefs) { switch (m.getAnchor()) { @@ -171,7 +171,7 @@ public abstract class ToolBarMenuDock { return plus.menus4Target(); } - private MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { + public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F'); ShortCut[] scs = new ShortCut[0]; @@ -284,7 +284,7 @@ public abstract class ToolBarMenuDock { return processor == null ? new GlobalTableDataAction() : processor.createServerTDAction(); } - protected boolean shouldShowPlugin() { + private boolean shouldShowPlugin() { return FRContext.isChineseEnv() || ComparatorUtils.equals(GeneralContext.getLocale(), Locale.TAIWAN); } @@ -326,7 +326,6 @@ public abstract class ToolBarMenuDock { shortCuts.add(new SignAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } - public MenuDef createHelpMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); @@ -336,7 +335,6 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.HELP); return menuDef; } - public MenuDef createCommunityMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); From 56adea3eea3219c2a44ec71bf91c4be465e9399f Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 26 Sep 2016 11:58:34 +0800 Subject: [PATCH 078/140] ct --- build.gradle.bak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.bak b/build.gradle.bak index 67a8a0e70f..633739a745 100644 --- a/build.gradle.bak +++ b/build.gradle.bak @@ -2,10 +2,10 @@ apply plugin: "java" tasks.withType(JavaCompile){ options.encoding = "UTF-8" } -sourceCompatibility=1.7 + def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" -//鑾峰彇浠涔堝垎鏀悕 +//获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) From 28986f8d268ecb3ff458ba43cd29dd64b76cbb19 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 26 Sep 2016 11:59:07 +0800 Subject: [PATCH 079/140] 1 --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 5392f2dfe8..a607420d46 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -40,7 +40,7 @@ import java.util.Locale; import java.util.Set; /** - * @author richer + * @author richer * @since 6.5.5 鍒涘缓浜2011-6-13 */ /* From 49106fb2c021e67a7a889311741300e1a25b9ab2 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 26 Sep 2016 11:59:16 +0800 Subject: [PATCH 080/140] 1 --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index a607420d46..5392f2dfe8 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -40,7 +40,7 @@ import java.util.Locale; import java.util.Set; /** - * @author richer + * @author richer * @since 6.5.5 鍒涘缓浜2011-6-13 */ /* From 661fcbe959eb4d84b8605937b6e4fe7b600165a2 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 26 Sep 2016 12:00:30 +0800 Subject: [PATCH 081/140] 1 --- designer_form/build.gradle.bak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index 6c0df949c4..7210a96e41 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' @@ -30,6 +30,7 @@ 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') @@ -62,7 +63,6 @@ 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 37db74b79035ca95eb308b955486ce4f6849fa17 Mon Sep 17 00:00:00 2001 From: zhouping Date: Mon, 26 Sep 2016 14:20:51 +0800 Subject: [PATCH 082/140] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E6=94=B9=E5=9B=9E=E6=88=90=E9=9A=8F=E7=B3=BB=E7=BB=9F=E6=94=B9?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/utils/DesignUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index d6a2ab8a58..4b05b8d683 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -230,7 +230,7 @@ public class DesignUtils { private static FRFont getCurrentLocaleFont(){ FRFont guiFRFont; - Locale defaultLocale = FRContext.getLocale(); + Locale defaultLocale = Locale.getDefault(); if (isDisplaySimSun(defaultLocale)) { guiFRFont = getNamedFont("SimSun"); From 3c038e6fd959ddc4fe62befb44de8b9102694d9d Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 27 Sep 2016 09:20:24 +0800 Subject: [PATCH 083/140] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/toolbar/ToolBarMenuDock.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 5392f2dfe8..b04e1e5b12 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -120,7 +120,7 @@ public abstract class ToolBarMenuDock { ///////////////////////////////menu below///////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// - public MenuDef[] menus(final ToolBarMenuDockPlus plus) { + private MenuDef[] menus(final ToolBarMenuDockPlus plus) { java.util.List menuList = new java.util.ArrayList(); // 娣诲姞鏂囦欢鑿滃崟 menuList.add(createFileMenuDef(plus)); @@ -142,7 +142,7 @@ public abstract class ToolBarMenuDock { return menuList.toArray(new MenuDef[menuList.size()]); } - public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { + private void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { // 缁欒彍鍗曞姞鎻掍欢鍏ュ彛 for (MenuDef m : menuDefs) { switch (m.getAnchor()) { @@ -171,7 +171,7 @@ public abstract class ToolBarMenuDock { return plus.menus4Target(); } - public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { + private MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F'); ShortCut[] scs = new ShortCut[0]; @@ -284,7 +284,7 @@ public abstract class ToolBarMenuDock { return processor == null ? new GlobalTableDataAction() : processor.createServerTDAction(); } - private boolean shouldShowPlugin() { + protected boolean shouldShowPlugin() { return FRContext.isChineseEnv() || ComparatorUtils.equals(GeneralContext.getLocale(), Locale.TAIWAN); } @@ -326,6 +326,7 @@ public abstract class ToolBarMenuDock { shortCuts.add(new SignAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } + public MenuDef createHelpMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); @@ -335,6 +336,7 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.HELP); return menuDef; } + public MenuDef createCommunityMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); From 8af9aa45e141a09b1804e3af2da2dccc8a5dd6ae Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 27 Sep 2016 11:01:49 +0800 Subject: [PATCH 084/140] =?UTF-8?q?release=E7=BB=A7=E7=BB=AD=E6=94=BE?= =?UTF-8?q?=E5=BC=80=E7=BB=99=E5=86=85=E9=83=A8=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/gui/core/FormWidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index fef70c588d..214d2cd679 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file +package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file From c68b4ee0b7d37a0c8760785f9332843f862e5ecf Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 27 Sep 2016 11:12:49 +0800 Subject: [PATCH 085/140] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=BF=85=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginHelper.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 5d0c9fa1a9..b258d495d2 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -140,6 +140,14 @@ public class PluginHelper { List list = dependence.getDependPlugins(); for (int i = 0;list != null && i < list.size(); i++){ PluginDependenceUnit dependenceUnit = list.get(i); + //瑕嗙洊鍨嬩緷璧栵紝绔嬪嵆涓嬭浇瀹夎 + if (dependenceUnit.isCover()){ + try { + installCoverDependence(dependenceUnit); + } catch (Exception e) { + throw new PluginDependenceException(); + } + } if (!dependenceUnit.checkFileEnv()){ needInstallDependence.add(dependenceUnit); } @@ -153,6 +161,31 @@ public class PluginHelper { installDependenceOnline(currentID, needInstallDependence); } + public static void installCoverDependence(PluginDependenceUnit dependenceUnit) throws Exception { + HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(dependenceUnit.getDependenceID())); + if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { + InputStream reader = httpClient.getResponseStream(); + String temp = StableUtils.pathJoin(PluginHelper.DEPENDENCE_DOWNLOAD_PATH, PluginHelper.TEMP_FILE); + StableUtils.makesureFileExist(new File(temp)); + FileOutputStream writer = new FileOutputStream(temp); + byte[] buffer = new byte[PluginConstants.BYTES_NUM]; + int bytesRead = 0; + while ((bytesRead = reader.read(buffer)) > 0) { + writer.write(buffer, 0, bytesRead); + buffer = new byte[PluginConstants.BYTES_NUM]; + } + reader.close(); + writer.flush(); + writer.close(); + + + //瀹夎鏂囦欢 + IOUtils.unZipFilesGBK(temp, FRContext.getCurrentEnv().getPath() + dependenceUnit.getDependenceDir()); + }else { + throw new PluginDependenceException(); + } + } + /** * 鏋勯犱竴涓笅杞経I From 08cba4e505defcb80e2a8aa7b059d987d0f835a4 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 27 Sep 2016 11:55:57 +0800 Subject: [PATCH 086/140] update --- .../src/com/fr/design/extra/PluginHelper.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index b258d495d2..5d0c9fa1a9 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -140,14 +140,6 @@ public class PluginHelper { List list = dependence.getDependPlugins(); for (int i = 0;list != null && i < list.size(); i++){ PluginDependenceUnit dependenceUnit = list.get(i); - //瑕嗙洊鍨嬩緷璧栵紝绔嬪嵆涓嬭浇瀹夎 - if (dependenceUnit.isCover()){ - try { - installCoverDependence(dependenceUnit); - } catch (Exception e) { - throw new PluginDependenceException(); - } - } if (!dependenceUnit.checkFileEnv()){ needInstallDependence.add(dependenceUnit); } @@ -161,31 +153,6 @@ public class PluginHelper { installDependenceOnline(currentID, needInstallDependence); } - public static void installCoverDependence(PluginDependenceUnit dependenceUnit) throws Exception { - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(dependenceUnit.getDependenceID())); - if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { - InputStream reader = httpClient.getResponseStream(); - String temp = StableUtils.pathJoin(PluginHelper.DEPENDENCE_DOWNLOAD_PATH, PluginHelper.TEMP_FILE); - StableUtils.makesureFileExist(new File(temp)); - FileOutputStream writer = new FileOutputStream(temp); - byte[] buffer = new byte[PluginConstants.BYTES_NUM]; - int bytesRead = 0; - while ((bytesRead = reader.read(buffer)) > 0) { - writer.write(buffer, 0, bytesRead); - buffer = new byte[PluginConstants.BYTES_NUM]; - } - reader.close(); - writer.flush(); - writer.close(); - - - //瀹夎鏂囦欢 - IOUtils.unZipFilesGBK(temp, FRContext.getCurrentEnv().getPath() + dependenceUnit.getDependenceDir()); - }else { - throw new PluginDependenceException(); - } - } - /** * 鏋勯犱竴涓笅杞経I From 431883df8b86d895316240c16f5434291ed663a1 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 27 Sep 2016 14:20:16 +0800 Subject: [PATCH 087/140] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/toolbar/ToolBarMenuDock.java | 68 +++++++++---------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index b04e1e5b12..9dd27e4759 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -120,7 +120,7 @@ public abstract class ToolBarMenuDock { ///////////////////////////////menu below///////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// - private MenuDef[] menus(final ToolBarMenuDockPlus plus) { + public MenuDef[] menus(final ToolBarMenuDockPlus plus) { java.util.List menuList = new java.util.ArrayList(); // 娣诲姞鏂囦欢鑿滃崟 menuList.add(createFileMenuDef(plus)); @@ -142,7 +142,7 @@ public abstract class ToolBarMenuDock { return menuList.toArray(new MenuDef[menuList.size()]); } - private void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { + public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { // 缁欒彍鍗曞姞鎻掍欢鍏ュ彛 for (MenuDef m : menuDefs) { switch (m.getAnchor()) { @@ -171,7 +171,7 @@ public abstract class ToolBarMenuDock { return plus.menus4Target(); } - private MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { + public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F'); ShortCut[] scs = new ShortCut[0]; @@ -231,15 +231,15 @@ public abstract class ToolBarMenuDock { * @return 鑿滃崟 */ public abstract ShortCut[] createNewFileShortCuts(); - + /** - * 鍒涘缓璁哄潧鐧诲綍闈㈡澘, chart閭ｈ竟涓嶉渶瑕 - * - * @return 闈㈡澘缁勪欢 - * - */ + * 鍒涘缓璁哄潧鐧诲綍闈㈡澘, chart閭ｈ竟涓嶉渶瑕 + * + * @return 闈㈡澘缁勪欢 + * + */ public Component createBBSLoginPane(){ - return new UILabel(); + return new UILabel(); } @@ -284,7 +284,7 @@ public abstract class ToolBarMenuDock { return processor == null ? new GlobalTableDataAction() : processor.createServerTDAction(); } - protected boolean shouldShowPlugin() { + private boolean shouldShowPlugin() { return FRContext.isChineseEnv() || ComparatorUtils.equals(GeneralContext.getLocale(), Locale.TAIWAN); } @@ -302,7 +302,7 @@ public abstract class ToolBarMenuDock { shortCuts.add(new FeedBackAction()); shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(SeparatorDef.DEFAULT); - // shortCuts.add(new ForumAction()); + // shortCuts.add(new ForumAction()); } shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(new AboutAction()); @@ -326,7 +326,6 @@ public abstract class ToolBarMenuDock { shortCuts.add(new SignAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } - public MenuDef createHelpMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); @@ -336,7 +335,6 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.HELP); return menuDef; } - public MenuDef createCommunityMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); @@ -479,29 +477,29 @@ public abstract class ToolBarMenuDock { * * @return 瀛愯彍鍗 */ - public ShortCut[] shortcut4ExportMenu(){ + public ShortCut[] shortcut4ExportMenu(){ return new ShortCut[0]; } }; public NewTemplatePane getNewTemplatePane(){ - return new NewTemplatePane() { - @Override - public Icon getNew() { - return BaseUtils.readIcon("/com/fr/design/images/buttonicon/addicon.png"); - } + return new NewTemplatePane() { + @Override + public Icon getNew() { + return BaseUtils.readIcon("/com/fr/design/images/buttonicon/addicon.png"); + } - @Override - public Icon getMouseOverNew() { - return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png"); - } + @Override + public Icon getMouseOverNew() { + return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png"); + } - @Override - public Icon getMousePressNew() { - return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png"); - } - }; + @Override + public Icon getMousePressNew() { + return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png"); + } + }; } protected void insertMenu(MenuDef menuDef, String anchor) { @@ -543,13 +541,13 @@ public abstract class ToolBarMenuDock { } } } - + /** - * 璁捐鍣ㄩ鍑烘椂, 鍋氱殑涓浜涙搷浣. - * - */ + * 璁捐鍣ㄩ鍑烘椂, 鍋氱殑涓浜涙搷浣. + * + */ public void shutDown(){ - + } private interface ShortCutMethodAction{ @@ -560,7 +558,7 @@ public abstract class ToolBarMenuDock { private abstract class AbstractShortCutMethodAction implements ShortCutMethodAction{ public ShortCut methodAction(MenuHandler handler){ - return handler.shortcut(); + return handler.shortcut(); } } From 62a9e14c4eafc1697b973c0a1bd576518504b21b Mon Sep 17 00:00:00 2001 From: hugh Date: Tue, 27 Sep 2016 15:47:22 +0800 Subject: [PATCH 088/140] =?UTF-8?q?=E4=BD=BF=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=83=BD=E5=A4=9F=E8=AF=BB=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/webattr/WriteToolBarPane.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/designer/src/com/fr/design/webattr/WriteToolBarPane.java b/designer/src/com/fr/design/webattr/WriteToolBarPane.java index 2e5f91f8bb..0abc1049c3 100644 --- a/designer/src/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer/src/com/fr/design/webattr/WriteToolBarPane.java @@ -2,6 +2,7 @@ package com.fr.design.webattr; import com.fr.base.BaseUtils; import com.fr.base.ConfigManager; +import com.fr.design.ExtraDesignClassManager; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.core.WidgetOption; @@ -22,10 +23,12 @@ import com.fr.stable.Constants; import com.fr.web.attr.ReportWebAttr; import javax.swing.*; + import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class WriteToolBarPane extends AbstractEditToolBarPane { @@ -103,12 +106,12 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { toolBarManager.setToolBarLocation(Location.createTopEmbedLocation()); this.toolBarManagers = new ToolBarManager[]{toolBarManager}; } - + private ActionListener editBtnListener = new ActionListener() { public void actionPerformed(ActionEvent e) { final DragToolBarPane dragToolbarPane = new DragToolBarPane(); - dragToolbarPane.setDefaultToolBar(ToolBarManager.createDefaultWriteToolBar(), ReportWebWidgetConstants.getWriteToolBarInstance()); + dragToolbarPane.setDefaultToolBar(ToolBarManager.createDefaultWriteToolBar(), getToolBarInstance()); dragToolbarPane.populateBean(WriteToolBarPane.this.toolBarManagers); BasicDialog toobarDialog = dragToolbarPane.showWindow(SwingUtilities.getWindowAncestor(WriteToolBarPane.this)); toobarDialog.addDialogActionListener(new DialogActionAdapter() { @@ -130,7 +133,12 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { @Override protected WidgetOption[] getToolBarInstance() { - return ReportWebWidgetConstants.getWriteToolBarInstance(); + List defaultOptions = Arrays.asList(ReportWebWidgetConstants.getWriteToolBarInstance()); + List extraOptions = Arrays.asList(ExtraDesignClassManager.getInstance().getWebWidgetOptions()); + List options = new ArrayList(); + options.addAll(defaultOptions); + options.addAll(extraOptions); + return options.toArray(new WidgetOption[options.size()]); } @Override From 0de680847888a0ed999e5d472c686873ece1723d Mon Sep 17 00:00:00 2001 From: hugh Date: Tue, 27 Sep 2016 17:31:30 +0800 Subject: [PATCH 089/140] =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/DesignerEnvManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java index 524f4f96c4..f0dc742c0f 100644 --- a/designer_base/src/com/fr/design/DesignerEnvManager.java +++ b/designer_base/src/com/fr/design/DesignerEnvManager.java @@ -20,6 +20,7 @@ import com.fr.stable.xml.*; import javax.swing.*; import javax.swing.SwingWorker.StateValue; + import java.awt.*; import java.io.*; import java.util.*; @@ -28,6 +29,7 @@ import java.util.Map.Entry; import java.util.logging.FileHandler; import java.util.logging.Handler; import java.util.logging.Level; +import java.util.logging.LogRecord; import java.util.logging.SimpleFormatter; /** @@ -226,7 +228,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { StableUtils.makesureFileExist(new java.io.File(fileName)); } Handler handler = new FileHandler(fileName, true); - handler.setFormatter(new SimpleFormatter()); + + handler.setFormatter(new FRLogFormatter()); FRContext.getLogger().addLogHandler(handler); } catch (SecurityException e) { FRContext.getLogger().error(e.getMessage(), e); @@ -235,7 +238,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } } } - + private File getDesignerEnvFile() { File envFile = getEnvFile(); // james:FineReportEnv.xml鏂囦欢娌℃湁蹇呰鍋氬吋瀹癸紝閲岄潰淇濆瓨鐨勪富瑕佹槸鐣岄潰甯冨眬浠ュ強璁捐鍣ㄦ縺娲荤殑淇℃伅 From a63478747a57d801ab99cdce647627a9a2028985 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 28 Sep 2016 11:20:19 +0800 Subject: [PATCH 090/140] =?UTF-8?q?release=E6=89=8B=E5=8A=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=88=B0master=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=94=B9=E5=9B=9E=E6=88=90=E9=9A=8F=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/utils/DesignUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index d6a2ab8a58..4b05b8d683 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -230,7 +230,7 @@ public class DesignUtils { private static FRFont getCurrentLocaleFont(){ FRFont guiFRFont; - Locale defaultLocale = FRContext.getLocale(); + Locale defaultLocale = Locale.getDefault(); if (isDisplaySimSun(defaultLocale)) { guiFRFont = getNamedFont("SimSun"); From eda9287a911587fd74e5614771094a47d61ee2fa Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 28 Sep 2016 11:29:00 +0800 Subject: [PATCH 091/140] poi --- .../file/export/AbstractExcelExportAction.java | 2 +- .../actions/ExcelExportAction4Chart.java | 2 +- .../exporter/ExcelExporter4Chart.java | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java b/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java index 63aaf064c2..ae1a08ce22 100644 --- a/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java +++ b/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java @@ -36,7 +36,7 @@ public abstract class AbstractExcelExportAction extends AbstractExportAction { if (hasLayerReport(tpl)) { return "zip"; } else { - return ExcelUtils.checkPOIJarExist() ? "xlsx" : "xls"; + return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls"; } } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java b/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java index aa703f3112..e1e64395a3 100644 --- a/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java +++ b/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java @@ -58,7 +58,7 @@ public class ExcelExportAction4Chart extends AbstractExportAction4JChart { @Override protected String getDefaultExtension() { - return ExcelUtils.checkPOIJarExist() ? "xlsx" : "xls"; + return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls"; } @Override diff --git a/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java b/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java index 425f5d2ea0..71e02d1735 100644 --- a/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java +++ b/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java @@ -6,14 +6,14 @@ import com.fr.design.mainframe.JChart; import com.fr.general.FRLogger; import com.fr.general.IOUtils; import com.fr.stable.CoreGraphHelper; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFClientAnchor; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFWorkbook; +import com.fr.third.v2.org.apache.poi.ss.usermodel.ClientAnchor; +import com.fr.third.v2.org.apache.poi.ss.usermodel.Drawing; +import com.fr.third.v2.org.apache.poi.ss.usermodel.Sheet; +import com.fr.third.v2.org.apache.poi.ss.usermodel.Workbook; +import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFWorkbook; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -73,7 +73,7 @@ public class ExcelExporter4Chart extends ImageExporter4Chart { } private boolean checkExcelExportVersion() { - return ExcelUtils.checkPOIJarExist(); + return ExcelUtils.checkThirdJarSupportPOI(); } // 鍔犺浇鍥剧墖. private int loadPicture(BufferedImage bufferedImage)throws IOException { From e7fd18fddce0764298edcbeb34cdbd8f9976b698 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 29 Sep 2016 07:39:38 +0800 Subject: [PATCH 092/140] =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AE=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/chart/gui/ChartComponent.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 186b7eb6c1..56c85327dc 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -222,12 +222,9 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene /** * 榧犳爣鐐瑰嚮 * @param event 榧犳爣浜嬩欢 + * 涓嶈缃紶鏍囩偣鍑昏烦杞簨浠 */ - public void mouseClicked(MouseEvent event) { - int click = event.getClickCount(); - if (click >= 1 && activeGlyph != null && this.isSupportEdit()) { - activeGlyph.goRightPane(); - } + public void mouseClicked(MouseEvent event) { } /** From 752e323a284e7081d21fbed2522b4a7080714242 Mon Sep 17 00:00:00 2001 From: hufangjie Date: Thu, 29 Sep 2016 21:21:27 +0800 Subject: [PATCH 093/140] update --- .../design/extra/plugindependence/DownLoadDependenceUI.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java index eb7af116bf..958d8d160e 100644 --- a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java +++ b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java @@ -265,7 +265,9 @@ public class DownLoadDependenceUI implements ActionListener { } } - private String showFileLength() { - return totalSize == -1 ? "NAN" : totalSize / Math.pow(10, 6) + ""; + private String showFileLength(){ + double len = totalSize / Math.pow(10, 6); + String lenStr = String.format("%.2f", len); + return totalSize == -1 ? "NAN" : lenStr; } } From 702e619b81c3c0e5ea0374e5ba717afc6e24aca3 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Sun, 9 Oct 2016 11:20:10 +0800 Subject: [PATCH 094/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9lib=E4=B8=BA=E5=A4=9A?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_base/build.gradle.bak | 2 +- designer_chart/build.gradle | 2 +- designer_chart/build.gradle.bak | 4 ++-- designer_form/build.gradle | 2 +- designer_form/build.gradle.bak | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index afbfce790e..09e6e7b1ec 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -32,7 +32,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //澹版槑澶栭儴渚濊禆 dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar') compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak index b1014f8e2e..afbfce790e 100644 --- a/designer_base/build.gradle.bak +++ b/designer_base/build.gradle.bak @@ -33,7 +33,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index a01d57c3dc..dc00470f2a 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -30,7 +30,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //鎸囧畾澶栭儴渚濊禆 dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar') compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak index 4b76224d6a..7df817eab9 100644 --- a/designer_chart/build.gradle.bak +++ b/designer_chart/build.gradle.bak @@ -30,8 +30,8 @@ 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") +compile fileTree(dir:'../../../finereport-lib-stable/${branchName},include:'**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 5a52b09f0a..6694a79928 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -33,7 +33,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //澹版槑澶栭儴渚濊禆 dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar') compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak index 7210a96e41..5a52b09f0a 100644 --- a/designer_form/build.gradle.bak +++ b/designer_form/build.gradle.bak @@ -34,7 +34,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") +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' } From 6d590a0e3e67035d43ae1012e8507ef82cdd6abb Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 10 Oct 2016 16:05:37 +0800 Subject: [PATCH 095/140] =?UTF-8?q?oem=E7=9A=84=E6=97=B6=E5=80=99=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 9dd27e4759..bb9b886e5d 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -284,7 +284,7 @@ public abstract class ToolBarMenuDock { return processor == null ? new GlobalTableDataAction() : processor.createServerTDAction(); } - private boolean shouldShowPlugin() { + protected boolean shouldShowPlugin() { return FRContext.isChineseEnv() || ComparatorUtils.equals(GeneralContext.getLocale(), Locale.TAIWAN); } From ab4b82c2d656a9715977cb6888efb4b3b6db060d Mon Sep 17 00:00:00 2001 From: sunmondong Date: Tue, 11 Oct 2016 22:27:32 +0800 Subject: [PATCH 096/140] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.bak | 86 ------------------- build.gradle => build.release.gradle | 2 +- designer_base/build.gradle.bak | 70 --------------- .../{build.gradle => build.release.gradle} | 2 +- designer_chart/build.gradle.bak | 66 -------------- .../{build.gradle => build.release.gradle} | 2 +- designer_form/build.gradle.bak | 83 ------------------ .../{build.gradle => build.release.gradle} | 2 +- 8 files changed, 4 insertions(+), 309 deletions(-) delete mode 100644 build.gradle.bak rename build.gradle => build.release.gradle (97%) delete mode 100644 designer_base/build.gradle.bak rename designer_base/{build.gradle => build.release.gradle} (96%) delete mode 100644 designer_chart/build.gradle.bak rename designer_chart/{build.gradle => build.release.gradle} (96%) delete mode 100644 designer_form/build.gradle.bak rename designer_form/{build.gradle => build.release.gradle} (97%) diff --git a/build.gradle.bak b/build.gradle.bak deleted file mode 100644 index 67a8a0e70f..0000000000 --- a/build.gradle.bak +++ /dev/null @@ -1,86 +0,0 @@ -apply plugin: "java" -tasks.withType(JavaCompile){ - options.encoding = "UTF-8" -} -sourceCompatibility=1.7 -def basicDir="../../" -def libDir="${basicDir}/finereport-lib-stable" -//鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:"./",include:"build.gradle") -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) - -task appletJar<<{ - - ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") - mkdir(dir:"build/classes/") - copy(todir:"build/classes/"){ - fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") - - } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") - jar(jarfile:"build/libs/fr-applet-8.0.jar"){ - fileset(dir:"build/classes"){ - exclude(name:"*.*") - exclude(name:"bin/*.*") - exclude(name:"classes/**") - exclude(name:"com/fr/schedule/**") - exclude(name:"com/fr/cell/**") - exclude(name:"com/fr/dialog/**") - exclude(name:"com/fr/view/**") - exclude(name:"com/fr/web/**") - exclude(name:"com/fr/fs/**") - exclude(name:"com/fr/design/**") - exclude(name:"com/fr/start/**") - exclude(name:"com/fr/process/**") - } - fileset(dir:"${libDir}/tmp-${branchName}"){ - include(name:"javax/mail/**") - include(name:"javax/servlet/**") - include(name:"org/freehep/**") - include(name:"com/fr/third/JAI/**") - include(name:"com/fr/third/antlr/**") - include(name:"com/fr/third/javax/**") - include(name:"com/sun/xml/**") - include(name:"javax/xml/**") - - } - fileset(dir:"build/classes"){ - include(name:"com/fr/web/*.class") - include(name:"com/fr/web/attr/*.class") - } - } - delete(dir:"${libDir}/tmp-${branchName}") - def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" - def keystore="frapplet.store" - def keycert="fr.cert" - def keypassword="123456" - def keyalias="fr" - - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") - } - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") - } - - exec(executable:"${jdk6home}/bin/jarsigner"){ - arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") - } - delete(file:"${keystore}") - delete(file:"${keycert}") - delete(dir:"build/classes") - - } - -} \ No newline at end of file diff --git a/build.gradle b/build.release.gradle similarity index 97% rename from build.gradle rename to build.release.gradle index abc9815956..507d77e9f5 100644 --- a/build.gradle +++ b/build.release.gradle @@ -5,7 +5,7 @@ tasks.withType(JavaCompile){ def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:"./",include:"build.gradle") +FileTree files =fileTree(dir:"./",include:"build.*.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak deleted file mode 100644 index 285295c56d..0000000000 --- a/designer_base/build.gradle.bak +++ /dev/null @@ -1,70 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 -//鎸囧畾鐢熸垚jar鍖呯増鏈 -version='8.0' -//鐢熸垚jar鍖呴噸鍛藉悕 -jar{ - baseName='fr-designer-core' -} - - -def srcDir="." - -//鎸囧畾婧愮爜璺緞 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -//鑾峰彇浠涔堝垎鏀悕 -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}/*/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - into 'build/classes/main' - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - - - diff --git a/designer_base/build.gradle b/designer_base/build.release.gradle similarity index 96% rename from designer_base/build.gradle rename to designer_base/build.release.gradle index e7c5a8e1ff..6ae925d511 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.release.gradle @@ -24,7 +24,7 @@ sourceSets{ } } //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') +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) diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak deleted file mode 100644 index ec39e786a0..0000000000 --- a/designer_chart/build.gradle.bak +++ /dev/null @@ -1,66 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 -//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 -version='8.0' - -def srcDir="." - -//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 - -jar{ - baseName='fr-designer-chart' -} - -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -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}/*/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - - } - into 'build/classes/main' - } - -} - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - diff --git a/designer_chart/build.gradle b/designer_chart/build.release.gradle similarity index 96% rename from designer_chart/build.gradle rename to designer_chart/build.release.gradle index 92f0551624..595ab9a322 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.release.gradle @@ -23,7 +23,7 @@ sourceSets{ } } } -FileTree files =fileTree(dir:'./',include:'build.gradle') +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) diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak deleted file mode 100644 index 6c0df949c4..0000000000 --- a/designer_form/build.gradle.bak +++ /dev/null @@ -1,83 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 -//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 -version='8.0' - -def srcDir="." - - -//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 -jar{ - baseName='fr-designer-report' -} -//婧愮爜鎵鍦ㄤ綅缃 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src", -"${srcDir}/../designer/src"] - } - } -} - -//鑾峰彇浠涔堝垎鏀悕 -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}/*/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} - -//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - with dataContent.call("${srcDir}/src") - with dataContent.call("${srcDir}/../designer/src") - into ('build/classes/main') - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - - } - fileset (dir:"${srcDir}/../designer/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - diff --git a/designer_form/build.gradle b/designer_form/build.release.gradle similarity index 97% rename from designer_form/build.gradle rename to designer_form/build.release.gradle index 4204c2415e..6dda9f4880 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.release.gradle @@ -26,7 +26,7 @@ sourceSets{ } //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') +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) From 7441cfccbfa21cca99a65dd0139dc01162419d88 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Tue, 11 Oct 2016 22:33:05 +0800 Subject: [PATCH 097/140] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.bak | 86 ------------------- build.gradle => build.master.gradle | 2 +- designer_base/build.gradle.bak | 70 --------------- .../{build.gradle => build.master.gradle} | 2 +- designer_chart/build.gradle.bak | 66 -------------- .../{build.gradle => build.master.gradle} | 2 +- designer_form/build.gradle.bak | 83 ------------------ .../{build.gradle => build.master.gradle} | 2 +- 8 files changed, 4 insertions(+), 309 deletions(-) delete mode 100644 build.gradle.bak rename build.gradle => build.master.gradle (97%) delete mode 100644 designer_base/build.gradle.bak rename designer_base/{build.gradle => build.master.gradle} (96%) delete mode 100644 designer_chart/build.gradle.bak rename designer_chart/{build.gradle => build.master.gradle} (96%) delete mode 100644 designer_form/build.gradle.bak rename designer_form/{build.gradle => build.master.gradle} (97%) diff --git a/build.gradle.bak b/build.gradle.bak deleted file mode 100644 index 633739a745..0000000000 --- a/build.gradle.bak +++ /dev/null @@ -1,86 +0,0 @@ -apply plugin: "java" -tasks.withType(JavaCompile){ - options.encoding = "UTF-8" -} - -def basicDir="../../" -def libDir="${basicDir}/finereport-lib-stable" -//获取什么分支名 -FileTree files =fileTree(dir:"./",include:"build.gradle") -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) - -task appletJar<<{ - - ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") - mkdir(dir:"build/classes/") - copy(todir:"build/classes/"){ - fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") - - } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") - jar(jarfile:"build/libs/fr-applet-8.0.jar"){ - fileset(dir:"build/classes"){ - exclude(name:"*.*") - exclude(name:"bin/*.*") - exclude(name:"classes/**") - exclude(name:"com/fr/schedule/**") - exclude(name:"com/fr/cell/**") - exclude(name:"com/fr/dialog/**") - exclude(name:"com/fr/view/**") - exclude(name:"com/fr/web/**") - exclude(name:"com/fr/fs/**") - exclude(name:"com/fr/design/**") - exclude(name:"com/fr/start/**") - exclude(name:"com/fr/process/**") - } - fileset(dir:"${libDir}/tmp-${branchName}"){ - include(name:"javax/mail/**") - include(name:"javax/servlet/**") - include(name:"org/freehep/**") - include(name:"com/fr/third/JAI/**") - include(name:"com/fr/third/antlr/**") - include(name:"com/fr/third/javax/**") - include(name:"com/sun/xml/**") - include(name:"javax/xml/**") - - } - fileset(dir:"build/classes"){ - include(name:"com/fr/web/*.class") - include(name:"com/fr/web/attr/*.class") - } - } - delete(dir:"${libDir}/tmp-${branchName}") - def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" - def keystore="frapplet.store" - def keycert="fr.cert" - def keypassword="123456" - def keyalias="fr" - - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") - } - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") - } - - exec(executable:"${jdk6home}/bin/jarsigner"){ - arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") - } - delete(file:"${keystore}") - delete(file:"${keycert}") - delete(dir:"build/classes") - - } - -} \ No newline at end of file diff --git a/build.gradle b/build.master.gradle similarity index 97% rename from build.gradle rename to build.master.gradle index 659130f9ef..cc3bea2327 100644 --- a/build.gradle +++ b/build.master.gradle @@ -6,7 +6,7 @@ tasks.withType(JavaCompile){ def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:"./",include:"build.gradle") +FileTree files =fileTree(dir:"./",include:"build.*.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak deleted file mode 100644 index afbfce790e..0000000000 --- a/designer_base/build.gradle.bak +++ /dev/null @@ -1,70 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.7 -//鎸囧畾鐢熸垚jar鍖呯増鏈 -version='8.0' -//鐢熸垚jar鍖呴噸鍛藉悕 -jar{ - baseName='fr-designer-core' -} - - -def srcDir="." - -//鎸囧畾婧愮爜璺緞 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -//鑾峰彇浠涔堝垎鏀悕 -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}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - into 'build/classes/main' - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - - - diff --git a/designer_base/build.gradle b/designer_base/build.master.gradle similarity index 96% rename from designer_base/build.gradle rename to designer_base/build.master.gradle index 09e6e7b1ec..b02f751e7c 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.master.gradle @@ -24,7 +24,7 @@ sourceSets{ } } //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') +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) diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak deleted file mode 100644 index 7df817eab9..0000000000 --- a/designer_chart/build.gradle.bak +++ /dev/null @@ -1,66 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.7 -//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 -version='8.0' - -def srcDir="." - -//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 - -jar{ - baseName='fr-designer-chart' -} - -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -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/${branchName},include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - - } - into 'build/classes/main' - } - -} - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - diff --git a/designer_chart/build.gradle b/designer_chart/build.master.gradle similarity index 96% rename from designer_chart/build.gradle rename to designer_chart/build.master.gradle index dc00470f2a..ba6df992bd 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.master.gradle @@ -23,7 +23,7 @@ sourceSets{ } } } -FileTree files =fileTree(dir:'./',include:'build.gradle') +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) diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak deleted file mode 100644 index 5a52b09f0a..0000000000 --- a/designer_form/build.gradle.bak +++ /dev/null @@ -1,83 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.7 -//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 -version='8.0' - -def srcDir="." - - -//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 -jar{ - baseName='fr-designer-report' -} -//婧愮爜鎵鍦ㄤ綅缃 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src", -"${srcDir}/../designer/src"] - } - } -} - -//鑾峰彇浠涔堝垎鏀悕 -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}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} - -//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - with dataContent.call("${srcDir}/src") - with dataContent.call("${srcDir}/../designer/src") - into ('build/classes/main') - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - - } - fileset (dir:"${srcDir}/../designer/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - diff --git a/designer_form/build.gradle b/designer_form/build.master.gradle similarity index 97% rename from designer_form/build.gradle rename to designer_form/build.master.gradle index 6694a79928..9c9764727c 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.master.gradle @@ -26,7 +26,7 @@ sourceSets{ } //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') +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) From 2aeb9e7a58a84d6536c31719f078d8f146533176 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 13 Oct 2016 16:00:10 +0800 Subject: [PATCH 098/140] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_chart/src/com/fr/design/chart/gui/ChartComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 56c85327dc..58a15f245c 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -312,7 +312,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // chartGlyph.draw(g2d, ScreenResolution.getScreenResolution()); //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 - Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); + Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution(), this); g2d.drawImage(chartImage, 0, 0, null); } } From 75a1b9b7dabe7d609cbba87117800718789aba10 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Mon, 17 Oct 2016 09:56:33 +0800 Subject: [PATCH 099/140] update --- designer_chart/src/com/fr/design/chart/gui/ChartComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 58a15f245c..56c85327dc 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -312,7 +312,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // chartGlyph.draw(g2d, ScreenResolution.getScreenResolution()); //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 - Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution(), this); + Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); g2d.drawImage(chartImage, 0, 0, null); } } From 9326872cf3de145789b973bc6c62d8baf116a342 Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 17 Oct 2016 15:26:55 +0800 Subject: [PATCH 100/140] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=97=A0=E7=BD=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A54=E4=B8=AAnul=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginHelper.java | 13 +-- .../design/extra/PluginsReaderFromStore.java | 88 +++++++++---------- .../exe/GetPluginCategoriesExecutor.java | 11 ++- .../extra/exe/GetPluginFromStoreExecutor.java | 37 ++++---- 4 files changed, 82 insertions(+), 67 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 5d0c9fa1a9..ed35251db5 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -38,6 +38,7 @@ public class PluginHelper { //鎻掍欢渚濊禆鐨勪笅杞戒綅缃 public static final String DEPENDENCE_DOWNLOAD_PATH = System.getProperty("user.dir") + "/download/dependence"; public static final String TEMP_FILE = "temp.zip"; + public static final String CONNECTION_404 = "404"; /** * 涓嬭浇鎻掍欢 @@ -130,7 +131,7 @@ public class PluginHelper { //灏嗘墍鏈夋湭閰嶇疆濂界殑璧勬簮鏂囦欢渚濊禆鍑嗗濂 private static void checkDependenceEnv(Plugin plugin) throws PluginDependenceException { PluginDependence dependence = plugin.getDependence(); - if (dependence == null){ + if (dependence == null) { return; } @@ -138,14 +139,14 @@ public class PluginHelper { String currentID = dependence.getCurrentPluginID(); List list = dependence.getDependPlugins(); - for (int i = 0;list != null && i < list.size(); i++){ + for (int i = 0; list != null && i < list.size(); i++) { PluginDependenceUnit dependenceUnit = list.get(i); - if (!dependenceUnit.checkFileEnv()){ + if (!dependenceUnit.checkFileEnv()) { needInstallDependence.add(dependenceUnit); } } - if (needInstallDependence.isEmpty()){ + if (needInstallDependence.isEmpty()) { return; } @@ -156,14 +157,16 @@ public class PluginHelper { /** * 鏋勯犱竴涓笅杞経I + * * @param currentID * @param list * @throws PluginDependenceException */ - private static void installDependenceOnline(String currentID, List list) throws PluginDependenceException{ + private static void installDependenceOnline(String currentID, List list) throws PluginDependenceException { DownLoadDependenceUI ui = new DownLoadDependenceUI(currentID, list); ui.installOnline(); } + /** * 浠庨変腑鐨勫帇缂╂枃浠朵腑瀹夎鎻掍欢 * diff --git a/designer_base/src/com/fr/design/extra/PluginsReaderFromStore.java b/designer_base/src/com/fr/design/extra/PluginsReaderFromStore.java index 8c77141ca7..abd053362a 100644 --- a/designer_base/src/com/fr/design/extra/PluginsReaderFromStore.java +++ b/designer_base/src/com/fr/design/extra/PluginsReaderFromStore.java @@ -31,30 +31,30 @@ public class PluginsReaderFromStore { * @return 鎻掍欢淇℃伅 */ public static Plugin[] readPlugins() throws Exception { - String resText; + String resText; + try { + HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.store")); + resText = httpClient.getResponseText(); + String charSet = EncodeConstants.ENCODING_UTF_8; + resText = URLDecoder.decode(URLDecoder.decode(resText, charSet), charSet); + } catch (Exception e) { + throw new Exception(Inter.getLocText("FR-Designer-Plugin_PluginMarket_Coding")); + } + if (StringUtils.isNotEmpty(resText)) { try { - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.store")); - resText = httpClient.getResponseText(); - String charSet = EncodeConstants.ENCODING_UTF_8; - resText = URLDecoder.decode(URLDecoder.decode(resText, charSet), charSet); - } catch (Exception e) { - throw new Exception(Inter.getLocText("FR-Designer-Plugin_PluginMarket_Coding")); - } - if (StringUtils.isNotEmpty(resText)) { - try { - plugins.clear();//鍏堟竻绌簊et - JSONArray jsonArray = new JSONArray(resText); - for (int i = 0, size = jsonArray.length(); i < size; i++) { - Plugin plugin = new Plugin(); - plugin.parseJSON(jsonArray.optJSONObject(i)); - if (plugin.isValidate()) { - plugins.add(plugin); - } + plugins.clear();//鍏堟竻绌簊et + JSONArray jsonArray = new JSONArray(resText); + for (int i = 0, size = jsonArray.length(); i < size; i++) { + Plugin plugin = new Plugin(); + plugin.parseJSON(jsonArray.optJSONObject(i)); + if (plugin.isValidate()) { + plugins.add(plugin); } - } catch (JSONException e) { - throw new Exception(Inter.getLocText("FR-Designer-Plugin_Read_Plugin_List_Error")); } + } catch (JSONException e) { + throw new Exception(Inter.getLocText("FR-Designer-Plugin_Read_Plugin_List_Error")); } + } return plugins.toArray(new Plugin[plugins.size()]); } @@ -65,35 +65,33 @@ public class PluginsReaderFromStore { * @return 鎻掍欢淇℃伅 */ public static Plugin[] readPluginsForUpdate() throws Exception { - String resText; + String resText = null; + String url = SiteCenter.getInstance().acquireUrlByKind("plugin.update"); + if (StringUtils.isNotEmpty(url)) { + HashMap para = new HashMap(); + para.put("plugins", PluginLoader.getLoader().pluginsToString()); + //鍙湁褰撳墠璁捐鍣ㄧ殑jar楂樹簬鎻掍欢鏂扮増鏈渶瑕佺殑jarTime鏃, 鎵嶆彁绀烘洿鏂拌鎻掍欢. + para.put("jarTime", GeneralUtils.readBuildNO()); + HttpClient httpClient = new HttpClient(url, para); + resText = httpClient.getResponseText(); + String charSet = EncodeConstants.ENCODING_UTF_8; + resText = URLDecoder.decode(URLDecoder.decode(resText, charSet), charSet); + } + if (StringUtils.isNotEmpty(resText)) { try { - HashMap para = new HashMap(); - para.put("plugins", PluginLoader.getLoader().pluginsToString()); - //鍙湁褰撳墠璁捐鍣ㄧ殑jar楂樹簬鎻掍欢鏂扮増鏈渶瑕佺殑jarTime鏃, 鎵嶆彁绀烘洿鏂拌鎻掍欢. - para.put("jarTime", GeneralUtils.readBuildNO()); - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.update"), para); - resText = httpClient.getResponseText(); - String charSet = EncodeConstants.ENCODING_UTF_8; - resText = URLDecoder.decode(URLDecoder.decode(resText, charSet), charSet); - } catch (Exception e) { - throw new Exception(Inter.getLocText("FR-Designer-Plugin_PluginMarket_Coding")); - } - if (StringUtils.isNotEmpty(resText)) { - try { - pluginsToUpdate.clear(); - JSONArray jsonArray = new JSONArray(resText); - for (int i = 0, size = jsonArray.length(); i < size; i++) { - Plugin plugin = new Plugin(); - plugin.parseJSON(jsonArray.optJSONObject(i)); - if (plugin.isValidate()) { - pluginsToUpdate.add(plugin); - } + pluginsToUpdate.clear(); + JSONArray jsonArray = new JSONArray(resText); + for (int i = 0, size = jsonArray.length(); i < size; i++) { + Plugin plugin = new Plugin(); + plugin.parseJSON(jsonArray.optJSONObject(i)); + if (plugin.isValidate()) { + pluginsToUpdate.add(plugin); } - } catch (JSONException e) { - throw new Exception(Inter.getLocText("FR-Designer-Plugin_Read_Plugin_List_Error")); } + } catch (JSONException e) { + throw new Exception(Inter.getLocText("FR-Designer-Plugin_Read_Plugin_List_Error")); } - + } return pluginsToUpdate.toArray(new Plugin[pluginsToUpdate.size()]); } diff --git a/designer_base/src/com/fr/design/extra/exe/GetPluginCategoriesExecutor.java b/designer_base/src/com/fr/design/extra/exe/GetPluginCategoriesExecutor.java index 81bdb8f8c7..92aa0bbe81 100644 --- a/designer_base/src/com/fr/design/extra/exe/GetPluginCategoriesExecutor.java +++ b/designer_base/src/com/fr/design/extra/exe/GetPluginCategoriesExecutor.java @@ -1,5 +1,6 @@ package com.fr.design.extra.exe; +import com.fr.design.extra.PluginHelper; import com.fr.design.extra.Process; import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; @@ -26,8 +27,14 @@ public class GetPluginCategoriesExecutor implements Executor { @Override public void run(Process process) { - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.category")); - result = httpClient.getResponseText(); + String url = SiteCenter.getInstance().acquireUrlByKind("plugin.category"); + if (url != null) { + HttpClient httpClient = new HttpClient(url); + result = httpClient.getResponseText(); + } else { + result = PluginHelper.CONNECTION_404; + } + } } }; diff --git a/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java b/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java index 35fde2e139..9bd7e2bbef 100644 --- a/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java +++ b/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java @@ -1,5 +1,6 @@ package com.fr.design.extra.exe; +import com.fr.design.extra.PluginHelper; import com.fr.design.extra.Process; import com.fr.general.FRLogger; import com.fr.general.SiteCenter; @@ -38,21 +39,27 @@ public class GetPluginFromStoreExecutor implements Executor { @Override public void run(Process process) { - StringBuilder url = new StringBuilder(SiteCenter.getInstance().acquireUrlByKind("plugin.plist")); - if (StringUtils.isNotBlank(category)) { - url.append("&cid=").append(category.split("-")[1]); - } - if (StringUtils.isNotBlank(seller)) { - url.append("&seller=").append(seller.split("-")[1]); - } - if (StringUtils.isNotBlank(fee)) { - url.append("&fee=").append(fee.split("-")[1]); - } - try { - HttpClient httpClient = new HttpClient(url.toString()); - result = httpClient.getResponseText(); - } catch (Exception e) { - FRLogger.getLogger().error(e.getMessage()); + String plistUrl = SiteCenter.getInstance().acquireUrlByKind("plugin.plist"); + if (StringUtils.isNotBlank(plistUrl)) { + StringBuilder url = new StringBuilder(); + url.append(plistUrl); + if (StringUtils.isNotBlank(category)) { + url.append("&cid=").append(category.split("-")[1]); + } + if (StringUtils.isNotBlank(seller)) { + url.append("&seller=").append(seller.split("-")[1]); + } + if (StringUtils.isNotBlank(fee)) { + url.append("&fee=").append(fee.split("-")[1]); + } + try { + HttpClient httpClient = new HttpClient(url.toString()); + result = httpClient.getResponseText(); + } catch (Exception e) { + FRLogger.getLogger().error(e.getMessage()); + } + } else { + result = PluginHelper.CONNECTION_404; } } } From fabfd3d45ebe93f089fd38eea23a6e25efc76853 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Mon, 17 Oct 2016 20:23:10 +0800 Subject: [PATCH 101/140] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.release.gradle | 2 +- designer_base/build.release.gradle | 2 +- designer_chart/build.release.gradle | 2 +- designer_form/build.release.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.release.gradle b/build.release.gradle index 507d77e9f5..44aacadb4d 100644 --- a/build.release.gradle +++ b/build.release.gradle @@ -3,7 +3,7 @@ tasks.withType(JavaCompile){ options.encoding = "UTF-8" } def basicDir="../../" -def libDir="${basicDir}/finereport-lib-stable" +def libDir="${basicDir}/finereport-lib-stable/master" //鑾峰彇浠涔堝垎鏀悕 FileTree files =fileTree(dir:"./",include:"build.*.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) diff --git a/designer_base/build.release.gradle b/designer_base/build.release.gradle index 6ae925d511..4ed4ba12b0 100644 --- a/designer_base/build.release.gradle +++ b/designer_base/build.release.gradle @@ -32,7 +32,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //澹版槑澶栭儴渚濊禆 dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../finereport-lib-stable/master',include:'**/*.jar') compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' diff --git a/designer_chart/build.release.gradle b/designer_chart/build.release.gradle index 595ab9a322..e97176e24c 100644 --- a/designer_chart/build.release.gradle +++ b/designer_chart/build.release.gradle @@ -30,7 +30,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //鎸囧畾澶栭儴渚濊禆 dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../finereport-lib-stable/master',include:'**/*.jar') compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' diff --git a/designer_form/build.release.gradle b/designer_form/build.release.gradle index 6dda9f4880..90abcb81ee 100644 --- a/designer_form/build.release.gradle +++ b/designer_form/build.release.gradle @@ -32,7 +32,7 @@ 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:'../../../finereport-lib-stable/master',include:'**/*.jar') compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") testCompile 'junit:junit:4.12' From 7573a154d2b552bb1d132b3e921b9556cf734e50 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 18 Oct 2016 10:24:55 +0800 Subject: [PATCH 102/140] updaet --- .../com/fr/design/chart/gui/ChartComponent.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 56c85327dc..3c274a82fc 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -5,6 +5,7 @@ import com.fr.base.ScreenResolution; import com.fr.base.chart.BaseChart; import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartGlyph; +import com.fr.base.chart.chartdata.ChartDataEvent; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.Chart; @@ -31,7 +32,7 @@ import java.util.List; * 绫昏鏄: 浜嬩欢璇存槑: 宸ュ叿鏍忕紪杈--> 鏄埛鏂癈hartComponent 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 鍙抽敭缂栬緫 ---> 鍒锋柊ChartCompment 鍒锋柊瀵瑰簲鐨勫伐鍏锋爮(鍔犲叆浜嬩欢) 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 */ -public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener { +public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener, ChartDataEvent { private static final long serialVersionUID = 744164838619052097L; private final List listeners = new ArrayList(); private ChartCollection chartCollection4Design; @@ -312,10 +313,21 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // chartGlyph.draw(g2d, ScreenResolution.getScreenResolution()); //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 + //娉ㄥ唽鑾峰彇鍥剧墖鍚庣画浜嬩欢 + registerChartDataEvent(chartGlyph); Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); g2d.drawImage(chartImage, 0, 0, null); } } + @Override + public void registerChartDataEvent(BaseChartGlyph glyph) { + glyph.addChartDataEvent(this); + } + + @Override + public void callback() { + this.repaint(); + } } \ No newline at end of file From 04ab068ce7c897dbb9a7a16037619b667512f9fa Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 18 Oct 2016 14:43:04 +0800 Subject: [PATCH 103/140] updaet --- .../fr/design/chart/gui/ChartComponent.java | 42 +++++++++++-------- .../design/chart/gui/ChartGlyphDrawEvent.java | 31 ++++++++++++++ 2 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 3c274a82fc..aaf4dc8337 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -5,7 +5,6 @@ import com.fr.base.ScreenResolution; import com.fr.base.chart.BaseChart; import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartGlyph; -import com.fr.base.chart.chartdata.ChartDataEvent; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.Chart; @@ -32,7 +31,7 @@ import java.util.List; * 绫昏鏄: 浜嬩欢璇存槑: 宸ュ叿鏍忕紪杈--> 鏄埛鏂癈hartComponent 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 鍙抽敭缂栬緫 ---> 鍒锋柊ChartCompment 鍒锋柊瀵瑰簲鐨勫伐鍏锋爮(鍔犲叆浜嬩欢) 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 */ -public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener, ChartDataEvent { +public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener{ private static final long serialVersionUID = 744164838619052097L; private final List listeners = new ArrayList(); private ChartCollection chartCollection4Design; @@ -46,6 +45,8 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene private boolean supportEdit = true; + private ChartGlyphDrawEvent glyphDrawEvent = null; + private final int[] resizeCursors = new int[]{ Cursor.NW_RESIZE_CURSOR, Cursor.N_RESIZE_CURSOR, Cursor.NE_RESIZE_CURSOR, Cursor.E_RESIZE_CURSOR, Cursor.W_RESIZE_CURSOR, @@ -182,8 +183,9 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // 鍙嶉敮榻 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - drawChartGlyph(g2d); - + //鐢诲浘 + drawImage(g2d); + ActiveGlyph ag = this.getActiveGlyph(); if (ag != null) { ag.paint4ActiveGlyph(g2d, chartGlyph); @@ -197,6 +199,13 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, lastHint); } + /** + * 浜嬩欢缁撴潫鍚庯紝閲婃斁浜嬩欢 + */ + public void deleteDrawEvent(){ + glyphDrawEvent = null; + } + /* * ChartGlyph鏀瑰彉澶у皬鐨勬椂鍊欏仛鐨勬搷浣 */ @@ -205,6 +214,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene this.editingChart = this.chartCollection4Design.getSelectedChart();// kunsnat: 鍒囨崲閫変腑鏃 鍚屾鍒囨崲Plot if (editingChart != null) { this.chartGlyph = editingChart.createGlyph(editingChart.defaultChartData()); + //娉ㄥ唽ChartData鐩戝惉鍣 this.activeGlyph = ActiveGlyphFactory.createActiveGlyph(this, chartGlyph); } this.chartWidth = d.width - ChartConstants.PREGAP4BOUNDS; @@ -303,7 +313,16 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene return chartGlyph == null || chartWidth != this.getBounds().width || chartHeight != this.getBounds().height; } - private void drawChartGlyph(Graphics2D g2d) { + private void drawImage(Graphics2D g2d){ + //鐢诲浘浜嬩欢澶勭悊 + glyphDrawEvent = new ChartGlyphDrawEvent(this, g2d); + //娉ㄥ唽浜嬩欢鎵ц鑰 + chartGlyph.addChartDataEvent(glyphDrawEvent); + //澶勭悊鐢诲浘浜嬩欢 + glyphDrawEvent.run(); + } + + public void drawChartGlyph(Graphics2D g2d) { if (chartGlyph != null) { if (chartGlyph.isRoundBorder()) { chartGlyph.setBounds(new RoundRectangle2D.Double(0, 0, chartWidth, chartHeight, 10, 10)); @@ -313,21 +332,8 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // chartGlyph.draw(g2d, ScreenResolution.getScreenResolution()); //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 - //娉ㄥ唽鑾峰彇鍥剧墖鍚庣画浜嬩欢 - registerChartDataEvent(chartGlyph); Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); g2d.drawImage(chartImage, 0, 0, null); } } - - - @Override - public void registerChartDataEvent(BaseChartGlyph glyph) { - glyph.addChartDataEvent(this); - } - - @Override - public void callback() { - this.repaint(); - } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java b/designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java new file mode 100644 index 0000000000..c6acf9cf8a --- /dev/null +++ b/designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java @@ -0,0 +1,31 @@ +package com.fr.design.chart.gui; +import com.fr.base.chart.chartdata.CallbackEvent; + +import java.awt.*; + +/** + * Created by hufan on 2016/10/18. + */ +public class ChartGlyphDrawEvent implements CallbackEvent { + private ChartComponent painter; + private Graphics2D g2d; + + public ChartGlyphDrawEvent() { + } + + public ChartGlyphDrawEvent(ChartComponent painter, Graphics2D g2d) { + this.painter = painter; + this.g2d = g2d; + } + + @Override + public void run() { + painter.drawChartGlyph(g2d); + } + + @Override + public void callback() { + painter.repaint(); + painter.deleteDrawEvent(); + } +} From 6388743153baae7cd1dd99b4fb4b760b392a9541 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 18 Oct 2016 14:43:55 +0800 Subject: [PATCH 104/140] updaet --- designer_chart/src/com/fr/design/chart/gui/ChartComponent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index aaf4dc8337..bb4239537e 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -214,7 +214,6 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene this.editingChart = this.chartCollection4Design.getSelectedChart();// kunsnat: 鍒囨崲閫変腑鏃 鍚屾鍒囨崲Plot if (editingChart != null) { this.chartGlyph = editingChart.createGlyph(editingChart.defaultChartData()); - //娉ㄥ唽ChartData鐩戝惉鍣 this.activeGlyph = ActiveGlyphFactory.createActiveGlyph(this, chartGlyph); } this.chartWidth = d.width - ChartConstants.PREGAP4BOUNDS; From bd7dda013fc0398165f467b947ea484aea947551 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 18 Oct 2016 17:19:58 +0800 Subject: [PATCH 105/140] update --- .../fr/design/chart/gui/ChartComponent.java | 25 +++------------ .../design/chart/gui/ChartGlyphDrawEvent.java | 31 ------------------- 2 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index bb4239537e..be31c1c381 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -10,6 +10,7 @@ import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartglyph.AxisGlyph; +import com.fr.chart.chartimage.ChartGlyphToImageManager; import com.fr.design.chart.gui.active.ActiveGlyph; import com.fr.design.chart.gui.active.ChartActiveGlyph; import com.fr.design.gui.chart.MiddleChartComponent; @@ -45,8 +46,6 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene private boolean supportEdit = true; - private ChartGlyphDrawEvent glyphDrawEvent = null; - private final int[] resizeCursors = new int[]{ Cursor.NW_RESIZE_CURSOR, Cursor.N_RESIZE_CURSOR, Cursor.NE_RESIZE_CURSOR, Cursor.E_RESIZE_CURSOR, Cursor.W_RESIZE_CURSOR, @@ -184,7 +183,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); //鐢诲浘 - drawImage(g2d); + drawChartGlyph(g2d); ActiveGlyph ag = this.getActiveGlyph(); if (ag != null) { @@ -199,13 +198,6 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, lastHint); } - /** - * 浜嬩欢缁撴潫鍚庯紝閲婃斁浜嬩欢 - */ - public void deleteDrawEvent(){ - glyphDrawEvent = null; - } - /* * ChartGlyph鏀瑰彉澶у皬鐨勬椂鍊欏仛鐨勬搷浣 */ @@ -312,15 +304,6 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene return chartGlyph == null || chartWidth != this.getBounds().width || chartHeight != this.getBounds().height; } - private void drawImage(Graphics2D g2d){ - //鐢诲浘浜嬩欢澶勭悊 - glyphDrawEvent = new ChartGlyphDrawEvent(this, g2d); - //娉ㄥ唽浜嬩欢鎵ц鑰 - chartGlyph.addChartDataEvent(glyphDrawEvent); - //澶勭悊鐢诲浘浜嬩欢 - glyphDrawEvent.run(); - } - public void drawChartGlyph(Graphics2D g2d) { if (chartGlyph != null) { if (chartGlyph.isRoundBorder()) { @@ -331,7 +314,9 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // chartGlyph.draw(g2d, ScreenResolution.getScreenResolution()); //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 - Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); + //澶勭悊鐢诲浘浜嬩欢 + Image chartImage = ChartGlyphToImageManager.toImage(g2d, chartGlyph, chartWidth, chartHeight, ScreenResolution.getScreenResolution()); + //Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); g2d.drawImage(chartImage, 0, 0, null); } } diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java b/designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java deleted file mode 100644 index c6acf9cf8a..0000000000 --- a/designer_chart/src/com/fr/design/chart/gui/ChartGlyphDrawEvent.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.fr.design.chart.gui; -import com.fr.base.chart.chartdata.CallbackEvent; - -import java.awt.*; - -/** - * Created by hufan on 2016/10/18. - */ -public class ChartGlyphDrawEvent implements CallbackEvent { - private ChartComponent painter; - private Graphics2D g2d; - - public ChartGlyphDrawEvent() { - } - - public ChartGlyphDrawEvent(ChartComponent painter, Graphics2D g2d) { - this.painter = painter; - this.g2d = g2d; - } - - @Override - public void run() { - painter.drawChartGlyph(g2d); - } - - @Override - public void callback() { - painter.repaint(); - painter.deleteDrawEvent(); - } -} From ec1201808f7a42e167cca38439c1ebb4ece9c409 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 18 Oct 2016 17:37:00 +0800 Subject: [PATCH 106/140] update --- .../fr/design/chart/gui/ChartComponent.java | 4 +- .../chartimage/ChartGlyphToImageEvent.java | 43 +++++++++++++++++++ .../chartimage/ChartGlyphToImageManager.java | 23 ++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java create mode 100644 designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index be31c1c381..69129ab7c2 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -10,7 +10,7 @@ import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartglyph.AxisGlyph; -import com.fr.chart.chartimage.ChartGlyphToImageManager; +import com.fr.design.chart.gui.chartimage.ChartGlyphToImageManager; import com.fr.design.chart.gui.active.ActiveGlyph; import com.fr.design.chart.gui.active.ChartActiveGlyph; import com.fr.design.gui.chart.MiddleChartComponent; @@ -315,7 +315,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 //澶勭悊鐢诲浘浜嬩欢 - Image chartImage = ChartGlyphToImageManager.toImage(g2d, chartGlyph, chartWidth, chartHeight, ScreenResolution.getScreenResolution()); + Image chartImage = ChartGlyphToImageManager.toImage(this, chartGlyph, chartWidth, chartHeight, ScreenResolution.getScreenResolution()); //Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); g2d.drawImage(chartImage, 0, 0, null); } diff --git a/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java b/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java new file mode 100644 index 0000000000..01eb49a19a --- /dev/null +++ b/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java @@ -0,0 +1,43 @@ +package com.fr.design.chart.gui.chartimage; +import com.fr.base.chart.BaseChartGlyph; +import com.fr.base.chart.chartdata.CallbackEvent; + +import java.awt.*; + +/** + * Created by hufan on 2016/10/18. + */ +public class ChartGlyphToImageEvent implements CallbackEvent { + private Component painter; + private BaseChartGlyph glyph; + private int width; + private int height; + private int resolution; + + private Image image; + + public ChartGlyphToImageEvent() { + } + + public ChartGlyphToImageEvent(Component painter) { + this.painter = painter; + } + + public ChartGlyphToImageEvent setImageArgs(BaseChartGlyph glyph, int width, int height, int resolution){ + this.glyph = glyph; + this.width = width; + this.height = height; + this.resolution = resolution; + return this; + } + + public Image run() { + glyph.addChartDataEvent(this); + this.image = glyph.toImage(width, height, resolution); + return image; + } + + public void callback() { + painter.repaint(); + } +} diff --git a/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java b/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java new file mode 100644 index 0000000000..464d345dc0 --- /dev/null +++ b/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java @@ -0,0 +1,23 @@ +package com.fr.design.chart.gui.chartimage; + +import com.fr.base.chart.BaseChartGlyph; + +import java.awt.*; + +/** + * Created by hufan on 2016/10/18. + */ +public class ChartGlyphToImageManager { + private static ChartGlyphToImageManager toImageManager = new ChartGlyphToImageManager(); + + public static Image toImage(Component listener, BaseChartGlyph glyph, int width, int height, int resolution){ + //鍒濆鍖栨柊鐨勫浘鐗囧鐞 + ChartGlyphToImageEvent imageEvent = toImageManager.initImageEvent(listener); + //鑾峰彇鍥剧墖 + return imageEvent.setImageArgs(glyph, width, height, resolution).run(); + } + + private ChartGlyphToImageEvent initImageEvent(Component listener){ + return new ChartGlyphToImageEvent(listener); + } +} From 0a231bca2e76426b318c5c33927ab43d1572e448 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 19 Oct 2016 22:25:35 +0800 Subject: [PATCH 107/140] =?UTF-8?q?REPORT-533=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B8=83=E5=B1=80=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/itable/AbstractPropertyTable.java | 6 +++++ ...bsoluteBodyLayoutPropertiesGroupModel.java | 23 +++++++++++++++++-- .../FRFitLayoutPropertiesGroupModel.java | 16 +++++++++++++ .../mainframe/FormHierarchyTreePane.java | 13 +++++++++-- .../src/com/fr/design/mainframe/JForm.java | 20 ++++++++++++---- 5 files changed, 70 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/itable/AbstractPropertyTable.java b/designer_base/src/com/fr/design/gui/itable/AbstractPropertyTable.java index f16be99639..02a6f547b8 100644 --- a/designer_base/src/com/fr/design/gui/itable/AbstractPropertyTable.java +++ b/designer_base/src/com/fr/design/gui/itable/AbstractPropertyTable.java @@ -66,6 +66,9 @@ public abstract class AbstractPropertyTable extends JTable { public TableCellRenderer getCellRenderer(int row, int column) { if (groups != null) { Point pIndex = getGroupIndex(row); + if (pIndex == null){ + return super.getCellRenderer(row, column); + } PropertyGroup group = groups.get(pIndex.x); if (pIndex.y == 0) { if (column == 0) { @@ -192,6 +195,9 @@ public abstract class AbstractPropertyTable extends JTable { @Override public Object getValueAt(int row, int column) { Point pIndex = getGroupIndex(row); + if (pIndex == null){ + return null; + } PropertyGroup group = groups.get(pIndex.x); if (pIndex.y == 0) { if (column == 0) { diff --git a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java index 1a7ab03d3f..7ac4764b7d 100644 --- a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java +++ b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java @@ -1,7 +1,9 @@ package com.fr.design.designer.properties; +import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XWAbsoluteBodyLayout; import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelectionUtils; import com.fr.design.mainframe.WidgetPropertyPane; @@ -93,6 +95,8 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr if (row == 0) { if (state == WBodyLayoutType.FIT.getTypeValue()) { XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent(); + //澶囦唤涓涓嬬粍浠堕棿闅 + int compInterval = xfl.toData().getCompInterval(); Component[] components = xwAbsoluteLayout.getComponents(); Arrays.sort(components, new ComparatorComponentLocation()); @@ -104,13 +108,21 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr for (Component comp : components) { xfl.add(comp); } + //杩欒竟璁＄畻鐨勬椂鍊欎細鍏堟妸缁勪欢闂撮殧鍘绘帀 moveComponents2FitLayout(xfl, components); FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); - formDesigner.getSelectionModel().setSelectedCreators( - FormSelectionUtils.rebuildSelection(xfl, new Widget[]{xfl.toData()})); + formDesigner.getSelectionModel().setSelectedCreator(xfl); xfl.convert(); LayoutUtils.layoutContainer(xfl); xfl.adjustCreatorsWhileSlide(xfl.getContainerPercent() - 1.0); + + //鎶婄粍浠堕棿闅斿姞涓 + if (xfl.toData().getCompInterval() != compInterval) { + xfl.moveContainerMargin(); + xfl.moveCompInterval(xfl.getAcualInterval()); + xfl.toData().setCompInterval(compInterval); + xfl.addCompInterval(xfl.getAcualInterval()); + } return true; } } @@ -156,6 +168,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr int layoutHeight = xwFitLayout.getHeight() - xwFitLayout.toData().getMargin().getTop() - xwFitLayout.toData().getMargin().getBottom(); int leftMargin = xwFitLayout.toData().getMargin().getLeft(); int topMargin = xwFitLayout.toData().getMargin().getTop(); + xwFitLayout.toData().setCompInterval(0); int row = (components.length / eachRowCount) + (components.length % eachRowCount == 0 ? 0 : 1); //鏈鍚庝竴琛岀殑鍒楁暟涓嶅畾 int column = components.length % eachRowCount == 0 ? eachRowCount : components.length % eachRowCount; @@ -182,6 +195,12 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr lastRowHeight ); } + for (int i = 0;i < components.length;i++){ + if (components[i] instanceof XWCardMainBorderLayout){ + ((XWCardMainBorderLayout)components[i]).recalculateChildWidth(components[i].getWidth()); + ((XWCardMainBorderLayout)components[i]).recalculateChildHeight(components[i].getHeight()); + } + } xwFitLayout.updateBoundsWidget(); } diff --git a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java index f6b8ccaf22..c7d999c3e6 100644 --- a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java +++ b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java @@ -4,6 +4,7 @@ package com.fr.design.designer.properties; import com.fr.design.beans.GroupModel; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWAbsoluteBodyLayout; import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.mainframe.FormDesigner; @@ -91,8 +92,23 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { } } + private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) { + XLayoutContainer rootLayout = formDesigner.getRootComponent(); + if (rootLayout.getComponentCount() == 1 && rootLayout.getXCreator(0).acceptType(XWAbsoluteBodyLayout.class)){ + rootLayout = (XWAbsoluteBodyLayout)rootLayout.getXCreator(0); + } + return rootLayout; + } + @Override public Object getValue(int row, int column) { + FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + XLayoutContainer rootLayout = selectedBodyLayout(formDesigner); + if (rootLayout != formDesigner.getRootComponent() + && formDesigner.getSelectionModel().getSelection().getSelectedCreator() == formDesigner.getRootComponent()) { + formDesigner.getSelectionModel().setSelectedCreators( + FormSelectionUtils.rebuildSelection(xfl, new Widget[]{selectedBodyLayout(formDesigner).toData()})); + } if (column == 0) { switch (row) { case 0: diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java index 34fb5c6014..ccf2f2c886 100644 --- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java +++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java @@ -7,6 +7,8 @@ import java.awt.event.ActionEvent; import javax.swing.BorderFactory; import javax.swing.Icon; +import com.fr.design.designer.creator.XLayoutContainer; +import com.fr.design.designer.creator.XWAbsoluteBodyLayout; import com.fr.design.parameter.HierarchyTreePane; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XWParameterLayout; @@ -155,10 +157,17 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree */ private void adjustPosition(ComponentTreeModel treeModel,FormDesigner formDesigner){ XCreator root = (XCreator)treeModel.getRoot(); - if(treeModel.getChild(root,PARA) instanceof XWParameterLayout){ + XCreator firstChild = (XCreator)treeModel.getChild(root,PARA); + if(firstChild.acceptType(XWParameterLayout.class)){ return; } - root.add((Component)(treeModel.getChild(root,PARA)),BODY); + // 缁濆甯冨眬浣滀负body鐨勬椂鍊 + // 鑾峰彇绗竴涓瓙鑺傜偣鐨勬柟娉曚腑灞忚斀浜唂it + // 杩欒竟鍙﹀澶勭悊涓涓 + else if (firstChild.acceptType(XWAbsoluteBodyLayout.class) && firstChild.getBackupParent() != null) { + firstChild = firstChild.getBackupParent(); + } + root.add(firstChild,BODY); treeModel.setRoot(root); componentTree = new ComponentTree(formDesigner,treeModel); } diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index ef18f07135..661ba0ab96 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -9,9 +9,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.designer.beans.actions.FormDeleteAction; import com.fr.design.designer.beans.events.DesignerEditListener; import com.fr.design.designer.beans.events.DesignerEvent; -import com.fr.design.designer.creator.XComponent; -import com.fr.design.designer.creator.XCreator; -import com.fr.design.designer.creator.XCreatorUtils; +import com.fr.design.designer.creator.*; import com.fr.design.designer.properties.FormWidgetAuthorityEditPane; import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedListener; @@ -436,6 +434,18 @@ public class JForm extends JTemplate implements BaseJForm { return !inECUndoForm && this.getUndoManager().canUndo(); } + // 杩斿洖褰撳墠鐨刡ody锛 + // 鍋囧褰撳墠body鏄嚜閫傚簲鐨勮瘽灏辨部鐢紝 + // 鍋囧褰撳墠body鏄粷瀵瑰竷灞鐨勮瘽灏辫繑鍥炵粷瀵瑰竷灞body + private XLayoutContainer selectedBodyLayout() { + XLayoutContainer rootLayout = formDesign.getRootComponent(); + for (int i = 0; i < rootLayout.getComponentCount(); i++){ + if (rootLayout.getXCreator(i).acceptType(XWAbsoluteBodyLayout.class)){ + rootLayout = (XWAbsoluteBodyLayout)rootLayout.getXCreator(i); + } + } + return rootLayout; + } @Override /** * 搴旂敤undoState鐨勮〃鍗曟暟鎹 @@ -447,7 +457,9 @@ public class JForm extends JTemplate implements BaseJForm { if (this.index == FORM_TAB) { JForm.this.refreshRoot(); this.formDesign.getArea().setAreaSize(u.getAreaSize(), u.getHorizontalValue(), u.getVerticalValue(), u.getWidthValue(), u.getHeightValue(), u.getSlideValue()); - this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(), u.getSelectWidgets())); + //鎾ら攢鐨勬椂鍊欒閲嶆柊閫夋嫨鐨刡ody甯冨眬 + this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(), + formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()})); } else { String widgetName = this.formDesign.getElementCaseContainerName(); //杩欏効澶潙浜嗭紝u.getForm() 涓 getTarget鍐呭涓嶄竴鏍 From 33dea21fd0b513faf3948e55c3f3700fbca4cba5 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 20 Oct 2016 11:21:23 +0800 Subject: [PATCH 108/140] =?UTF-8?q?change:=E5=85=88=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 2ea102c545..56f44f1cb8 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -266,8 +266,7 @@ public abstract class ToolBarMenuDock { if (!BaseUtils.isAuthorityEditing()) { if (shouldShowPlugin() && !(FRContext.getCurrentEnv() instanceof RemoteEnv)) { menuDef.addShortCut( - new PluginManagerAction(), - new ReuseManagerAction() + new PluginManagerAction() ); } menuDef.addShortCut( From c4e1dedba902ee9cb045fb0db94468f3172e0b20 Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 20 Oct 2016 11:37:53 +0800 Subject: [PATCH 109/140] =?UTF-8?q?REPORT-533=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B8=83=E5=B1=80=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20bugfix:=E4=BF=AE=E5=A4=8Dscalelayout=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E6=8E=A7=E4=BB=B6=E5=9C=A8=E5=B8=83=E5=B1=80=E9=97=B4?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...RAbsoluteBodyLayoutPropertiesGroupModel.java | 17 +++++++++++------ .../FRFitLayoutPropertiesGroupModel.java | 12 +++++++++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java index 7ac4764b7d..3613f7fdc5 100644 --- a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java +++ b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java @@ -1,8 +1,6 @@ package com.fr.design.designer.properties; -import com.fr.design.designer.creator.XCreator; -import com.fr.design.designer.creator.XWAbsoluteBodyLayout; -import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelectionUtils; @@ -106,10 +104,16 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr xfl.toData().setLayoutType(WBodyLayoutType.FIT); for (Component comp : components) { - xfl.add(comp); + XCreator xCreator = (XCreator)comp; + if (xCreator.shouldScaleCreator()){ + XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight()); + xfl.add(parentPanel, xCreator.toData().getWidgetName()); + continue; + } + xfl.add(xCreator); } //杩欒竟璁＄畻鐨勬椂鍊欎細鍏堟妸缁勪欢闂撮殧鍘绘帀 - moveComponents2FitLayout(xfl, components); + moveComponents2FitLayout(xfl); FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); formDesigner.getSelectionModel().setSelectedCreator(xfl); xfl.convert(); @@ -159,8 +163,9 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr } //鎶婄粷瀵瑰竷灞涓殑鍏冪礌鎸夎鍒欑Щ鍔ㄥ埌鑷傚簲甯冨眬涓 - private void moveComponents2FitLayout(XWFitLayout xwFitLayout, Component[] components) { + private void moveComponents2FitLayout(XWFitLayout xwFitLayout) { int eachRowCount = 4; + Component[] components = xwFitLayout.getComponents(); if (components.length <= 1){ return; } diff --git a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java index c7d999c3e6..c9654e26d0 100644 --- a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java +++ b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java @@ -4,9 +4,7 @@ package com.fr.design.designer.properties; import com.fr.design.beans.GroupModel; -import com.fr.design.designer.creator.XLayoutContainer; -import com.fr.design.designer.creator.XWAbsoluteBodyLayout; -import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.creator.*; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelectionUtils; import com.fr.design.mainframe.WidgetPropertyPane; @@ -156,6 +154,14 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0,0)); xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0); for (Component component : components) { + XCreator xCreator = (XCreator)component; + //閮ㄥ垎鎺т欢琚玈caleLayout鍖呰９鐫锛岀粷瀵瑰竷灞閲岄潰瑕佹斁鍑烘潵 + if (xCreator.acceptType(XWScaleLayout.class)){ + if (xCreator.getComponentCount() > 0 && ((XCreator)xCreator.getComponent(0)).shouldScaleCreator()) { + component = xCreator.getComponent(0); + component.setBounds(xCreator.getBounds()); + } + } xwAbsoluteBodyLayout.add(component); } FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); From a128fcfb1c836bf22f0cf7c7aea44021c5c488d8 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 20 Oct 2016 14:02:19 +0800 Subject: [PATCH 110/140] update --- .../fr/design/chart/gui/ChartComponent.java | 12 ++++-- .../chartimage/ChartGlyphToImageEvent.java | 43 ------------------- .../chartimage/ChartGlyphToImageManager.java | 23 ---------- 3 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java delete mode 100644 designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 69129ab7c2..9b4a91f1a4 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -5,12 +5,12 @@ import com.fr.base.ScreenResolution; import com.fr.base.chart.BaseChart; import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartGlyph; +import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartglyph.AxisGlyph; -import com.fr.design.chart.gui.chartimage.ChartGlyphToImageManager; import com.fr.design.chart.gui.active.ActiveGlyph; import com.fr.design.chart.gui.active.ChartActiveGlyph; import com.fr.design.gui.chart.MiddleChartComponent; @@ -32,7 +32,7 @@ import java.util.List; * 绫昏鏄: 浜嬩欢璇存槑: 宸ュ叿鏍忕紪杈--> 鏄埛鏂癈hartComponent 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 鍙抽敭缂栬緫 ---> 鍒锋柊ChartCompment 鍒锋柊瀵瑰簲鐨勫伐鍏锋爮(鍔犲叆浜嬩欢) 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 */ -public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener{ +public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener, CallbackEvent{ private static final long serialVersionUID = 744164838619052097L; private final List listeners = new ArrayList(); private ChartCollection chartCollection4Design; @@ -315,9 +315,13 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 //澶勭悊鐢诲浘浜嬩欢 - Image chartImage = ChartGlyphToImageManager.toImage(this, chartGlyph, chartWidth, chartHeight, ScreenResolution.getScreenResolution()); - //Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); + Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution(), this); g2d.drawImage(chartImage, 0, 0, null); } } + + @Override + public void callback() { + this.repaint(); + } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java b/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java deleted file mode 100644 index 01eb49a19a..0000000000 --- a/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageEvent.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.fr.design.chart.gui.chartimage; -import com.fr.base.chart.BaseChartGlyph; -import com.fr.base.chart.chartdata.CallbackEvent; - -import java.awt.*; - -/** - * Created by hufan on 2016/10/18. - */ -public class ChartGlyphToImageEvent implements CallbackEvent { - private Component painter; - private BaseChartGlyph glyph; - private int width; - private int height; - private int resolution; - - private Image image; - - public ChartGlyphToImageEvent() { - } - - public ChartGlyphToImageEvent(Component painter) { - this.painter = painter; - } - - public ChartGlyphToImageEvent setImageArgs(BaseChartGlyph glyph, int width, int height, int resolution){ - this.glyph = glyph; - this.width = width; - this.height = height; - this.resolution = resolution; - return this; - } - - public Image run() { - glyph.addChartDataEvent(this); - this.image = glyph.toImage(width, height, resolution); - return image; - } - - public void callback() { - painter.repaint(); - } -} diff --git a/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java b/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java deleted file mode 100644 index 464d345dc0..0000000000 --- a/designer_chart/src/com/fr/design/chart/gui/chartimage/ChartGlyphToImageManager.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.fr.design.chart.gui.chartimage; - -import com.fr.base.chart.BaseChartGlyph; - -import java.awt.*; - -/** - * Created by hufan on 2016/10/18. - */ -public class ChartGlyphToImageManager { - private static ChartGlyphToImageManager toImageManager = new ChartGlyphToImageManager(); - - public static Image toImage(Component listener, BaseChartGlyph glyph, int width, int height, int resolution){ - //鍒濆鍖栨柊鐨勫浘鐗囧鐞 - ChartGlyphToImageEvent imageEvent = toImageManager.initImageEvent(listener); - //鑾峰彇鍥剧墖 - return imageEvent.setImageArgs(glyph, width, height, resolution).run(); - } - - private ChartGlyphToImageEvent initImageEvent(Component listener){ - return new ChartGlyphToImageEvent(listener); - } -} From ef3bed63e50a805cb0cf5494469e598d7fc28acf Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 20 Oct 2016 17:02:38 +0800 Subject: [PATCH 111/140] =?UTF-8?q?REPORT-533=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B8=83=E5=B1=80=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20bugfix=EF=BC=9Bmaster=E4=B8=AD=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E6=8E=89=EF=BC=8C=E5=8F=AA=E5=BC=80=E6=94=BErelease?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FRAbsoluteBodyLayoutPropertiesGroupModel.java | 6 ++++++ .../design/designer/properties/items/FRLayoutTypeItems.java | 4 ++-- .../src/com/fr/design/gui/core/FormWidgetOption.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java index 3613f7fdc5..fff14f03d0 100644 --- a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java +++ b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java @@ -120,6 +120,12 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr LayoutUtils.layoutContainer(xfl); xfl.adjustCreatorsWhileSlide(xfl.getContainerPercent() - 1.0); + for (int i = 0; i < components.length; i++) { + Component comp = xfl.getComponent(i); + XCreator creator = (XCreator) comp; + creator.setBackupBound(components[i].getBounds()); + } + //鎶婄粍浠堕棿闅斿姞涓 if (xfl.toData().getCompInterval() != compInterval) { xfl.moveContainerMargin(); diff --git a/designer_form/src/com/fr/design/designer/properties/items/FRLayoutTypeItems.java b/designer_form/src/com/fr/design/designer/properties/items/FRLayoutTypeItems.java index a19d975170..cd9ddb439c 100644 --- a/designer_form/src/com/fr/design/designer/properties/items/FRLayoutTypeItems.java +++ b/designer_form/src/com/fr/design/designer/properties/items/FRLayoutTypeItems.java @@ -7,8 +7,8 @@ import com.fr.form.ui.container.WBodyLayoutType; */ public class FRLayoutTypeItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { - new Item(WBodyLayoutType.FIT.description(), WBodyLayoutType.FIT.getTypeValue()), - new Item(WBodyLayoutType.ABSOLUTE.description(), WBodyLayoutType.ABSOLUTE.getTypeValue())}; + new Item(WBodyLayoutType.FIT.description(), WBodyLayoutType.FIT.getTypeValue())/*, + new Item(WBodyLayoutType.ABSOLUTE.description(), WBodyLayoutType.ABSOLUTE.getTypeValue())*/}; public Item[] getItems() { return ITEMS; diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index b3fa73a26d..545ffadf73 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file +package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file From 55aa72ec8edb6410daa5b20b2800f6cef40f32c5 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 21 Oct 2016 10:54:15 +0800 Subject: [PATCH 112/140] ct --- .../mainframe/toolbar/ToolBarMenuDock.java | 60 ++++++++----------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 56f44f1cb8..bb9b886e5d 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -26,7 +26,6 @@ import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; -import com.fr.env.RemoteEnv; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; @@ -121,7 +120,7 @@ public abstract class ToolBarMenuDock { ///////////////////////////////menu below///////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// - private MenuDef[] menus(final ToolBarMenuDockPlus plus) { + public MenuDef[] menus(final ToolBarMenuDockPlus plus) { java.util.List menuList = new java.util.ArrayList(); // 娣诲姞鏂囦欢鑿滃崟 menuList.add(createFileMenuDef(plus)); @@ -143,17 +142,17 @@ public abstract class ToolBarMenuDock { return menuList.toArray(new MenuDef[menuList.size()]); } - private void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { + public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) { // 缁欒彍鍗曞姞鎻掍欢鍏ュ彛 for (MenuDef m : menuDefs) { switch (m.getAnchor()) { - case MenuHandler.TEMPLATE: + case MenuHandler.TEMPLATE : insertMenu(m, MenuHandler.TEMPLATE, new TemplateTargetAction(plus)); break; - case MenuHandler.INSERT: + case MenuHandler.INSERT : insertMenu(m, MenuHandler.INSERT); break; - case MenuHandler.CELL: + case MenuHandler.CELL : insertMenu(m, MenuHandler.CELL); break; default: @@ -172,7 +171,7 @@ public abstract class ToolBarMenuDock { return plus.menus4Target(); } - private MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { + public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F'); ShortCut[] scs = new ShortCut[0]; @@ -200,7 +199,7 @@ public abstract class ToolBarMenuDock { addSwitchExistEnvAction(menuDef); - menuDef.addShortCut(new ExitDesignerAction()); + menuDef.addShortCut( new ExitDesignerAction()); insertMenu(menuDef, MenuHandler.FILE); return menuDef; @@ -222,7 +221,7 @@ public abstract class ToolBarMenuDock { menuDef.addShortCut(new SwitchExistEnv()); } - protected ShortCut openTemplateAction() { + protected ShortCut openTemplateAction(){ return new OpenTemplateAction(); } @@ -237,8 +236,9 @@ public abstract class ToolBarMenuDock { * 鍒涘缓璁哄潧鐧诲綍闈㈡澘, chart閭ｈ竟涓嶉渶瑕 * * @return 闈㈡澘缁勪欢 + * */ - public Component createBBSLoginPane() { + public Component createBBSLoginPane(){ return new UILabel(); } @@ -264,7 +264,7 @@ public abstract class ToolBarMenuDock { ); if (!BaseUtils.isAuthorityEditing()) { - if (shouldShowPlugin() && !(FRContext.getCurrentEnv() instanceof RemoteEnv)) { + if (shouldShowPlugin()){ menuDef.addShortCut( new PluginManagerAction() ); @@ -290,7 +290,6 @@ public abstract class ToolBarMenuDock { /** * 鍒涘缓甯姪瀛愯彍鍗 - * * @return 甯粍鑿滃崟鐨勫瓙鑿滃崟 */ public ShortCut[] createHelpShortCuts() { @@ -299,7 +298,7 @@ public abstract class ToolBarMenuDock { shortCuts.add(SeparatorDef.DEFAULT); //shortCuts.add(new TutorialAction()); shortCuts.add(SeparatorDef.DEFAULT); - if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) { + if (ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)) { shortCuts.add(new FeedBackAction()); shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(SeparatorDef.DEFAULT); @@ -313,7 +312,6 @@ public abstract class ToolBarMenuDock { /** * 鍒涘缓绀惧尯瀛愯彍鍗 - * * @return 绀惧尯鑿滃崟鐨勫瓙鑿滃崟 */ public ShortCut[] createCommunityShortCuts() { @@ -328,7 +326,6 @@ public abstract class ToolBarMenuDock { shortCuts.add(new SignAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } - public MenuDef createHelpMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); @@ -338,7 +335,6 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.HELP); return menuDef; } - public MenuDef createCommunityMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); @@ -348,7 +344,6 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.BBS); return menuDef; } - /** * 鐢熸垚宸ュ叿鏍 * @@ -473,8 +468,7 @@ public abstract class ToolBarMenuDock { public int getMenuState() { return DesignState.WORK_SHEET; } - - public int getToolBarHeight() { + public int getToolBarHeight(){ return PANLE_HEIGNT; } @@ -483,13 +477,13 @@ public abstract class ToolBarMenuDock { * * @return 瀛愯彍鍗 */ - public ShortCut[] shortcut4ExportMenu() { + public ShortCut[] shortcut4ExportMenu(){ return new ShortCut[0]; } }; - public NewTemplatePane getNewTemplatePane() { + public NewTemplatePane getNewTemplatePane(){ return new NewTemplatePane() { @Override public Icon getNew() { @@ -524,11 +518,8 @@ public abstract class ToolBarMenuDock { for (MenuHandler handler : target) { int insertPosition = handler.insertPosition(menuDef.getShortCutCount()); - if (insertPosition == MenuHandler.HIDE) { - return; - } ShortCut shortCut = action.methodAction(handler); - if (shortCut == null) { + if (shortCut == null){ continue; } @@ -541,10 +532,10 @@ public abstract class ToolBarMenuDock { menuDef.insertShortCut(insertPosition, shortCut); if (handler.insertSeparatorBefore()) { menuDef.insertShortCut(insertPosition, SeparatorDef.DEFAULT); - insertPosition++; + insertPosition ++; } if (handler.insertSeparatorAfter()) { - insertPosition++; + insertPosition ++; menuDef.insertShortCut(insertPosition, SeparatorDef.DEFAULT); } } @@ -553,35 +544,36 @@ public abstract class ToolBarMenuDock { /** * 璁捐鍣ㄩ鍑烘椂, 鍋氱殑涓浜涙搷浣. + * */ - public void shutDown() { + public void shutDown(){ } - private interface ShortCutMethodAction { + private interface ShortCutMethodAction{ public ShortCut methodAction(MenuHandler handler); } - private abstract class AbstractShortCutMethodAction implements ShortCutMethodAction { + private abstract class AbstractShortCutMethodAction implements ShortCutMethodAction{ - public ShortCut methodAction(MenuHandler handler) { + public ShortCut methodAction(MenuHandler handler){ return handler.shortcut(); } } //涓嶉渶瑕佺紪杈戝璞＄殑鑿滃崟, 姣斿鏂囦欢, 鏈嶅姟鍣, 鍏充簬 - private class NoTargetAction extends AbstractShortCutMethodAction { + private class NoTargetAction extends AbstractShortCutMethodAction{ } //妯℃澘涓哄璞＄殑鑿滃崟, 姣斿妯℃澘, 鍚庣画濡傛灉鍗曞厓鏍间篃瑕, 鐩存帴鍔犱釜CellTargetAction鍗冲彲. //鍦╩ethodAction涓仛handler.shortcut(cell), 涓嶉渶瑕佷慨鏀筯andler涓師鏈夋帴鍙, 鍔犱釜shortcut(cell). - private class TemplateTargetAction extends AbstractShortCutMethodAction { + private class TemplateTargetAction extends AbstractShortCutMethodAction{ private ToolBarMenuDockPlus plus; - public TemplateTargetAction(ToolBarMenuDockPlus plus) { + public TemplateTargetAction(ToolBarMenuDockPlus plus){ this.plus = plus; } From 5a9f7e148836f9306b43735757af01fca4cdc588 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 21 Oct 2016 10:55:11 +0800 Subject: [PATCH 113/140] ct --- .../{build.dev.gradle => build.master.gradle} | 2 +- designer_base/build.release.gradle | 70 ------------------- 2 files changed, 1 insertion(+), 71 deletions(-) rename designer_base/{build.dev.gradle => build.master.gradle} (98%) delete mode 100644 designer_base/build.release.gradle diff --git a/designer_base/build.dev.gradle b/designer_base/build.master.gradle similarity index 98% rename from designer_base/build.dev.gradle rename to designer_base/build.master.gradle index 7b3bea2ba9..b02f751e7c 100644 --- a/designer_base/build.dev.gradle +++ b/designer_base/build.master.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯増鏈 version='8.0' //鐢熸垚jar鍖呴噸鍛藉悕 diff --git a/designer_base/build.release.gradle b/designer_base/build.release.gradle deleted file mode 100644 index 4ed4ba12b0..0000000000 --- a/designer_base/build.release.gradle +++ /dev/null @@ -1,70 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 -//鎸囧畾鐢熸垚jar鍖呯増鏈 -version='8.0' -//鐢熸垚jar鍖呴噸鍛藉悕 -jar{ - baseName='fr-designer-core' -} - - -def srcDir="." - -//鎸囧畾婧愮爜璺緞 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -//鑾峰彇浠涔堝垎鏀悕 -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/master',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - into 'build/classes/main' - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - - - From 807a661ba908aa4e218ee8b0385a05cc424f2067 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 21 Oct 2016 10:55:38 +0800 Subject: [PATCH 114/140] ct --- .../fr/design/chart/gui/ChartComponent.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index d898640feb..9b4a91f1a4 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -5,6 +5,7 @@ import com.fr.base.ScreenResolution; import com.fr.base.chart.BaseChart; import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartGlyph; +import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.Chart; @@ -31,7 +32,7 @@ import java.util.List; * 绫昏鏄: 浜嬩欢璇存槑: 宸ュ叿鏍忕紪杈--> 鏄埛鏂癈hartComponent 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 鍙抽敭缂栬緫 ---> 鍒锋柊ChartCompment 鍒锋柊瀵瑰簲鐨勫伐鍏锋爮(鍔犲叆浜嬩欢) 鐒跺悗鍝嶅簲鏁翠釜璁捐鍧楃殑鏀瑰彉浜嬩欢 */ -public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener { +public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener, CallbackEvent{ private static final long serialVersionUID = 744164838619052097L; private final List listeners = new ArrayList(); private ChartCollection chartCollection4Design; @@ -181,8 +182,9 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // 鍙嶉敮榻 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + //鐢诲浘 drawChartGlyph(g2d); - + ActiveGlyph ag = this.getActiveGlyph(); if (ag != null) { ag.paint4ActiveGlyph(g2d, chartGlyph); @@ -222,9 +224,9 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene /** * 榧犳爣鐐瑰嚮 * @param event 榧犳爣浜嬩欢 + * 涓嶈缃紶鏍囩偣鍑昏烦杞簨浠 */ - public void mouseClicked(MouseEvent event) { - + public void mouseClicked(MouseEvent event) { } /** @@ -302,7 +304,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene return chartGlyph == null || chartWidth != this.getBounds().width || chartHeight != this.getBounds().height; } - private void drawChartGlyph(Graphics2D g2d) { + public void drawChartGlyph(Graphics2D g2d) { if (chartGlyph != null) { if (chartGlyph.isRoundBorder()) { chartGlyph.setBounds(new RoundRectangle2D.Double(0, 0, chartWidth, chartHeight, 10, 10)); @@ -312,10 +314,14 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene // chartGlyph.draw(g2d, ScreenResolution.getScreenResolution()); //涓嶇洿鎺ョ敾chartGlyph鑰岀敾image鐨勫師鍥犳槸琛ㄥ崟鐨勬煴褰㈠浘浼氭孩鍑鸿〃鍗 //鍏朵粬鍥鹃兘ok锛屽叾瀹炴劅瑙夊簲璇ユ槸鏌卞舰鍥剧敾鐨勪笉瀵癸紝搴旇涔熷彲浠ユ敼閭ｈ竟 - Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution()); + //澶勭悊鐢诲浘浜嬩欢 + Image chartImage = chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution(), this); g2d.drawImage(chartImage, 0, 0, null); } } - + @Override + public void callback() { + this.repaint(); + } } \ No newline at end of file From b17db5669e40d5f224e834d075a226649a83bc00 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 21 Oct 2016 10:56:12 +0800 Subject: [PATCH 115/140] ct --- .../PlotSeries/MapDefiAreaNamePane.java | 54 ++++++++----------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java index 3892493b4b..ca8d3a67dd 100644 --- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java +++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java @@ -1,42 +1,32 @@ package com.fr.design.chart.series.PlotSeries; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.swing.AbstractCellEditor; -import javax.swing.JPanel; -import javax.swing.JTable; -import javax.swing.SwingConstants; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; - +import com.fr.base.Utils; import com.fr.chart.base.MapSvgAttr; import com.fr.chart.base.MapSvgXMLHelper; -import com.fr.base.Utils; -import com.fr.design.data.DesignTableDataManager; -import com.fr.data.TableDataSource; -import com.fr.data.core.DataCoreUtils; -import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.data.tabledata.wrapper.TableDataWrapper; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; +import com.fr.design.editor.editor.Editor; +import com.fr.design.editor.editor.TextEditor; import com.fr.design.gui.icombobox.FilterComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.UIArrayTableModel; import com.fr.design.gui.itableeditorpane.UITableEditorPane; -import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; -import com.fr.design.editor.ValueEditorPane; -import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.xcombox.ComboBoxUseEditor; -import com.fr.design.editor.editor.Editor; -import com.fr.design.editor.editor.TextEditor; +import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; import com.fr.general.Inter; +import javax.swing.*; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import java.awt.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * 鍦板浘, 瀹氫箟鍖哄煙鍚. * @@ -89,7 +79,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc tableDataBox.setPreferredSize(new Dimension(200, 20)); northPane.add(tableDataBox); - columnBox = new FilterComboBox(); + columnBox = new FilterComboBox<>(); columnBox.setPreferredSize(new Dimension(40, 20)); columnBox.addItemListener(columnChange); @@ -113,12 +103,10 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc String columnName = Utils.objectToString(columnBox.getSelectedItem()); TableDataWrapper tableDataWrappe = tableDataBox.getTableDataWrapper(); - TableDataSource source = DesignTableDataManager.getEditingTableDataSource(); - if (tableDataWrappe == null || source == null) { - return; - } - initNames = DataCoreUtils.getColValuesInData(source, tableDataWrappe.getTableDataName(), columnName); + List list = MapCustomPane.getColValuesInData(tableDataWrappe, columnName); + + initNames = list.toArray(initNames); if (tableEditorModel != null) { tableEditorModel.stopCellEditing();// 鍙槸鐢ㄦ潵鍒锋柊鍒楄〃鐨刢ombox From ee40273402d9b8d2e3412f43475a7231ffb90eb7 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 21 Oct 2016 10:57:25 +0800 Subject: [PATCH 116/140] 1 --- .../{build.dev.gradle => build.master.gradle} | 2 +- designer_chart/build.release.gradle | 66 ------------------- 2 files changed, 1 insertion(+), 67 deletions(-) rename designer_chart/{build.dev.gradle => build.master.gradle} (98%) delete mode 100644 designer_chart/build.release.gradle diff --git a/designer_chart/build.dev.gradle b/designer_chart/build.master.gradle similarity index 98% rename from designer_chart/build.dev.gradle rename to designer_chart/build.master.gradle index f980fa135a..ba6df992bd 100644 --- a/designer_chart/build.dev.gradle +++ b/designer_chart/build.master.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 version='8.0' diff --git a/designer_chart/build.release.gradle b/designer_chart/build.release.gradle deleted file mode 100644 index e97176e24c..0000000000 --- a/designer_chart/build.release.gradle +++ /dev/null @@ -1,66 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 -//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 -version='8.0' - -def srcDir="." - -//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 - -jar{ - baseName='fr-designer-chart' -} - -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -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/master',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - - } - into 'build/classes/main' - } - -} - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - From bdde8fa038303920d1a20fb4357e58272da05706 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 21 Oct 2016 10:58:32 +0800 Subject: [PATCH 117/140] 1 --- build.dev.gradle => build.master.gradle | 1 + build.release.gradle | 85 ------------------- .../{build.dev.gradle => build.master.gradle} | 4 +- designer_form/build.release.gradle | 83 ------------------ 4 files changed, 3 insertions(+), 170 deletions(-) rename build.dev.gradle => build.master.gradle (99%) delete mode 100644 build.release.gradle rename designer_form/{build.dev.gradle => build.master.gradle} (98%) delete mode 100644 designer_form/build.release.gradle diff --git a/build.dev.gradle b/build.master.gradle similarity index 99% rename from build.dev.gradle rename to build.master.gradle index 507d77e9f5..cc3bea2327 100644 --- a/build.dev.gradle +++ b/build.master.gradle @@ -2,6 +2,7 @@ apply plugin: "java" tasks.withType(JavaCompile){ options.encoding = "UTF-8" } + def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //鑾峰彇浠涔堝垎鏀悕 diff --git a/build.release.gradle b/build.release.gradle deleted file mode 100644 index 44aacadb4d..0000000000 --- a/build.release.gradle +++ /dev/null @@ -1,85 +0,0 @@ -apply plugin: "java" -tasks.withType(JavaCompile){ - options.encoding = "UTF-8" -} -def basicDir="../../" -def libDir="${basicDir}/finereport-lib-stable/master" -//鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:"./",include:"build.*.gradle") -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) - -task appletJar<<{ - - ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") - mkdir(dir:"build/classes/") - copy(todir:"build/classes/"){ - fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") - - } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") - jar(jarfile:"build/libs/fr-applet-8.0.jar"){ - fileset(dir:"build/classes"){ - exclude(name:"*.*") - exclude(name:"bin/*.*") - exclude(name:"classes/**") - exclude(name:"com/fr/schedule/**") - exclude(name:"com/fr/cell/**") - exclude(name:"com/fr/dialog/**") - exclude(name:"com/fr/view/**") - exclude(name:"com/fr/web/**") - exclude(name:"com/fr/fs/**") - exclude(name:"com/fr/design/**") - exclude(name:"com/fr/start/**") - exclude(name:"com/fr/process/**") - } - fileset(dir:"${libDir}/tmp-${branchName}"){ - include(name:"javax/mail/**") - include(name:"javax/servlet/**") - include(name:"org/freehep/**") - include(name:"com/fr/third/JAI/**") - include(name:"com/fr/third/antlr/**") - include(name:"com/fr/third/javax/**") - include(name:"com/sun/xml/**") - include(name:"javax/xml/**") - - } - fileset(dir:"build/classes"){ - include(name:"com/fr/web/*.class") - include(name:"com/fr/web/attr/*.class") - } - } - delete(dir:"${libDir}/tmp-${branchName}") - def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" - def keystore="frapplet.store" - def keycert="fr.cert" - def keypassword="123456" - def keyalias="fr" - - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") - } - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") - } - - exec(executable:"${jdk6home}/bin/jarsigner"){ - arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") - } - delete(file:"${keystore}") - delete(file:"${keycert}") - delete(dir:"build/classes") - - } - -} \ No newline at end of file diff --git a/designer_form/build.dev.gradle b/designer_form/build.master.gradle similarity index 98% rename from designer_form/build.dev.gradle rename to designer_form/build.master.gradle index 57ebd74c2c..9c9764727c 100644 --- a/designer_form/build.dev.gradle +++ b/designer_form/build.master.gradle @@ -4,7 +4,7 @@ tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } //鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 +sourceCompatibility=1.7 //鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 version='8.0' @@ -30,6 +30,7 @@ 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/${branchName}",include:'**/*.jar') @@ -62,7 +63,6 @@ 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') } } diff --git a/designer_form/build.release.gradle b/designer_form/build.release.gradle deleted file mode 100644 index 90abcb81ee..0000000000 --- a/designer_form/build.release.gradle +++ /dev/null @@ -1,83 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.8 -//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 -version='8.0' - -def srcDir="." - - -//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 -jar{ - baseName='fr-designer-report' -} -//婧愮爜鎵鍦ㄤ綅缃 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src", -"${srcDir}/../designer/src"] - } - } -} - -//鑾峰彇浠涔堝垎鏀悕 -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/master',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} - -//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - with dataContent.call("${srcDir}/src") - with dataContent.call("${srcDir}/../designer/src") - into ('build/classes/main') - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - - } - fileset (dir:"${srcDir}/../designer/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - From 754016169085b3f57cf89781df3210cd17786c5d Mon Sep 17 00:00:00 2001 From: PanLi320 <854954082@qq.com> Date: Tue, 25 Oct 2016 17:29:37 +0800 Subject: [PATCH 118/140] =?UTF-8?q?REPORT-650=201.7jdk=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index 460f758df6..79ca8b44d5 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -99,7 +99,7 @@ public class UserInfoLabel extends UILabel{ } }); - PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this); + //PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this); QQLoginWebBridge.getHelper().setUILabelInPlugin(UserInfoLabel.this); UserLoginContext.addLoginContextListener(new LoginContextListener() { @@ -310,4 +310,4 @@ public class UserInfoLabel extends UILabel{ } } }; -} \ No newline at end of file +} From f09f1d4645d32a3cb3c9b72699bf1798e5455a2a Mon Sep 17 00:00:00 2001 From: zhouping Date: Mon, 31 Oct 2016 10:55:13 +0800 Subject: [PATCH 119/140] =?UTF-8?q?REPORT-625=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E9=AB=98=E5=BA=A6=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=8F=98=20=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=B8=8D=E8=A6=81=E7=AE=97=E4=B8=8A=E5=88=86?= =?UTF-8?q?=E8=BE=A8=E7=8E=87=E7=9A=84=E6=AF=94=E4=BE=8B=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/mainframe/FormArea.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java index 0f897f82a5..26f3b04903 100644 --- a/designer_form/src/com/fr/design/mainframe/FormArea.java +++ b/designer_form/src/com/fr/design/mainframe/FormArea.java @@ -341,8 +341,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent { if (layout.getParent() != null) { int paraHeight = designer.getParaHeight(); if (needCalculateParaHeight && paraHeight > 0) { - // 璋冩暣鍙傛暟鐣岄潰鐨勫ぇ灏 - paraHeight += (int) (paraHeight*percent) ; designer.setParaHeight(paraHeight); XWBorderLayout parent = (XWBorderLayout) layout.getParent(); parent.toData().setNorthSize(paraHeight); From fb5237b5448d687c4a8e34e3afdce327c517a528 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Mon, 31 Oct 2016 11:14:34 +0800 Subject: [PATCH 120/140] update --- designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 743cc54504..b3b04f948a 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -96,7 +96,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh } }).start(); - return child; } From f43228b807801c55cb8d6a3c33002c8488d14a67 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 31 Oct 2016 13:59:26 +0800 Subject: [PATCH 121/140] =?UTF-8?q?REPORT-419=20dev=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E8=BF=99=E5=9D=97=E4=BB=A3=E7=A0=81=E5=A5=BD=E5=83=8F=E6=B2=A1?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index bb9b886e5d..65b504d7de 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -26,6 +26,7 @@ import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; +import com.fr.env.RemoteEnv; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; @@ -264,7 +265,7 @@ public abstract class ToolBarMenuDock { ); if (!BaseUtils.isAuthorityEditing()) { - if (shouldShowPlugin()){ + if (shouldShowPlugin() && !(FRContext.getCurrentEnv() instanceof RemoteEnv)) { menuDef.addShortCut( new PluginManagerAction() ); @@ -518,6 +519,9 @@ public abstract class ToolBarMenuDock { for (MenuHandler handler : target) { int insertPosition = handler.insertPosition(menuDef.getShortCutCount()); + if (insertPosition == MenuHandler.HIDE) { + return; + } ShortCut shortCut = action.methodAction(handler); if (shortCut == null){ continue; From 2c7281d4ba2eba565743a85c1d4148b764019cbd Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 31 Oct 2016 14:26:00 +0800 Subject: [PATCH 122/140] =?UTF-8?q?REPORT-419=20dev=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E8=BF=99=E5=9D=97=E4=BB=A3=E7=A0=81=E5=A5=BD=E5=83=8F=E6=B2=A1?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 65b504d7de..4e1d1decd1 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -265,7 +265,7 @@ public abstract class ToolBarMenuDock { ); if (!BaseUtils.isAuthorityEditing()) { - if (shouldShowPlugin() && !(FRContext.getCurrentEnv() instanceof RemoteEnv)) { + if (shouldShowPlugin()) { menuDef.addShortCut( new PluginManagerAction() ); @@ -286,7 +286,7 @@ public abstract class ToolBarMenuDock { } protected boolean shouldShowPlugin() { - return FRContext.isChineseEnv() || ComparatorUtils.equals(GeneralContext.getLocale(), Locale.TAIWAN); + return !(FRContext.getCurrentEnv() instanceof RemoteEnv) && FRContext.isChineseEnv(); } /** From 52c256cbb2c3ff104b4e37efc3a17f81766e733f Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 1 Nov 2016 14:50:41 +0800 Subject: [PATCH 123/140] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95=E8=B0=83=E6=95=B4=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A4=A7=E5=B0=8F=E5=90=8Etabpane=E4=B8=AD=E5=B0=B1?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=8B=96=E5=85=A5=E5=9B=BE=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/designer/beans/models/AddingModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/designer/beans/models/AddingModel.java b/designer_form/src/com/fr/design/designer/beans/models/AddingModel.java index ee02afa655..46798f4d9a 100644 --- a/designer_form/src/com/fr/design/designer/beans/models/AddingModel.java +++ b/designer_form/src/com/fr/design/designer/beans/models/AddingModel.java @@ -124,7 +124,7 @@ public class AddingModel { Rectangle rect = ComponentUtils.getRelativeBounds(container); if(!ComparatorUtils.equals(container.getOuterLayout(), container.getBackupParent())){ - return added = container.getLayoutAdapter().addBean(creator,x,y); + return added = container.getLayoutAdapter().addBean(creator, x + designer.getArea().getHorizontalValue(), y + designer.getArea().getVerticalValue()); } return added = container.getLayoutAdapter().addBean(creator, x + designer.getArea().getHorizontalValue() - rect.x, From 0aa84fb9da06a7edd7b00c8086b3b2edc67aaacc Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 1 Nov 2016 19:02:52 +0800 Subject: [PATCH 124/140] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=20?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=A0=91=E6=98=AF=E5=90=A6=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/widget/ui/TreeEditorDefinePane.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java index f099983250..9123eabc00 100644 --- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java @@ -1,18 +1,16 @@ package com.fr.design.widget.ui; -import java.awt.BorderLayout; - -import javax.swing.BorderFactory; -import javax.swing.JPanel; - import com.fr.design.data.DataCreatorUI; +import com.fr.design.gui.frpane.TreeSettingPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itree.refreshabletree.TreeRootPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.gui.frpane.TreeSettingPane; import com.fr.form.ui.TreeEditor; import com.fr.general.Inter; +import javax.swing.*; +import java.awt.*; + /* * richer:tree editor @@ -31,12 +29,14 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane { protected void populateSubFieldEditorBean(TreeEditor e) { this.treeSettingPane.populate(e); treeRootPane.populate(e.getTreeAttr()); + this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat()); } @Override protected TreeEditor updateSubFieldEditorBean() { TreeEditor editor = treeSettingPane.updateTreeEditor(); editor.setTreeAttr(treeRootPane.update()); + editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected()); return editor; } From 752e05ecd523d904393776f1ed92ea6d5a613045 Mon Sep 17 00:00:00 2001 From: zack Date: Wed, 2 Nov 2016 09:42:58 +0800 Subject: [PATCH 125/140] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=9C=89npe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/widget/ui/TreeEditorDefinePane.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java index 9123eabc00..10210738f0 100644 --- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java @@ -29,14 +29,18 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane { protected void populateSubFieldEditorBean(TreeEditor e) { this.treeSettingPane.populate(e); treeRootPane.populate(e.getTreeAttr()); - this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat()); + if (this.removeRepeatCheckBox != null) { + this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat()); + } } @Override protected TreeEditor updateSubFieldEditorBean() { TreeEditor editor = treeSettingPane.updateTreeEditor(); editor.setTreeAttr(treeRootPane.update()); - editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected()); + if (this.removeRepeatCheckBox != null) { + editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected()); + } return editor; } From 4b1e21f01322f358b8b8fd3291d825504d3f71d4 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Nov 2016 09:44:13 +0800 Subject: [PATCH 126/140] rt --- .../src/com/fr/design/form/parameter/FormParaDesigner.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java index cfb3976ffd..44580ab8cf 100644 --- a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java @@ -232,6 +232,9 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP } ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean( p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray()); + + //鍙傛暟闈㈡澘鐙珛鍚庡彧鑳借繖杈硅Е鍙戣皟鏁撮珮搴︼紝鏍规嵁鍙傛暟涓暟璋冩暣鎹㈣锛岃绠楅珮搴 + EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); ParameterPropertyPane.getInstance().repaintContainer(); } From b05333e82147f6d8e09c52b462c5dbc173b98eb4 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 2 Nov 2016 11:32:06 +0800 Subject: [PATCH 127/140] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/ChartTypeInterfaceManager.java | 53 ++++++++++++------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index b3b04f948a..d40b43bd27 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -21,10 +21,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.module.DesignModuleFactory; import com.fr.file.XMLFileManager; import com.fr.form.ui.ChartEditor; -import com.fr.general.FRLogger; -import com.fr.general.GeneralContext; -import com.fr.general.IOUtils; -import com.fr.general.Inter; +import com.fr.general.*; import com.fr.plugin.PluginCollector; import com.fr.plugin.PluginLicenseManager; import com.fr.plugin.PluginMessage; @@ -52,7 +49,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh private static ChartTypeInterfaceManager classManager = null; private static LinkedHashMap> chartTypeInterfaces = new LinkedHashMap>(); - private static final String DEFAULT_CHART_ID = "DefaultChart"; public synchronized static ChartTypeInterfaceManager getInstance() { if (classManager == null) { @@ -150,7 +146,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh chartUIList.put(ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface()); chartUIList.put(ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface()); - chartTypeInterfaces.put(DEFAULT_CHART_ID, chartUIList); + chartTypeInterfaces.put(ChartTypeManager.DEFAULT_CHART_ID, chartUIList); } public String getIconPath(String plotID) { @@ -291,15 +287,36 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh int index = 0; + //澶勭悊vanChart + { + Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); + while (vanChartUI.hasNext()) { + Map.Entry chartUIEntry = (Map.Entry) vanChartUI.next(); + IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); + names[index++] = provider.getPlotTypePane().title4PopupWindow(); + } + } + //澶勭悊chart + { + Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); + while (chartUI.hasNext()) { + Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); + IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); + names[index++] = provider.getPlotTypePane().title4PopupWindow(); + } + } + //鍏跺畠鍥捐〃 Iterator i = chartTypeInterfaces.entrySet().iterator(); while (i.hasNext()){ Map.Entry entry = (Map.Entry) i.next(); String chartID = (String) entry.getKey(); - Iterator chartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); - while (chartUI.hasNext()){ - Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); - IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); - names[index++] = provider.getPlotTypePane().title4PopupWindow(); + if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) { + Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); + while (otherChartUI.hasNext()) { + Map.Entry chartUIEntry = (Map.Entry) otherChartUI.next(); + IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); + names[index++] = provider.getPlotTypePane().title4PopupWindow(); + } } } return names; @@ -317,7 +334,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getChartDataPane(chartID, plotID, listener); } } - return getChartDataPane(DEFAULT_CHART_ID, plotID, listener); + return getChartDataPane(ChartTypeManager.DEFAULT_CHART_ID, plotID, listener); } private ChartDataPane getChartDataPane(String chartID, String plotID, AttributeChangeListener listener) { @@ -345,7 +362,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getAttrPaneArray(chartID, plotID, listener); } } - return getAttrPaneArray(DEFAULT_CHART_ID, plotID, listener); + return getAttrPaneArray(ChartTypeManager.DEFAULT_CHART_ID, plotID, listener); } private AbstractChartAttrPane[] getAttrPaneArray(String chartID, String plotID, AttributeChangeListener listener) { @@ -361,7 +378,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getTableDataSourcePane(chartID, plot, parent); } } - return getTableDataSourcePane(DEFAULT_CHART_ID, plot, parent); + return getTableDataSourcePane(ChartTypeManager.DEFAULT_CHART_ID, plot, parent); } private AbstractTableDataContentPane getTableDataSourcePane(String chartID, Plot plot, ChartDataPane parent) { @@ -379,7 +396,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getReportDataSourcePane(chartID, plot, parent); } } - return getReportDataSourcePane(DEFAULT_CHART_ID, plot, parent); + return getReportDataSourcePane(ChartTypeManager.DEFAULT_CHART_ID, plot, parent); } private boolean plotInChart(String plotID, String chartID) { @@ -402,7 +419,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getPlotConditionPane(chartID, plot); } } - return getPlotConditionPane(DEFAULT_CHART_ID, plot); + return getPlotConditionPane(ChartTypeManager.DEFAULT_CHART_ID, plot); } private ConditionAttributesPane getPlotConditionPane(String chartID, Plot plot) { @@ -419,7 +436,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getPlotSeriesPane(chartID, parent, plot); } } - return getPlotSeriesPane(DEFAULT_CHART_ID, parent, plot); + return getPlotSeriesPane(ChartTypeManager.DEFAULT_CHART_ID, parent, plot); } private BasicBeanPane getPlotSeriesPane(String chartID, ChartStylePane parent, Plot plot) { @@ -466,7 +483,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh extraChartDesignInterfaceList.add(tagName); } if (IndependentChartUIProvider.XML_TAG.equals(tagName)) { - addChartInterface(reader.getAttrAsString("class", ""), reader.getAttrAsString("chartID", DEFAULT_CHART_ID),reader.getAttrAsString("plotID", ""), simplify); + addChartInterface(reader.getAttrAsString("class", ""), reader.getAttrAsString("chartID", ChartTypeManager.DEFAULT_CHART_ID),reader.getAttrAsString("plotID", ""), simplify); } } } From 0f67a73d231126c295fc0eec24933bdc7f12038e Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 2 Nov 2016 11:48:59 +0800 Subject: [PATCH 128/140] update --- .../fr/design/ChartTypeInterfaceManager.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index d40b43bd27..eaa8625302 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -290,20 +290,12 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh //澶勭悊vanChart { Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); - while (vanChartUI.hasNext()) { - Map.Entry chartUIEntry = (Map.Entry) vanChartUI.next(); - IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); - names[index++] = provider.getPlotTypePane().title4PopupWindow(); - } + fetchNames(vanChartUI, names, index++); } //澶勭悊chart { Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); - while (chartUI.hasNext()) { - Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); - IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); - names[index++] = provider.getPlotTypePane().title4PopupWindow(); - } + fetchNames(chartUI, names, index++); } //鍏跺畠鍥捐〃 Iterator i = chartTypeInterfaces.entrySet().iterator(); @@ -312,11 +304,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh String chartID = (String) entry.getKey(); if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) { Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); - while (otherChartUI.hasNext()) { - Map.Entry chartUIEntry = (Map.Entry) otherChartUI.next(); - IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); - names[index++] = provider.getPlotTypePane().title4PopupWindow(); - } + fetchNames(otherChartUI, names, index++); } } return names; @@ -325,6 +313,14 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return new String[0]; } + private void fetchNames(Iterator chartUI, String[] names, int index) { + while (chartUI.hasNext()) { + Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); + IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); + names[index] = provider.getPlotTypePane().title4PopupWindow(); + } + } + public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) { Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ From fadf534930ba580e6f6467b1827d85252d610934 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 2 Nov 2016 11:54:40 +0800 Subject: [PATCH 129/140] update --- .../fr/design/ChartTypeInterfaceManager.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index eaa8625302..51d03ab3dc 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -288,15 +288,11 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh int index = 0; //澶勭悊vanChart - { - Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); - fetchNames(vanChartUI, names, index++); - } + Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); + index = fetchNames(vanChartUI, names, index); //澶勭悊chart - { - Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); - fetchNames(chartUI, names, index++); - } + Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); + index = fetchNames(chartUI, names, index); //鍏跺畠鍥捐〃 Iterator i = chartTypeInterfaces.entrySet().iterator(); while (i.hasNext()){ @@ -304,7 +300,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh String chartID = (String) entry.getKey(); if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) { Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); - fetchNames(otherChartUI, names, index++); + index = fetchNames(otherChartUI, names, index); } } return names; @@ -313,12 +309,13 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return new String[0]; } - private void fetchNames(Iterator chartUI, String[] names, int index) { + private int fetchNames(Iterator chartUI, String[] names, int index) { while (chartUI.hasNext()) { Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); - names[index] = provider.getPlotTypePane().title4PopupWindow(); + names[index++] = provider.getPlotTypePane().title4PopupWindow(); } + return index; } public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) { From dc464a7d677b1ebe29e4e51baab78cd7c3a7affd Mon Sep 17 00:00:00 2001 From: fr_shine Date: Wed, 2 Nov 2016 15:13:13 +0800 Subject: [PATCH 130/140] =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E6=8C=89id=E7=9C=8B=E6=98=AF=E5=90=A6=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=8C=89index=E3=80=82=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=87=E6=8D=A2plotlist=E4=BC=9A=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/icombobox/FRTreeComboBox.java | 12 +++++++++++- .../fr/design/mainframe/chart/gui/ChartTypePane.java | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java b/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java index 3ddec17d25..a609422292 100644 --- a/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java +++ b/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java @@ -247,7 +247,17 @@ public class FRTreeComboBox extends UIComboBox { } @Override protected UIButton createArrowButton() { - arrowButton = new UIButton(UIConstants.ARROW_DOWN_ICON); + arrowButton = new UIButton(UIConstants.ARROW_DOWN_ICON){ + /** + * 缁勪欢鏄惁闇瑕佸搷搴旀坊鍔犵殑瑙傚療鑰呬簨浠 + * + * @return 濡傛灉闇瑕佸搷搴旇瀵熻呬簨浠跺垯杩斿洖true锛屽惁鍒欒繑鍥瀎alse + */ + @Override + public boolean shouldResponseChangeListener() { + return false; + } + }; ((UIButton) arrowButton).setRoundBorder(true, Constants.LEFT); arrowButton.addMouseListener(this); comboBox.addMouseListener(this); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index 78f3f62712..c6d42386b0 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -129,7 +129,9 @@ public class ChartTypePane extends AbstractChartAttrPane{ } public void updateBean(Chart chart) { - int lastSelectIndex = editPane.getSelectedChartIndex(chart); + + Plot oldPlot = chart.getPlot(); + String lastPlotID = oldPlot == null ? StringUtils.EMPTY : oldPlot.getPlotID(); try{ Chart newDefaultChart = (Chart)((AbstractChartTypePane)getSelectedPane()).getDefaultChart().clone(); @@ -159,7 +161,7 @@ public class ChartTypePane extends AbstractChartAttrPane{ boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID); - if(editPane.isDefaultPane() != isUseDefault || (!isUseDefault && lastSelectIndex != jcb.getSelectedIndex())){ + if(editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){ editPane.reLayout(chart); } } From 08ba6060241ebb8ec41fbcee67d7ad7ee5005222 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 2 Nov 2016 17:27:59 +0800 Subject: [PATCH 131/140] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/ChartTypeInterfaceManager.java | 183 +++++++++--------- .../mainframe/chart/gui/ChartTypePane.java | 4 +- 2 files changed, 91 insertions(+), 96 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 51d03ab3dc..873a967501 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -54,6 +54,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh if (classManager == null) { classManager = new ChartTypeInterfaceManager(); chartTypeInterfaces.clear(); + classManager.readDefault(); } return classManager; } @@ -70,9 +71,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh GeneralContext.addPluginReadListener(new PluginReadListener() { @Override public void success() { - if (chartTypeInterfaces.size() == 0) { - ChartTypeInterfaceManager.getInstance().readDefault(); - } //閲嶆柊娉ㄥ唽designModuleFactory DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption()); } @@ -127,6 +125,9 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh } private static void readDefault() { + if (chartTypeInterfaces.containsKey(ChartTypeManager.CHART_PRIORITY)){ + return; + } LinkedHashMap chartUIList = new LinkedHashMap(); chartUIList.put(ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface()); chartUIList.put(ChartConstants.LINE_CHART, new LineIndependentChartInterface()); @@ -146,7 +147,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh chartUIList.put(ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface()); chartUIList.put(ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface()); - chartTypeInterfaces.put(ChartTypeManager.DEFAULT_CHART_ID, chartUIList); + chartTypeInterfaces.put(ChartTypeManager.CHART_PRIORITY, chartUIList); } public String getIconPath(String plotID) { @@ -154,8 +155,8 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - String imagePath = getIconPath(chartID, plotID); + String priority = (String) entry.getKey(); + String imagePath = getIconPath(priority, plotID); if (!StringUtils.isEmpty(imagePath)) { return imagePath; } @@ -164,23 +165,23 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return StringUtils.EMPTY; } - private String getIconPath(String chartID, String plotID) { - if (chartTypeInterfaces.get(chartID) != null && chartTypeInterfaces.get(chartID).get(plotID) != null) { - return chartTypeInterfaces.get(chartID).get(plotID).getIconPath(); + private String getIconPath(String priority, String plotID) { + if (chartTypeInterfaces.get(priority) != null && chartTypeInterfaces.get(priority).get(plotID) != null) { + return chartTypeInterfaces.get(priority).get(plotID).getIconPath(); }else { return StringUtils.EMPTY; } } - public static void addChartTypeInterface(IndependentChartUIProvider provider, String chartID, String plotID) { + public static void addChartTypeInterface(IndependentChartUIProvider provider, String priority, String plotID) { if (chartTypeInterfaces != null){ - if (!chartTypeInterfaces.containsKey(chartID)){ + if (!chartTypeInterfaces.containsKey(priority)){ //鏂板缓涓涓叿浣撳浘琛ㄥ垪琛 LinkedHashMap chartUIList = new LinkedHashMap(); chartUIList.put(plotID, provider); - chartTypeInterfaces.put(chartID, chartUIList); + chartTypeInterfaces.put(priority, chartUIList); }else { - LinkedHashMap chartUIList = chartTypeInterfaces.get(chartID); + LinkedHashMap chartUIList = chartTypeInterfaces.get(priority); if (!chartUIList.containsKey(plotID)) { chartUIList.put(plotID, provider); } @@ -194,7 +195,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh * @param className 绫诲悕 * @param plotID 鏍囧織ID */ - public void addChartInterface(String className, String chartID, String plotID, PluginSimplify simplify) { + public void addChartInterface(String className, String priority, String plotID, PluginSimplify simplify) { if (StringUtils.isNotBlank(className)) { try { Class clazz = Class.forName(className); @@ -206,7 +207,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh if (PluginCollector.getCollector().isError(provider, IndependentChartUIProvider.CURRENT_API_LEVEL, simplify.getPluginName()) || !containsChart(plotID)) { PluginMessage.remindUpdate(className); } else { - ChartTypeInterfaceManager.getInstance().addChartTypeInterface(provider, chartID, plotID); + ChartTypeInterfaceManager.getInstance().addChartTypeInterface(provider, priority, plotID); } } catch (ClassNotFoundException e) { FRLogger.getLogger().error("class not found:" + e.getMessage()); @@ -230,8 +231,8 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - Iterator chartUIIterator = chartTypeInterfaces.get(chartID).entrySet().iterator(); + String priority = (String) entry.getKey(); + Iterator chartUIIterator = chartTypeInterfaces.get(priority).entrySet().iterator(); while (chartUIIterator.hasNext()) { Map.Entry chartUIEntry = (Map.Entry) chartUIIterator.next(); IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); @@ -240,13 +241,13 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh } } - public String[] getTitle4PopupWindow(String chartID){ - if (chartID.isEmpty()){ + public String[] getTitle4PopupWindow(String priority){ + if (priority.isEmpty()){ return getTitle4PopupWindow(); } - String[] names = new String[getChartSize(chartID)]; - if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(chartID)){ - HashMap chartUIList = chartTypeInterfaces.get(chartID); + String[] names = new String[getChartSize(priority)]; + if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority)){ + HashMap chartUIList = chartTypeInterfaces.get(priority); Iterator iterator = chartUIList.entrySet().iterator(); int i = 0; while (iterator.hasNext()){ @@ -261,13 +262,13 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh /** * 鑾峰彇鎸囧畾鍥捐〃鐨勬爣棰 - * @param chartID + * @param priority * @return */ - public String getTitle4PopupWindow(String chartID, String plotID){ - if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(chartID) && chartTypeInterfaces.get(chartID).containsKey(plotID)){ - HashMap chartUIList = chartTypeInterfaces.get(chartID); - IndependentChartUIProvider provider = chartTypeInterfaces.get(chartID).get(plotID); + public String getTitle4PopupWindow(String priority, String plotID){ + if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)){ + HashMap chartUIList = chartTypeInterfaces.get(priority); + IndependentChartUIProvider provider = chartTypeInterfaces.get(priority).get(plotID); return provider.getPlotTypePane().title4PopupWindow(); } @@ -275,34 +276,28 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh } private String[] getTitle4PopupWindow(){ + List priorityList = new ArrayList(); int size = 0; if (chartTypeInterfaces != null){ Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - size += getChartSize(chartID); + String priority = (String) entry.getKey(); + priorityList.add(Integer.valueOf(priority)); + size += getChartSize(priority); } String[] names = new String[size]; + priorityList = ChartTypeManager.orderInPriority(priorityList); + int index = 0; - //澶勭悊vanChart - Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); - index = fetchNames(vanChartUI, names, index); - //澶勭悊chart - Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); - index = fetchNames(chartUI, names, index); - //鍏跺畠鍥捐〃 - Iterator i = chartTypeInterfaces.entrySet().iterator(); - while (i.hasNext()){ - Map.Entry entry = (Map.Entry) i.next(); - String chartID = (String) entry.getKey(); - if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) { - Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); - index = fetchNames(otherChartUI, names, index); - } + for (int i = 0; i < priorityList.size(); i++){ + String priority = String.valueOf(priorityList.get(i)); + Iterator chartUI = chartTypeInterfaces.get(priority).entrySet().iterator(); + index = fetchNames(chartUI, names, index); } + return names; } @@ -322,26 +317,26 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - if (plotInChart(plotID, chartID)) { - return getChartDataPane(chartID, plotID, listener); + String priority = (String) entry.getKey(); + if (plotInChart(plotID, priority)) { + return getChartDataPane(priority, plotID, listener); } } - return getChartDataPane(ChartTypeManager.DEFAULT_CHART_ID, plotID, listener); + return getChartDataPane(ChartTypeManager.CHART_PRIORITY, plotID, listener); } - private ChartDataPane getChartDataPane(String chartID, String plotID, AttributeChangeListener listener) { - return chartTypeInterfaces.get(chartID).get(plotID).getChartDataPane(listener); + private ChartDataPane getChartDataPane(String priority, String plotID, AttributeChangeListener listener) { + return chartTypeInterfaces.get(priority).get(plotID).getChartDataPane(listener); } /** * 鑾峰彇瀵瑰簲ID鐨勫浘琛ㄦ暟閲 - * @param chartID + * @param key * @return */ - private int getChartSize(String chartID){ - if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(chartID)){ - return chartTypeInterfaces.get(chartID).size(); + private int getChartSize(String key){ + if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(key)){ + return chartTypeInterfaces.get(key).size(); } return 0; } @@ -350,32 +345,32 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - if (plotInChart(plotID, chartID)) { - return getAttrPaneArray(chartID, plotID, listener); + String priority = (String) entry.getKey(); + if (plotInChart(plotID, priority)) { + return getAttrPaneArray(priority, plotID, listener); } } - return getAttrPaneArray(ChartTypeManager.DEFAULT_CHART_ID, plotID, listener); + return getAttrPaneArray(ChartTypeManager.CHART_PRIORITY, plotID, listener); } - private AbstractChartAttrPane[] getAttrPaneArray(String chartID, String plotID, AttributeChangeListener listener) { - return chartTypeInterfaces.get(chartID).get(plotID).getAttrPaneArray(listener); + private AbstractChartAttrPane[] getAttrPaneArray(String priority, String plotID, AttributeChangeListener listener) { + return chartTypeInterfaces.get(priority).get(plotID).getAttrPaneArray(listener); } public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - if (plotInChart(plot.getPlotID(), chartID)) { - return getTableDataSourcePane(chartID, plot, parent); + String priority = (String) entry.getKey(); + if (plotInChart(plot.getPlotID(), priority)) { + return getTableDataSourcePane(priority, plot, parent); } } - return getTableDataSourcePane(ChartTypeManager.DEFAULT_CHART_ID, plot, parent); + return getTableDataSourcePane(ChartTypeManager.CHART_PRIORITY, plot, parent); } - private AbstractTableDataContentPane getTableDataSourcePane(String chartID, Plot plot, ChartDataPane parent) { - return chartTypeInterfaces.get(chartID).get(plot.getPlotID()).getTableDataSourcePane(plot, parent); + private AbstractTableDataContentPane getTableDataSourcePane(String priority, Plot plot, ChartDataPane parent) { + return chartTypeInterfaces.get(priority).get(plot.getPlotID()).getTableDataSourcePane(plot, parent); } @@ -383,23 +378,23 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); + String priority = (String) entry.getKey(); String plotID = plot.getPlotID(); - if (plotInChart(plotID, chartID)) { - return getReportDataSourcePane(chartID, plot, parent); + if (plotInChart(plotID, priority)) { + return getReportDataSourcePane(priority, plot, parent); } } - return getReportDataSourcePane(ChartTypeManager.DEFAULT_CHART_ID, plot, parent); + return getReportDataSourcePane(ChartTypeManager.CHART_PRIORITY, plot, parent); } - private boolean plotInChart(String plotID, String chartID) { + private boolean plotInChart(String plotID, String priority) { return chartTypeInterfaces != null - && chartTypeInterfaces.containsKey(chartID) - && chartTypeInterfaces.get(chartID).containsKey(plotID); + && chartTypeInterfaces.containsKey(priority) + && chartTypeInterfaces.get(priority).containsKey(plotID); } - private AbstractReportDataContentPane getReportDataSourcePane(String chartID, Plot plot, ChartDataPane parent) { - return chartTypeInterfaces.get(chartID).get(plot.getPlotID()).getReportDataSourcePane(plot, parent); + private AbstractReportDataContentPane getReportDataSourcePane(String priority, Plot plot, ChartDataPane parent) { + return chartTypeInterfaces.get(priority).get(plot.getPlotID()).getReportDataSourcePane(plot, parent); } @@ -407,16 +402,16 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - if (plotInChart(plot.getPlotID(), chartID)) { - return getPlotConditionPane(chartID, plot); + String priority = (String) entry.getKey(); + if (plotInChart(plot.getPlotID(), priority)) { + return getPlotConditionPane(priority, plot); } } - return getPlotConditionPane(ChartTypeManager.DEFAULT_CHART_ID, plot); + return getPlotConditionPane(ChartTypeManager.CHART_PRIORITY, plot); } - private ConditionAttributesPane getPlotConditionPane(String chartID, Plot plot) { - return chartTypeInterfaces.get(chartID).get(plot.getPlotID()).getPlotConditionPane(plot); + private ConditionAttributesPane getPlotConditionPane(String priority, Plot plot) { + return chartTypeInterfaces.get(priority).get(plot.getPlotID()).getPlotConditionPane(plot); } @@ -424,16 +419,16 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - if (plotInChart(plot.getPlotID(), chartID)) { - return getPlotSeriesPane(chartID, parent, plot); + String priority = (String) entry.getKey(); + if (plotInChart(plot.getPlotID(), priority)) { + return getPlotSeriesPane(priority, parent, plot); } } - return getPlotSeriesPane(ChartTypeManager.DEFAULT_CHART_ID, parent, plot); + return getPlotSeriesPane(ChartTypeManager.CHART_PRIORITY, parent, plot); } - private BasicBeanPane getPlotSeriesPane(String chartID, ChartStylePane parent, Plot plot) { - return chartTypeInterfaces.get(chartID).get(plot.getPlotID()).getPlotSeriesPane(parent, plot); + private BasicBeanPane getPlotSeriesPane(String priority, ChartStylePane parent, Plot plot) { + return chartTypeInterfaces.get(priority).get(plot.getPlotID()).getPlotSeriesPane(parent, plot); } /** @@ -446,19 +441,19 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry entry = (Map.Entry) iterator.next(); - String chartID = (String) entry.getKey(); - if (chartTypeInterfaces.get(chartID).containsKey(plotID)){ - return isUseDefaultPane(chartID, plotID); + String priority = (String) entry.getKey(); + if (chartTypeInterfaces.get(priority).containsKey(plotID)){ + return isUseDefaultPane(priority, plotID); } } return true; } - private boolean isUseDefaultPane(String chartID, String plotID){ + private boolean isUseDefaultPane(String priority, String plotID){ - if (chartTypeInterfaces.containsKey(chartID) && chartTypeInterfaces.get(chartID).containsKey(plotID)) { - return chartTypeInterfaces.get(chartID).get(plotID).isUseDefaultPane(); + if (chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)) { + return chartTypeInterfaces.get(priority).get(plotID).isUseDefaultPane(); } return true; @@ -476,7 +471,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh extraChartDesignInterfaceList.add(tagName); } if (IndependentChartUIProvider.XML_TAG.equals(tagName)) { - addChartInterface(reader.getAttrAsString("class", ""), reader.getAttrAsString("chartID", ChartTypeManager.DEFAULT_CHART_ID),reader.getAttrAsString("plotID", ""), simplify); + addChartInterface(reader.getAttrAsString("class", ""), reader.getAttrAsString("priority", ChartTypeManager.CHART_PRIORITY),reader.getAttrAsString("plotID", ""), simplify); } } } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index 78f3f62712..229206f4dd 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -188,7 +188,7 @@ public class ChartTypePane extends AbstractChartAttrPane{ public void reactor(ChartCollection collection){ //閲嶆瀯闇瑕侀噸鏋勪笅鎷夋閫夐」鍜宑ardNames Chart chart = collection.getSelectedChart(); - String chartID = chart.getChartID(); + String chartID = chart.getPriority(); if (collection.getState() == SwitchState.DEFAULT){ chartID = StringUtils.EMPTY; } @@ -197,7 +197,7 @@ public class ChartTypePane extends AbstractChartAttrPane{ //閲嶆瀯涓嬫媺妗嗛夐」 reactorComboBox(); //閲嶆柊閫夋嫨閫変腑鐨勪笅鎷夐」 - chartID = chart.getChartID(); + chartID = chart.getPriority(); String plotID = chart.getPlot().getPlotID(); Object item = ChartTypeInterfaceManager.getInstance().getTitle4PopupWindow(chartID, plotID); jcb.setSelectedItem(item); From 0998bf995e4a1833df29504dbbfa8cf55a87ad53 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Nov 2016 19:50:23 +0800 Subject: [PATCH 132/140] rt --- .../design/form/parameter/FormParaDesigner.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java index 44580ab8cf..c52eb8ea47 100644 --- a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java @@ -79,6 +79,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP private static final int SECOND_H_LOCATION = 170; private static final int ADD_HEIGHT = 20; private static final int H_GAP = 105; + private static int paraCount; private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png"); @@ -114,8 +115,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP if (!BaseUtils.isAuthorityEditing()) { EastRegionContainerPane.getInstance().replaceUpPane( WidgetPropertyPane.getInstance(this)); - EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this)); - refreshParameter(); } else { showAuthorityEditPane(); } @@ -233,9 +232,16 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean( p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray()); - //鍙傛暟闈㈡澘鐙珛鍚庡彧鑳借繖杈硅Е鍙戣皟鏁撮珮搴︼紝鏍规嵁鍙傛暟涓暟璋冩暣鎹㈣锛岃绠楅珮搴 - EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); - ParameterPropertyPane.getInstance().repaintContainer(); + EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this)); + if (p.getParameterArray().length == 0) { + EastRegionContainerPane.getInstance().setParameterHeight(30); + } else { + //鍙傛暟闈㈡澘鐙珛鍚庡彧鑳借繖杈硅Е鍙戣皟鏁撮珮搴︼紝鏍规嵁鍙傛暟涓暟璋冩暣鎹㈣锛岃绠楅珮搴 + EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); + } + System.out.print("1"); + + //ParameterPropertyPane.getInstance().repaintContainer(); } /** From 865d923177dbaed541f5c21a3815798920e4a20d Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Nov 2016 19:51:41 +0800 Subject: [PATCH 133/140] rt --- .../src/com/fr/design/form/parameter/FormParaDesigner.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java index c52eb8ea47..c97e0b7235 100644 --- a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java @@ -79,7 +79,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP private static final int SECOND_H_LOCATION = 170; private static final int ADD_HEIGHT = 20; private static final int H_GAP = 105; - private static int paraCount; private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png"); @@ -239,9 +238,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP //鍙傛暟闈㈡澘鐙珛鍚庡彧鑳借繖杈硅Е鍙戣皟鏁撮珮搴︼紝鏍规嵁鍙傛暟涓暟璋冩暣鎹㈣锛岃绠楅珮搴 EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); } - System.out.print("1"); - - //ParameterPropertyPane.getInstance().repaintContainer(); } /** From bc9e4fd235d715a035930cb3c5c1649a98250881 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Thu, 3 Nov 2016 09:20:39 +0800 Subject: [PATCH 134/140] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=BB=E5=B9=B2?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A0=91=E6=9E=81=E9=80=9F?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/frpane/TreeSettingPane.java | 187 +++++++----------- 1 file changed, 74 insertions(+), 113 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java index 8bf384b313..f0a94f3050 100644 --- a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java +++ b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java @@ -1,52 +1,44 @@ package com.fr.design.gui.frpane; +import java.awt.BorderLayout; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; + +import com.fr.data.impl.TreeNodeWrapper; +import com.fr.design.data.DataCreatorUI; +import com.fr.design.gui.ilable.UILabel; + +import javax.swing.*; + +import com.fr.general.NameObject; import com.fr.data.impl.TableDataDictionary; import com.fr.data.impl.TreeAttr; import com.fr.data.impl.TreeNodeAttr; -import com.fr.data.impl.TreeNodeWrapper; -import com.fr.design.data.DataCreatorUI; -import com.fr.design.dialog.BasicPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; -import com.fr.design.gui.frpane.tree.layer.config.LayerDataControlPane; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.refreshabletree.TreeDataCardPane; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.dialog.BasicPane; import com.fr.form.ui.TreeComboBoxEditor; import com.fr.form.ui.TreeEditor; -import com.fr.form.ui.tree.LayerConfig; import com.fr.general.Inter; -import com.fr.general.NameObject; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; public class TreeSettingPane extends BasicPane implements DataCreatorUI { private JTreeControlPane controlPane; - private JTreeAutoBuildPane autoBuildPane; - - /** - * 鏂扮殑鍒嗗眰鏋勫缓鏂瑰紡 - */ - private LayerDataControlPane layerDataControlPane; - private UIComboBox buildBox; - /** - * - */ - private static final long serialVersionUID = 1762889323082827111L; + * + */ + private static final long serialVersionUID = 1762889323082827111L; - private String[] buildWay = new String[]{Inter.getLocText("FR-Designer_DataTable-Build"), - Inter.getLocText("FR-Designer_Auto-Build"), Inter.getLocText("FR-Designer_Layer-Build")}; + private String[] buildWay = new String[] { Inter.getLocText("FR-Designer_Layer-Build"), + Inter.getLocText("FR-Designer_Auto-Build") }; public TreeSettingPane(boolean isEditor) { this.initComponents(isEditor); - } + } private void initComponents(boolean isEditor) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -55,60 +47,44 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { buildWayPanel.add(buildWayLabel); buildBox = new UIComboBox(buildWay); buildBox.addItemListener(new ItemListener() { - + @Override public void itemStateChanged(ItemEvent e) { cardChanged(buildBox.getSelectedIndex()); } }); buildWayPanel.add(buildBox); - + controlPane = new JTreeControlPane(new NameableCreator[] { treeNode }, - new TreeDataCardPane(), isEditor); + new TreeDataCardPane(), isEditor); autoBuildPane = new JTreeAutoBuildPane(); - layerDataControlPane = new LayerDataControlPane(); - this.add(buildWayPanel, BorderLayout.NORTH); - cardChanged(0); - } + this.add(buildWayPanel, BorderLayout.NORTH); + cardChanged(0); + } private void cardChanged(int index) { - this.remove(controlPane); this.remove(autoBuildPane); - this.remove(layerDataControlPane); - switch (index) { - case 0: - this.add(layerDataControlPane); - break; - case 1: - this.add(autoBuildPane); - break; - case 2: - this.add(controlPane); - - break; - default: - break; - } - validate(); - repaint(); - revalidate(); - } + this.add(index == 0 ? controlPane : autoBuildPane, BorderLayout.CENTER); + validate(); + repaint(); + revalidate(); + } @Override protected String title4PopupWindow() { return Inter.getLocText("FR-Designer_Create_Tree"); } - @Override - public JComponent toSwingComponent() { - return this; - } + @Override + public JComponent toSwingComponent() { + return this; + } - NameableCreator treeNode = new NameObjectCreator( - Inter.getLocText("FR-Designer_Gradation"), - "/com/fr/design/images/data/source/jdbcTableData.png", - TreeNodeAttr.class); + NameableCreator treeNode = new NameObjectCreator( + Inter.getLocText("FR-Designer_Gradation"), + "/com/fr/design/images/data/source/jdbcTableData.png", + TreeNodeAttr.class); /** * @@ -125,19 +101,10 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { buildBox.setSelectedIndex(1); TableDataDictionary dictionary = treeEditor.getDictionary(); autoBuildPane.populate(dictionary); - } else if (treeEditor.isLayerBuild()) { - buildBox.setSelectedIndex(0); - java.util.List layerConfigList = treeEditor.getLayerConfigs(); - LayerConfig[] layerConfigs = new LayerConfig[layerConfigList.size()]; - int i = 0; - for (LayerConfig layerConfig : layerConfigList) { - layerConfigs[i++] = layerConfig; - } - this.layerDataControlPane.populate(new NameObject("tree", layerConfigs)); - } else { - buildBox.setSelectedIndex(2); - } - } + } else { + buildBox.setSelectedIndex(0); + } + } /** * 瑙嗗浘鏍戠殑update @@ -156,46 +123,43 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { te.setAutoBuild(true); te.setDictionary(dictionary); te.setNodeOrDict(dictionary); - } else if (buildBox.getSelectedIndex() == 2) { + } else { te.setAutoBuild(false); NameObject no = this.controlPane.update(); if (no != null) { TreeEditor editor = (TreeEditor) no.getObject(); - te.setAllowBlank(editor.isAllowBlank()); - te.setEnabled(editor.isEnabled()); - te.setDirectEdit(editor.isDirectEdit()); - te.setErrorMessage(editor.getErrorMessage()); - te.setWidgetName(editor.getWidgetName()); - te.setVisible(editor.isVisible()); - te.setWaterMark(editor.getWaterMark()); - te.setRemoveRepeat(editor.isRemoveRepeat()); - te.setTreeAttr(editor.getTreeAttr()); - te.setTreeNodeAttr(editor.getTreeNodeAttr()); - te.setNodeOrDict(editor.getTreeNodeAttr()); - te.setPerformanceFirst(editor.isPerformanceFirst()); - } - } - return te; - } + te.setAllowBlank(editor.isAllowBlank()); + te.setEnabled(editor.isEnabled()); + te.setDirectEdit(editor.isDirectEdit()); + te.setErrorMessage(editor.getErrorMessage()); + te.setWidgetName(editor.getWidgetName()); + te.setVisible(editor.isVisible()); + te.setWaterMark(editor.getWaterMark()); + te.setRemoveRepeat(editor.isRemoveRepeat()); + te.setTreeAttr(editor.getTreeAttr()); + te.setTreeNodeAttr(editor.getTreeNodeAttr()); + te.setNodeOrDict(editor.getTreeNodeAttr()); + te.setPerformanceFirst(editor.isPerformanceFirst()); + } + } + return te; + } /** * 鏍戣妭鐐瑰睘鎬х殑update * @return */ public Object updateTreeNodeAttrs() { - - if (buildBox.getSelectedIndex() == 2) { - NameObject no = controlPane.update(); - if (no != null) { - return no.getObject(); + if(buildBox.getSelectedIndex() == 0) { + NameObject no = controlPane.update(); + if (no != null) { + return no.getObject(); } - } else if (buildBox.getSelectedIndex() == 0) { - return layerDataControlPane.update(); - } else { - return autoBuildPane.update(); - } - return null; - } + } else { + return autoBuildPane.update(); + } + return null; + } /** * 涓嬫媺鏍戠殑update @@ -208,7 +172,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { tcb.setAutoBuild(true); tcb.setDictionary(dictionary); tcb.setNodeOrDict(dictionary); - } else if (buildBox.getSelectedIndex() == 2) { + } else { tcb.setAutoBuild(false); NameObject no = this.controlPane.update(); if (no != null) { @@ -240,15 +204,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { */ public void populate(Object nodeOrDict) { if(nodeOrDict instanceof TreeNodeAttr[] || nodeOrDict instanceof TreeNodeWrapper) { - buildBox.setSelectedIndex(2); - NameObject no = new NameObject("name", nodeOrDict); - controlPane.populate(no); - } else if(nodeOrDict instanceof TableDataDictionary) { + buildBox.setSelectedIndex(0); + NameObject no = new NameObject("name", nodeOrDict); + controlPane.populate(no); + } else if(nodeOrDict instanceof TableDataDictionary) { buildBox.setSelectedIndex(1); autoBuildPane.populate((TableDataDictionary)nodeOrDict); - } else if (nodeOrDict instanceof NameObject) { - buildBox.setSelectedIndex(0); - layerDataControlPane.populate((NameObject) nodeOrDict); - } - } + } + } } \ No newline at end of file From 9af3093423d54454f167128a0646fb1033c0e6ef Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 3 Nov 2016 15:45:36 +0800 Subject: [PATCH 135/140] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=B1=E4=BA=AB=E7=9A=84=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=94=B9=E8=BF=9B=E5=92=8C=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E7=9A=84bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/HelpDialogHandler.java | 13 +++ .../design/mainframe/HelpDialogManager.java | 44 +++++++++ .../fr/design/mainframe/UndoStateEdit.java | 1 + .../design/designer/creator/XChartEditor.java | 7 +- .../design/designer/creator/XElementCase.java | 13 ++- .../com/fr/design/mainframe/CoverPane.java | 97 +++++++++++++++++++ .../fr/design/mainframe/CoverReportPane.java | 54 ++++------- .../mainframe/EditingMouseListener.java | 17 +++- 8 files changed, 195 insertions(+), 51 deletions(-) create mode 100644 designer_base/src/com/fr/design/mainframe/HelpDialogHandler.java create mode 100644 designer_base/src/com/fr/design/mainframe/HelpDialogManager.java create mode 100644 designer_form/src/com/fr/design/mainframe/CoverPane.java diff --git a/designer_base/src/com/fr/design/mainframe/HelpDialogHandler.java b/designer_base/src/com/fr/design/mainframe/HelpDialogHandler.java new file mode 100644 index 0000000000..dec93e6588 --- /dev/null +++ b/designer_base/src/com/fr/design/mainframe/HelpDialogHandler.java @@ -0,0 +1,13 @@ +package com.fr.design.mainframe; + +/** + * Coder: zack + * Date: 2016/11/3 + * Time: 10:43 + */ +public interface HelpDialogHandler { + /** + * 閿姣 + */ + void destroyHelpDialog(); +} diff --git a/designer_base/src/com/fr/design/mainframe/HelpDialogManager.java b/designer_base/src/com/fr/design/mainframe/HelpDialogManager.java new file mode 100644 index 0000000000..9cae023ea7 --- /dev/null +++ b/designer_base/src/com/fr/design/mainframe/HelpDialogManager.java @@ -0,0 +1,44 @@ +package com.fr.design.mainframe; + +/** + * 甯姪淇℃伅鐨勯潰鏉跨敱浜庨渶瑕佹粴鍔ㄦ潯鎵浠ラ噰鐢ㄤ簡寰堟尗鐨刣ialog鍋氾紝dialog寰堝鎯呭喌涓嬩笉鑳戒富鍔ㄥ叧闂紝杩欒竟鎺у埗涓涓 + * Coder: zack + * Date: 2016/11/2 + * Time: 16:34 + */ +public class HelpDialogManager { + private static HelpDialogManager THIS; + private HelpDialogHandler handler; + + private HelpDialogManager() { + + } + + public HelpDialogHandler getPane() { + return handler; + } + + public void setPane(HelpDialogHandler dialog) { + if (dialog == this.handler) { + return; + } + //鍙厑璁镐竴涓猟ialog瀛樺湪 + if (this.handler != null) { + handler.destroyHelpDialog(); + } + this.handler = dialog; + } + + public static HelpDialogManager getInstance() { + if (THIS == null) { + THIS = new HelpDialogManager(); + } + return THIS; + } + + public void destroyDialog() { + if (handler != null) { + handler.destroyHelpDialog(); + } + } +} diff --git a/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java b/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java index 3fc8f0436f..f81e2bbd3a 100644 --- a/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java +++ b/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java @@ -50,6 +50,7 @@ public class UndoStateEdit extends AbstractUndoableEdit { } } if (this.old != null) { + HelpDialogManager.getInstance().destroyDialog(); this.old.applyState(); } if (BaseUtils.isAuthorityEditing()) { diff --git a/designer_form/src/com/fr/design/designer/creator/XChartEditor.java b/designer_form/src/com/fr/design/designer/creator/XChartEditor.java index 49d193199e..28926f6c82 100644 --- a/designer_form/src/com/fr/design/designer/creator/XChartEditor.java +++ b/designer_form/src/com/fr/design/designer/creator/XChartEditor.java @@ -2,26 +2,21 @@ package com.fr.design.designer.creator; import java.awt.*; import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; import java.beans.IntrospectionException; import javax.swing.*; -import com.fr.base.BaseUtils; -import com.fr.base.chart.BaseChart; import com.fr.base.chart.BaseChartCollection; import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.ComponentAdapter; import com.fr.design.designer.beans.models.SelectionModel; import com.fr.design.gui.chart.BaseChartPropertyPane; import com.fr.design.gui.chart.MiddleChartComponent; -import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.*; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer; import com.fr.design.module.DesignModuleFactory; import com.fr.design.designer.beans.events.DesignerEditor; -import com.fr.form.ui.AbstractBorderStyleWidget; import com.fr.form.ui.BaseChartEditor; import com.fr.form.ui.Widget; import com.fr.design.form.util.XCreatorConstants; @@ -237,7 +232,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { editor.setLayout(null); editor.setOpaque(false); - coverPanel = new CoverReportPane(); + coverPanel = new CoverPane(); coverPanel.setPreferredSize(this.getPreferredSize()); coverPanel.setBounds(this.getBounds()); diff --git a/designer_form/src/com/fr/design/designer/creator/XElementCase.java b/designer_form/src/com/fr/design/designer/creator/XElementCase.java index 39caec435c..6ff949dfd3 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -9,10 +9,7 @@ import com.fr.design.fun.FormElementCaseEditorProvider; import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.design.fun.impl.AbstractFormElementCaseEditorProvider; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.mainframe.CoverReportPane; -import com.fr.design.mainframe.EditingMouseListener; -import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.WidgetPropertyPane; +import com.fr.design.mainframe.*; import com.fr.design.mainframe.widget.editors.BooleanEditor; import com.fr.design.mainframe.widget.editors.PaddingMarginEditor; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; @@ -201,6 +198,13 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme editor.repaint(); } + /** + * 閿姣佸府鍔╂彁绀烘 + */ + public void destroyHelpDialog(){ + coverPanel.destroyHelpDialog(); + } + public JComponent getCoverPane(){ return coverPanel; } @@ -280,6 +284,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme if (this.isHelpBtnOnFocus()) { coverPanel.setMsgDisplay(e); }else { + coverPanel.destroyHelpDialog(); switchTab(e,editingMouseListener); } } diff --git a/designer_form/src/com/fr/design/mainframe/CoverPane.java b/designer_form/src/com/fr/design/mainframe/CoverPane.java new file mode 100644 index 0000000000..b6cdd472a2 --- /dev/null +++ b/designer_form/src/com/fr/design/mainframe/CoverPane.java @@ -0,0 +1,97 @@ +package com.fr.design.mainframe; + +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.icon.IconPathConstants; +import com.fr.general.IOUtils; +import com.fr.general.Inter; + +import javax.swing.*; +import java.awt.*; + +/** + * Created with IntelliJ IDEA. + * User: zx + * Date: 14-7-24 + * Time: 涓婂崍9:09 + */ +public class CoverPane extends JPanel { + + private UIButton editButton; + private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F); + + public CoverPane() { + setLayout(getCoverLayout()); + setBackground(null); + setOpaque(false); + + editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)) { + @Override + public Dimension getPreferredSize() { + return new Dimension(60, 24); + } + }; + editButton.setBorderPainted(false); + editButton.setExtraPainted(false); + editButton.setBackground(new Color(176, 196, 222)); + add(editButton); + } + + public AlphaComposite getComposite() { + return composite; + } + + public void setComposite(AlphaComposite composite) { + this.composite = composite; + } + + public UIButton getEditButton() { + return editButton; + } + + public void setEditButton(UIButton editButton) { + this.editButton = editButton; + } + + protected LayoutManager getCoverLayout() { + return new LayoutManager() { + + @Override + public void removeLayoutComponent(Component comp) { + } + + @Override + public Dimension preferredLayoutSize(Container parent) { + return parent.getPreferredSize(); + } + + @Override + public Dimension minimumLayoutSize(Container parent) { + return null; + } + + @Override + public void layoutContainer(Container parent) { + int width = parent.getParent().getWidth(); + int height = parent.getParent().getHeight(); + int preferWidth = editButton.getPreferredSize().width; + int preferHeight = editButton.getPreferredSize().height; + editButton.setBounds((width - preferWidth) / 2, (height - preferHeight) / 2, preferWidth, preferHeight); + } + + @Override + public void addLayoutComponent(String name, Component comp) { + } + }; + } + + + public void paint(Graphics g) { + Graphics2D g2d = (Graphics2D) g; + Composite oldComposite = g2d.getComposite(); + g2d.setComposite(composite); + g2d.setColor(Color.white); + g2d.fillRect(0, 0, getWidth(), getHeight()); + g2d.setComposite(oldComposite); + super.paint(g); + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/CoverReportPane.java b/designer_form/src/com/fr/design/mainframe/CoverReportPane.java index 63ec66f5a5..f996338562 100644 --- a/designer_form/src/com/fr/design/mainframe/CoverReportPane.java +++ b/designer_form/src/com/fr/design/mainframe/CoverReportPane.java @@ -8,7 +8,6 @@ import com.fr.design.icon.IconPathConstants; import com.fr.form.share.ShareConstants; import com.fr.general.FRScreen; import com.fr.general.IOUtils; -import com.fr.general.Inter; import com.fr.stable.StringUtils; import javax.swing.*; @@ -16,15 +15,13 @@ import java.awt.*; import java.awt.event.MouseEvent; /** - * Created with IntelliJ IDEA. - * User: zx - * Date: 14-7-24 - * Time: 涓婂崍9:09 + * 鎶ヨ〃鍧楃殑灏侀潰锛堝鏋滃悗闈㈡墍鏈夌殑缁勪欢閮芥湁甯姪淇℃伅鐨勮瘽灏辨娊鎺ュ彛鍚э級 + * Coder: zack + * Date: 2016/11/2 + * Time: 11:32 */ -public class CoverReportPane extends JPanel { - - private UIButton editButton; - private Icon controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_CLOSE_ICON_PATH); +public class CoverReportPane extends CoverPane implements HelpDialogHandler{ + private Icon controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH); private JComponent controlButton = new JComponent() { protected void paintComponent(Graphics g) { g.setColor(UIConstants.NORMAL_BACKGROUND); @@ -39,28 +36,13 @@ public class CoverReportPane extends JPanel { private ElementCaseHelpDialog helpDialog = null; - private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F); - public CoverReportPane() { this(StringUtils.EMPTY); } public CoverReportPane(String helpMsg) { + super(); this.helpMsg = helpMsg; - setLayout(getCoverLayout()); - setBackground(null); - setOpaque(false); - - editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)) { - @Override - public Dimension getPreferredSize() { - return new Dimension(60, 24); - } - }; - editButton.setBorderPainted(false); - editButton.setExtraPainted(false); - editButton.setBackground(new Color(176, 196, 222)); - add(editButton); add(controlButton); if (WidgetPropertyPane.getInstance().getEditingFormDesigner() != null) { WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() { @@ -98,6 +80,7 @@ public class CoverReportPane extends JPanel { int rY = 165 + e.getY();//165鏄璁″櫒鏈涓婇潰鍑犱釜闈㈡澘鐨勯珮搴 helpDialog.setLocationRelativeTo(DesignerContext.getDesignerFrame(), rX, rY); helpDialog.showWindow(); + HelpDialogManager.getInstance().setPane(this); } else { controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH); controlButton.repaint(); @@ -125,6 +108,7 @@ public class CoverReportPane extends JPanel { @Override public void layoutContainer(Container parent) { + UIButton editButton = getEditButton(); int width = parent.getParent().getWidth(); int height = parent.getParent().getHeight(); int preferWidth = editButton.getPreferredSize().width; @@ -139,17 +123,6 @@ public class CoverReportPane extends JPanel { }; } - - public void paint(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - Composite oldComposite = g2d.getComposite(); - g2d.setComposite(composite); - g2d.setColor(Color.white); - g2d.fillRect(0, 0, getWidth(), getHeight()); - g2d.setComposite(oldComposite); - super.paint(g); - } - public void destroyHelpDialog() { if (helpDialog != null) { controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH); @@ -159,4 +132,11 @@ public class CoverReportPane extends JPanel { } } -} \ No newline at end of file + @Override + public void setVisible(boolean aFlag) { + super.setVisible(aFlag); + if (aFlag) { + HelpDialogManager.getInstance().setPane(this); + } + } +} diff --git a/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java b/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java index 0aa77281d1..869ec2077f 100644 --- a/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java +++ b/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java @@ -256,7 +256,7 @@ public class EditingMouseListener extends MouseInputAdapter { public void mouseMoved(MouseEvent e) { XCreator component = designer.getComponentAt(e); - setCoverPaneNotDisplay(); + setCoverPaneNotDisplay(e, false); if(processTopLayoutMouseMove(component, e)){ return; @@ -320,8 +320,17 @@ public class EditingMouseListener extends MouseInputAdapter { designer.repaint(); } - private void setCoverPaneNotDisplay(){ - if (xElementCase != null){ + private void setCoverPaneNotDisplay(MouseEvent e, boolean isLinkedHelpDialog) { + if (xElementCase != null) { + int x = getParentPositionX(xElementCase, 0) - designer.getArea().getHorizontalValue(); + int y = getParentPositionY(xElementCase, 0) - designer.getArea().getVerticalValue(); + Rectangle rect = new Rectangle(x, y, xElementCase.getWidth(), xElementCase.getHeight()); + if (rect.contains(e.getPoint())) { + return; + } + if(isLinkedHelpDialog){ + xElementCase.destroyHelpDialog(); + } xElementCase.displayCoverPane(false); } if (xChartEditor != null){ @@ -525,7 +534,7 @@ public class EditingMouseListener extends MouseInputAdapter { designer.setCursor(Cursor.getDefaultCursor()); } - setCoverPaneNotDisplay(); + setCoverPaneNotDisplay(e, true); cancelPromptWidgetForbidEnter(); } From 5eda02c95d5bd713cf99f6209f36f9df2b56d445 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Thu, 3 Nov 2016 16:20:21 +0800 Subject: [PATCH 136/140] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20dev=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.dev.gradle | 70 ++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 designer_base/build.dev.gradle diff --git a/designer_base/build.dev.gradle b/designer_base/build.dev.gradle new file mode 100644 index 0000000000..b02f751e7c --- /dev/null +++ b/designer_base/build.dev.gradle @@ -0,0 +1,70 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 +sourceCompatibility=1.7 +//鎸囧畾鐢熸垚jar鍖呯増鏈 +version='8.0' +//鐢熸垚jar鍖呴噸鍛藉悕 +jar{ + baseName='fr-designer-core' +} + + +def srcDir="." + +//鎸囧畾婧愮爜璺緞 +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src"] + } + } +} +//鑾峰彇浠涔堝垎鏀悕 +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/${branchName}",include:'**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") + + testCompile 'junit:junit:4.12' +} +//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + into 'build/classes/main' + } + +} + + +//鍘嬬缉椤圭洰涓殑js鏂囦欢 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + } + } + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + } + + } +} +jar.dependsOn compressJS + + + From a6ff48e2f4fc3e70f3ee4eabf4cadf5218ac1622 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Thu, 3 Nov 2016 16:42:10 +0800 Subject: [PATCH 137/140] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_chart/build.dev.gradle | 66 ++++++++++++++++++++++++ designer_form/build.dev.gradle | 89 +++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 designer_chart/build.dev.gradle create mode 100644 designer_form/build.dev.gradle diff --git a/designer_chart/build.dev.gradle b/designer_chart/build.dev.gradle new file mode 100644 index 0000000000..ba6df992bd --- /dev/null +++ b/designer_chart/build.dev.gradle @@ -0,0 +1,66 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 +sourceCompatibility=1.7 +//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 +version='8.0' + +def srcDir="." + +//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 + +jar{ + baseName='fr-designer-chart' +} + +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src"] + } + } +} +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/${branchName}",include:'**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") + + testCompile 'junit:junit:4.12' +} +//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + + } + into 'build/classes/main' + } + +} + +//鍘嬬缉椤圭洰涓殑js鏂囦欢 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + } + } + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + } + + } +} +jar.dependsOn compressJS + diff --git a/designer_form/build.dev.gradle b/designer_form/build.dev.gradle new file mode 100644 index 0000000000..2b727caac9 --- /dev/null +++ b/designer_form/build.dev.gradle @@ -0,0 +1,89 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 +sourceCompatibility=1.8 +//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 +version='8.0' + +def srcDir="." + + +//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 +jar{ + baseName='fr-designer-report' +} +//婧愮爜鎵鍦ㄤ綅缃 +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src", +"${srcDir}/../designer/src"] + } + } +} + +//鑾峰彇浠涔堝垎鏀悕 +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) + +//鏄剧ず渚濊禆jar鍖 +FileTree f=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") +f.each{File file-> + println "----${file.path}" +} + +//澹版槑澶栭儴渚濊禆 +dependencies{ + compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar') + compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") + testCompile 'junit:junit:4.12' +} + +//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 +def dataContent ={def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} + +//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + with dataContent.call("${srcDir}/src") + with dataContent.call("${srcDir}/../designer/src") + into ('build/classes/main') + } + +} + + +//鍘嬬缉椤圭洰涓殑js鏂囦欢 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + } + } + ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ + fileset (dir:"${srcDir}/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + + } + fileset (dir:"${srcDir}/../designer/src"){ + include (name:'**/*.js') + include (name:'**/*.css') + } + + } +} +jar.dependsOn compressJS + From 117eae5f489fe05f2773a1d5b1bd4ea459feb62f Mon Sep 17 00:00:00 2001 From: eason-skx Date: Thu, 3 Nov 2016 17:06:24 +0800 Subject: [PATCH 138/140] =?UTF-8?q?=E5=8A=A0final=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 873a967501..2af5af799b 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -79,8 +79,8 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh public static WidgetOption[] initWidgetOption(){ - ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames(); - ChartWidgetOption[] child = new ChartWidgetOption[typeName.length]; + final ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames(); + final ChartWidgetOption[] child = new ChartWidgetOption[typeName.length]; //寮傛鍔犺浇 new Thread(new Runnable() { From dc01a3fe223fdf7fa4b813c743cad09338b882d9 Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 3 Nov 2016 19:22:07 +0800 Subject: [PATCH 139/140] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=20?= =?UTF-8?q?=E4=B8=A5=E6=A0=BC=E9=99=90=E5=88=B6dialog=E7=9A=84=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E4=B9=8B=E5=90=8Ectrl=20z=E6=92=A4=E9=94=80=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=BF=85=E9=A1=BB=E5=85=88=E5=85=B3=E9=97=AD=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E5=BC=B9=E6=A1=86=EF=BC=8C=E8=BF=99=E8=BE=B9=E5=B0=B1?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=88=A0=E6=8E=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/UndoStateEdit.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java b/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java index f81e2bbd3a..3fc8f0436f 100644 --- a/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java +++ b/designer_base/src/com/fr/design/mainframe/UndoStateEdit.java @@ -50,7 +50,6 @@ public class UndoStateEdit extends AbstractUndoableEdit { } } if (this.old != null) { - HelpDialogManager.getInstance().destroyDialog(); this.old.applyState(); } if (BaseUtils.isAuthorityEditing()) { From 5ed311f92a8b4ad89d8ebb1dce4abae4db864b4b Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 3 Nov 2016 20:02:54 +0800 Subject: [PATCH 140/140] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=B1=E4=BA=AB=E5=BC=82=E6=AD=A5=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/FormWidgetDetailPane.java | 62 +++++++++++-------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java index 6bcc9a2661..a1fb5f1476 100644 --- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -1,47 +1,35 @@ package com.fr.design.mainframe; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.io.File; -import java.io.IOException; -import java.util.*; -import java.util.List; - -import javax.swing.*; -import javax.swing.border.LineBorder; -import javax.swing.filechooser.FileNameExtensionFilter; - import com.fr.base.BaseUtils; -import com.fr.design.actions.file.WebPreviewUtils; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.UIDialog; import com.fr.design.extra.PluginWebBridge; import com.fr.design.extra.ShopDialog; import com.fr.design.extra.WebManagerPaneFactory; -import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.file.MutilTempalteTabPane; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ibutton.UIPreviewButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIPopupMenu; -import com.fr.design.gui.itoolbar.UILargeToolbar; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.parameter.ParameterPropertyPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.share.ShareConstants; import com.fr.form.share.ShareLoader; import com.fr.form.ui.ElCaseBindInfo; -import com.fr.general.IOUtils; import com.fr.general.Inter; +import javax.swing.*; +import javax.swing.filechooser.FileNameExtensionFilter; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.io.File; +import java.io.IOException; + /** * Created with IntelliJ IDEA. * User: zx @@ -60,6 +48,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UIButton deleteButton; private static final int OFFSET_X = 140; private static final int OFFSET_Y = 26; + private SwingWorker sw; public static FormWidgetDetailPane getInstance() { if (HOLDER.singleton == null) { @@ -105,7 +94,19 @@ public class FormWidgetDetailPane extends FormDockView{ reuWidgetPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); reuWidgetPanel.setBorder(null); if (elCaseBindInfoList == null) { - elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); + elCaseBindInfoList = new ElCaseBindInfo[0]; + if (sw != null) { + sw.cancel(true); + } + sw = new SwingWorker() { + @Override + protected Object doInBackground() throws Exception { + elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); + refreshDownPanel(false); + return null; + } + }; + sw.execute(); } initReuWidgetPanel(); createRefreshButton(); @@ -178,8 +179,19 @@ public class FormWidgetDetailPane extends FormDockView{ refreshButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - refreshShareMoudule(); - refreshDownPanel(false); + if (sw != null) { + sw.cancel(true); + } + sw = new SwingWorker() { + @Override + protected Object doInBackground() throws Exception { + ShareLoader.getLoader().refreshModule(); + elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); + refreshDownPanel(false); + return null; + } + }; + sw.execute(); } });