Browse Source
* commit '6319309bcfdcf1621ce4f5a93c9754d4fbe38461': (125 commits) 回退主干上的下拉树极速构建 无JIRA任务 防止有npe 无JIRA任务 视图树是否去重设置无效 无JIRA任务 修复表单调整页面大小后tabpane中就不能拖入图表的问题 REPORT-419 dev里面这块代码好像没合 REPORT-419 dev里面这块代码好像没合 REPORT-625 表单参数面板高度自己变 参数面板高度不要算上分辨率的比例缩放 REPORT-650 1.7jdk启动报错 1 1 ct ct ct ct REPORT-533 表单初始化布局新功能 bugfix；master中屏蔽掉，只开放release update REPORT-533 表单初始化布局新功能 bugfix:修复scalelayout类的控件在布局间切换出现问题的情况 change:先屏蔽一下菜单中组件商店 REPORT-533 表单初始化布局新功能 update ...master
superman
8 years ago
29 changed files with 377 additions and 446 deletions
@ -1,89 +0,0 @@ |
|||||||
|
|
||||||
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) |
|
||||||
|
|
||||||
//显示依赖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文件复制到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 |
|
||||||
|
|
||||||
@ -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<? extends Widget> 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);
} |
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<? extends Widget> 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);
} |
||||||
Loading…
Reference in new issue