diff --git a/designer/src/com/fr/design/mainframe/JWorkBook.java b/designer/src/com/fr/design/mainframe/JWorkBook.java index 73edf7107..8d2854de7 100644 --- a/designer/src/com/fr/design/mainframe/JWorkBook.java +++ b/designer/src/com/fr/design/mainframe/JWorkBook.java @@ -129,6 +129,11 @@ public class JWorkBook extends JTemplate { return getEditingElementCasePane(); } + @Override + public JComponent getCurrentReportComponentPane() { + return reportComposite; + } + @Override protected UIModeControlContainer createCenterPane() { parameterPane = ModuleContext.isModuleStarted(Module.FORM_MODULE) ? new ParameterDefinitePane() : null; diff --git a/designer/src/com/fr/design/mainframe/ReportComponent.java b/designer/src/com/fr/design/mainframe/ReportComponent.java index 6ca268545..699f6c1c5 100644 --- a/designer/src/com/fr/design/mainframe/ReportComponent.java +++ b/designer/src/com/fr/design/mainframe/ReportComponent.java @@ -44,6 +44,11 @@ public abstract class ReportComponent { + private static final int HUND = 100; + public WorkSheetDesigner(WorkSheet sheet) { super(sheet); @@ -166,6 +170,13 @@ public class WorkSheetDesigner extends ReportComponent extends ExtendedComboBox{ +public class TextFontComboBox extends ExtendedComboBox { private Filter filter; public TextFontComboBox() { @@ -38,8 +39,8 @@ public class TextFontComboBox extends ExtendedComboBox{ public void setItemArray(T[] objectArray) { List itemList = new ArrayList(); - if(objectArray != null) { - for(int i = 0; i < objectArray.length; i++) { + if (objectArray != null) { + for (int i = 0; i < objectArray.length; i++) { itemList.add(objectArray[i]); } } @@ -48,8 +49,8 @@ public class TextFontComboBox extends ExtendedComboBox{ } public void setItemList(List itemList) { - ((FilterableComboBoxModel)this.getModel()).setPrefix(""); - ((FilterableComboBoxModel)this.getModel()).setItemList(itemList); + ((FilterableComboBoxModel) this.getModel()).setPrefix(StringUtils.EMPTY); + ((FilterableComboBoxModel) this.getModel()).setItemList(itemList); } class FilterComboBoxEditor implements ComboBoxEditor, DocumentListener { @@ -75,7 +76,7 @@ public class TextFontComboBox extends ExtendedComboBox{ this.item = item; this.setting = true; - String newText = (item == null) ? "" : item.toString(); + String newText = (item == null) ? StringUtils.EMPTY : item.toString(); textField.setText(newText); this.setting = false; } diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java index 633fc066b..eaf8e76c9 100644 --- a/designer_base/src/com/fr/design/mainframe/JTemplate.java +++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java @@ -114,6 +114,8 @@ public abstract class JTemplate> ex public abstract TargetComponent getCurrentElementCasePane(); + public abstract JComponent getCurrentReportComponentPane(); + // 为收集模版信息作准备 private void initForCollect() { template.initTemplateID(); // 为新模板设置 templateID 属性 diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index e6432bf1e..2effa34ba 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -103,6 +103,11 @@ public class JForm extends JTemplate implements BaseJForm { return elementCaseDesign.getEditingElementCasePane(); } + @Override + public JComponent getCurrentReportComponentPane() { + return null; + } + public int getMenuState() { return DesignState.JFORM;