* commit 'ea3f19be1e9faf42e512fb6d285e11853590f24a': (31 commits) 冲突 冲突 1 1 冲突 滚动条 远程设计插件加载解耦 远程设计插件加载 bug:96398 设计器国际化问题 填报属性抽取通用属性接口,定时器依赖填报 校验改进 校验引擎部分继续改进 填报校验改进,designer暂时依赖engine-write update 重新初始化列名 打開多種佈局方式 自定义校验接口 自定义校验接口 对接打包 缩放属性面板 ...master
superman
9 years ago
@ -0,0 +1,35 @@ |
|||||||
|
package com.fr.design.report; |
||||||
|
|
||||||
|
import com.fr.design.beans.BasicBeanPane; |
||||||
|
import com.fr.design.layout.FRGUIPaneFactory; |
||||||
|
import com.fr.report.write.ValueVerifier; |
||||||
|
|
||||||
|
import java.awt.*; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by richie on 16/6/12. |
||||||
|
*/ |
||||||
|
public class BuildInVerifierPane extends BasicBeanPane<ValueVerifier> { |
||||||
|
private ValueVerifierEditPane valueVerifierEditPane; |
||||||
|
|
||||||
|
public BuildInVerifierPane() { |
||||||
|
this.setLayout(FRGUIPaneFactory.createBorderLayout()); |
||||||
|
valueVerifierEditPane = new ValueVerifierEditPane(); |
||||||
|
this.add(valueVerifierEditPane, BorderLayout.CENTER); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void populateBean(ValueVerifier ob) { |
||||||
|
valueVerifierEditPane.populate(ob); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public ValueVerifier updateBean() { |
||||||
|
return valueVerifierEditPane.update(); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
protected String title4PopupWindow() { |
||||||
|
return "BuiltIn"; |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,37 @@ |
|||||||
|
package com.fr.design.report; |
||||||
|
|
||||||
|
import com.fr.design.beans.BasicBeanPane; |
||||||
|
import com.fr.design.layout.FRGUIPaneFactory; |
||||||
|
import com.fr.report.write.WClassVerifier; |
||||||
|
|
||||||
|
import java.awt.*; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by richie on 16/6/12. |
||||||
|
*/ |
||||||
|
public class CustomVerifierPane extends BasicBeanPane<WClassVerifier> { |
||||||
|
private CustomVerifyJobPane pane; |
||||||
|
|
||||||
|
public CustomVerifierPane() { |
||||||
|
this.setLayout(FRGUIPaneFactory.createBorderLayout()); |
||||||
|
pane = new CustomVerifyJobPane(); |
||||||
|
this.add(pane, BorderLayout.CENTER); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void populateBean(WClassVerifier ob) { |
||||||
|
this.pane.populateBean(ob.getClassVerifyJob()); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public WClassVerifier updateBean() { |
||||||
|
WClassVerifier verifier = new WClassVerifier(); |
||||||
|
verifier.setClassVerifyJob(this.pane.updateBean()); |
||||||
|
return verifier; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
protected String title4PopupWindow() { |
||||||
|
return "custom"; |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,40 @@ |
|||||||
|
package com.fr.design.fun; |
||||||
|
|
||||||
|
import com.fr.data.Verifier; |
||||||
|
import com.fr.design.beans.BasicBeanPane; |
||||||
|
import com.fr.stable.fun.Level; |
||||||
|
import com.fr.stable.fun.Provider; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by richie on 16/6/8. |
||||||
|
*/ |
||||||
|
public interface VerifyDefineProvider extends Level, Provider { |
||||||
|
|
||||||
|
String MARK_STRING = "VerifyDefineProvider"; |
||||||
|
|
||||||
|
int CURRENT_LEVEL = 1; |
||||||
|
|
||||||
|
/** |
||||||
|
* 对应的校验类 |
||||||
|
* @return 校验类 |
||||||
|
*/ |
||||||
|
Class<? extends Verifier> classForVerifier(); |
||||||
|
|
||||||
|
/** |
||||||
|
* 校验设置的界面 |
||||||
|
* @return 界面 |
||||||
|
*/ |
||||||
|
Class<? extends BasicBeanPane> appearanceForVerifier(); |
||||||
|
|
||||||
|
/** |
||||||
|
* 此种类型的校验的名字 |
||||||
|
* @return 名字 |
||||||
|
*/ |
||||||
|
String nameForVerifier(); |
||||||
|
|
||||||
|
/** |
||||||
|
* 菜单图标 |
||||||
|
* @return 图标路径 |
||||||
|
*/ |
||||||
|
String iconPath(); |
||||||
|
} |
||||||
@ -0,0 +1,20 @@ |
|||||||
|
package com.fr.design.fun.impl; |
||||||
|
|
||||||
|
import com.fr.design.fun.VerifyDefineProvider; |
||||||
|
import com.fr.stable.fun.impl.AbstractProvider; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by richie on 16/6/8. |
||||||
|
*/ |
||||||
|
public abstract class AbstractVerifyDefineProvider extends AbstractProvider implements VerifyDefineProvider { |
||||||
|
|
||||||
|
@Override |
||||||
|
public int currentAPILevel() { |
||||||
|
return CURRENT_LEVEL; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public String mark4Provider() { |
||||||
|
return getClass().getName(); |
||||||
|
} |
||||||
|
} |
||||||
|
After Width: | Height: | Size: 745 B |
|
After Width: | Height: | Size: 810 B |
|
After Width: | Height: | Size: 837 B |
|
After Width: | Height: | Size: 779 B |
|
After Width: | Height: | Size: 815 B |
|
After Width: | Height: | Size: 818 B |
|
After Width: | Height: | Size: 890 B |
|
After Width: | Height: | Size: 842 B |