From e91c698e2e12828b98c97b9d662e1f48c6d1ddd7 Mon Sep 17 00:00:00 2001 From: kerry Date: Sat, 5 Aug 2017 22:03:36 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-3293=20=E7=95=8C=E9=9D=A2=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E6=8E=A7=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/widget/CellWidgetCardPane.java | 6 --- .../com/fr/design/locale/designer.properties | 11 +++-- .../design/locale/designer_en_US.properties | 1 + .../design/locale/designer_ja_JP.properties | 2 + .../design/locale/designer_ko_KR.properties | 3 +- .../design/locale/designer_zh_CN.properties | 1 + .../design/locale/designer_zh_TW.properties | 1 + .../ui/FormBasicWidgetPropertyPane.java | 2 + .../widget/ui/FormWidgetCardPane.java | 2 + .../parameter/RootDesignDefinePane.java | 13 ++++-- .../FormWidgetDefinePaneFactoryBase.java | 2 + .../ui/designer/ComboBoxDefinePane.java | 3 +- .../ui/designer/ComboCheckBoxDefinePane.java | 2 + .../designer/DirectWriteEditorDefinePane.java | 4 +- .../ui/designer/FieldEditorDefinePane.java | 27 +++++------ .../widget/ui/designer/LabelDefinePane.java | 21 ++++++--- .../designer/TextFieldEditorDefinePane.java | 16 +++---- .../designer/component/PaddingBoundPane.java | 34 +++++++------- .../FRAbsoluteBodyLayoutDefinePane.java | 10 ++-- .../layout/FRAbsoluteLayoutDefinePane.java | 14 +++++- .../layout/FRFitLayoutDefinePane.java | 42 ++++++++++------- .../layout/WTabFitLayoutDefinePane.java | 46 +++++++++++++++++++ .../layout/WTitleLayoutDefinePane.java | 5 +- 23 files changed, 181 insertions(+), 87 deletions(-) create mode 100644 designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java diff --git a/designer/src/com/fr/design/widget/CellWidgetCardPane.java b/designer/src/com/fr/design/widget/CellWidgetCardPane.java index 82153dfeb..778e76790 100644 --- a/designer/src/com/fr/design/widget/CellWidgetCardPane.java +++ b/designer/src/com/fr/design/widget/CellWidgetCardPane.java @@ -52,14 +52,8 @@ public class CellWidgetCardPane extends BasicPane { public CellWidgetCardPane(ElementCasePane pane) { this.pane = pane; -// this.initComponents(pane); } - public BasicWidgetPropertySettingPane initBasicWidgetPropertyPane(){ - return new BasicWidgetPropertySettingPane(); - } - - private void initComponents(ElementCasePane pane) { this.removeAll(); this.setLayout(FRGUIPaneFactory.createBorderLayout()); diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index fe8b05b8b..f33c028aa 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2109,8 +2109,9 @@ FR-Designer_Widget_Position=widget Position FR-Designer_Widget_Field=field FR-Designer_Widget_Formula=formula FR-Designer_Widget_String=String -FR-Designer_Widget_Display_Report_Tool=display report tool \u663E\u793A\u62A5\u8868\u5757\u5DE5\u5177\u680F -FR-Designer_Widget_No_Repeat=no repeat \u53BB\u9664\u91CD\u590D\u9879 -FR-Designer_Widget_Error_Tip=no repeat \u9519\u8BEF\u63D0\u793A -FR-Designer_Widget_Return_Leaf=no repeat \u7ED3\u679C\u8FD4\u56DE\u53F6\u5B50\u8282\u70B9 -FR-Designer_Widget_Return_Path=no repeat \u7ED3\u679C\u8FD4\u56DE\u5B8C\u6574\u5C42\u6B21\u8DEF\u5F84 +FR-Designer_Widget_Display_Report_Tool=display report tool +FR-Designer_Widget_No_Repeat=no repeat +FR-Designer_Widget_Error_Tip=error tip +FR-Designer_Widget_Return_Leaf=return leaf +FR-Designer_Widget_Return_Path=return path +FR-Designer_Widget_Display_Position=Display Position diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index aa243eb77..4a6990704 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -2115,3 +2115,4 @@ FR-Designer_Widget_No_Repeat=no repeat FR-Designer_Widget_Error_Tip=error tip FR-Designer_Widget_Return_Leaf=return leaf FR-Designer_Widget_Return_Path=return path +FR-Designer_Widget_Display_Position=Display Position diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index a944f0147..a79b9855d 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -2118,3 +2118,5 @@ FR-Designer_Widget_No_Repeat= FR-Designer_Widget_Error_Tip= FR-Designer_Widget_Return_Leaf= FR-Designer_Widget_Return_Path= +FR-Designer_Widget_Display_Position= + diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 66f9a4453..e3cd9ba57 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -2117,4 +2117,5 @@ FR-Designer_Widget_Display_Report_Tool= FR-Designer_Widget_No_Repeat= FR-Designer_Widget_Error_Tip= FR-Designer_Widget_Return_Leaf= -FR-Designer_Widget_Return_Path= \ No newline at end of file +FR-Designer_Widget_Return_Path= +FR-Designer_Widget_Display_Position= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 22f71ca98..5febf909c 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -2121,3 +2121,4 @@ FR-Designer_Widget_No_Repeat=\u53BB\u9664\u91CD\u590D\u9879 FR-Designer_Widget_Error_Tip=\u9519\u8BEF\u63D0\u793A FR-Designer_Widget_Return_Leaf=\u7ED3\u679C\u8FD4\u56DE\u53F6\u5B50\u8282\u70B9 FR-Designer_Widget_Return_Path=\u7ED3\u679C\u8FD4\u56DE\u5B8C\u6574\u5C42\u6B21\u8DEF\u5F84 +FR-Designer_Widget_Display_Position=\u663E\u793A\u4F4D\u7F6E diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index ad47fe3ea..81ecd048e 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -2118,3 +2118,4 @@ FR-Designer_Widget_No_Repeat= FR-Designer_Widget_Error_Tip= FR-Designer_Widget_Return_Leaf= FR-Designer_Widget_Return_Path= +FR-Designer_Widget_Display_Position= diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java index d92451423..74d421a6e 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java @@ -34,11 +34,13 @@ public class FormBasicWidgetPropertyPane extends FormBasicPropertyPane { } public void populate(Widget widget) { + super.populate(widget); enableCheckBox.setSelected(widget.isEnabled()); visibleCheckBox.setSelected(widget.isVisible()); } public void update(Widget widget) { + super.update(widget); widget.setEnabled(enableCheckBox.isSelected()); widget.setEnabled(visibleCheckBox.isSelected()); } diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 60632248f..35c74553d 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -186,6 +186,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { if (xCreator instanceof XWScaleLayout) { XCreator xCreator1 = xCreator.getEditingChildCreator(); xCreator1.resetData(widget); + xCreator.removeAll(); + xCreator.add(xCreator1); } else { xCreator.resetData(widget); } diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java index 672b50186..18d24dced 100644 --- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java @@ -33,6 +33,8 @@ public class RootDesignDefinePane extends AbstractDataModify { private XWParameterLayout root; private UISpinner designerWidth; private UICheckBox displayReport; + private UITextField background; + private UITextField displayPosition; public RootDesignDefinePane(XCreator xCreator) { super(xCreator); @@ -70,15 +72,17 @@ public class RootDesignDefinePane extends AbstractDataModify { public JPanel createAdvancePane(){ displayReport = new UICheckBox(Inter.getLocText("FR-Designer_DisplayNothingBeforeQuery")); + background = new UITextField(); + displayPosition = new UITextField(); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; double[] rowSize = {p,p, p}; double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), new UITextField()}, + new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), background}, new Component[]{displayReport, null }, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_WidgetDisplyPosition")), new UITextField()} + new Component[]{new UILabel(Inter.getLocText("FR-Designer_WidgetDisplyPosition")), displayPosition} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 7); panel.setBorder(BorderFactory.createEmptyBorder(5, 5,5,5)); @@ -87,12 +91,13 @@ public class RootDesignDefinePane extends AbstractDataModify { @Override public String title4PopupWindow() { - return "wfitlayout"; + return "parameter"; } @Override public void populateBean(WParameterLayout ob) { - + displayReport.setSelected(ob.isDelayDisplayContent()); + designerWidth.setValue(ob.getDesignWidth()); } diff --git a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java index 79281d303..36f4719de 100644 --- a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java +++ b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java @@ -10,6 +10,7 @@ import com.fr.design.widget.ui.designer.layout.*; import com.fr.form.ui.*; import com.fr.form.ui.container.*; import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout; +import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.Inter; import com.fr.stable.bridge.BridgeMark; import com.fr.stable.bridge.StableFactory; @@ -63,6 +64,7 @@ public class FormWidgetDefinePaneFactoryBase { defineMap.put(WCardMainBorderLayout.class, new Appearance(WCardMainLayoutDefinePane.class, "tab")); defineMap.put(WTitleLayout.class, new Appearance(WTitleLayoutDefinePane.class, "tab")); defineMap.put(Label.class, new Appearance(LabelDefinePane.class, "label")); + defineMap.put(WTabFitLayout.class, new Appearance(WTabFitLayoutDefinePane.class, "label")); defineMap.putAll(ExtraDesignClassManager.getInstance().getCellWidgetOptionsMap()); } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java index 28455070a..06c26465a 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java @@ -21,13 +21,14 @@ public class ComboBoxDefinePane extends CustomWritableRepeatEditorPane } protected void populateSubCustomWritableRepeatEditorBean(ComboBox e) { + removeRepeatCheckBox.setSelected(e.isRemoveRepeat()); this.dictPane.populateBean(e.getDictionary()); } protected ComboBox updateSubCustomWritableRepeatEditorBean() { ComboBox combo = new ComboBox(); combo.setDictionary(this.dictPane.updateBean()); - + combo.setRemoveRepeat(removeRepeatCheckBox.isSelected()); return combo; } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java index ca09a6288..8165fb355 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java @@ -50,6 +50,7 @@ public class ComboCheckBoxDefinePane extends CustomWritableRepeatEditorPane extends FieldEditorDefinePane { public UICheckBox directWriteCheckBox; protected WaterMarkDictPane waterMarkDictPane; - private UICheckBox removeRepeatCheckBox; + protected UICheckBox removeRepeatCheckBox; public DirectWriteEditorDefinePane(XCreator xCreator) { super(xCreator); @@ -74,7 +74,7 @@ public abstract class DirectWriteEditorDefinePane e protected void populateSubFieldEditorBean(T e) { this.directWriteCheckBox.setSelected(e.isDirectEdit()); this.waterMarkDictPane.populate(e); - + removeRepeatCheckBox.setSelected(e.isChartRelated()); populateSubDirectWriteEditorBean(e); } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java index b5bb2ecd5..9c202e3ba 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java @@ -41,8 +41,8 @@ public abstract class FieldEditorDefinePane extends Abstr allowBlankCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Null")); allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(5, 5, 0, 5)); allowBlankCheckBox.setPreferredSize(new Dimension(ALLOW_BLANK_CHECK_BOX_WIDTH, ALLOW_BLANK_CHECK_BOX_HEIGHT)); - fontSizePane = new UISpinner(0,20,1); - errorMsgTextField = new UITextField(10); + fontSizePane = new UISpinner(0, 20, 1, 0); + errorMsgTextField = new UITextField(); JPanel contentPane = this.setFirstContentPane(); if (contentPane != null) { UIExpandablePane uiExpandablePane = new UIExpandablePane("高级", 280, 20, contentPane); @@ -50,10 +50,12 @@ public abstract class FieldEditorDefinePane extends Abstr } this.addValidatePane(); } + @Override public void populateBean(T ob) { this.allowBlankCheckBox.setSelected(ob.isAllowBlank()); this.errorMsgTextField.setText(ob.getErrorMessage()); + this.fontSizePane.setValue(ob.getFontSize()); populateSubFieldEditorBean(ob); } @@ -65,7 +67,7 @@ public abstract class FieldEditorDefinePane extends Abstr e.setAllowBlank(this.allowBlankCheckBox.isSelected()); e.setErrorMessage(this.errorMsgTextField.getText()); - + e.setFontSize((int)fontSizePane.getValue()); return e; } @@ -83,7 +85,6 @@ public abstract class FieldEditorDefinePane extends Abstr protected void addValidatePane() { validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")); - errorMsgTextField = new UITextField(10); allowBlankCheckBox.addItemListener(new ItemListener() { @Override @@ -91,10 +92,10 @@ public abstract class FieldEditorDefinePane extends Abstr boolean isSelected = allowBlankCheckBox.isSelected(); uiLabel.setVisible(!isSelected); errorMsgTextField.setVisible(!isSelected); - if(isSelected){ + if (isSelected) { uiLabel.setPreferredSize(new Dimension(0, 0)); errorMsgTextField.setPreferredSize(new Dimension(0, 0)); - }else{ + } else { uiLabel.setPreferredSize(new Dimension(66, 20)); errorMsgTextField.setPreferredSize(new Dimension(150, 20)); } @@ -105,14 +106,14 @@ public abstract class FieldEditorDefinePane extends Abstr double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - new Component[]{allowBlankCheckBox, null }, + new Component[]{allowBlankCheckBox, null}, new Component[]{uiLabel, errorMsgTextField}, }; double[] rowSize = {p, p}; - double[] columnSize = {p,f}; - int[][] rowCount = {{1, 1},{1, 1}}; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 7, 2); - panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + double[] columnSize = {p, f}; + int[][] rowCount = {{1, 1}, {1, 1}}; + JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 7, 2); + panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); validatePane.add(panel, BorderLayout.NORTH); JPanel contentPane = this.setValidatePane(); if (contentPane != null) { @@ -124,7 +125,7 @@ public abstract class FieldEditorDefinePane extends Abstr } - public XLayoutContainer getParent (XCreator source){ + public XLayoutContainer getParent(XCreator source) { XLayoutContainer container = XCreatorUtils.getParentXLayoutContainer(source); if (source.acceptType(XWFitLayout.class) || source.acceptType(XWParameterLayout.class)) { container = null; @@ -132,7 +133,7 @@ public abstract class FieldEditorDefinePane extends Abstr return container; } - public JPanel setValidatePane(){ + public JPanel setValidatePane() { return null; } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java index 776c58424..a8373de4a 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -20,6 +20,9 @@ import java.awt.*; * Created by ibm on 2017/8/3. */ public class LabelDefinePane extends AbstractDataModify