From 9d2b04f3049d5329508c8d5c9bfef07393e77a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 27 Feb 2018 09:38:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?MOBILE-7394=20=E8=A7=A3=E5=86=B3=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=A0=87=E7=AD=BE=E6=8E=A7=E4=BB=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E5=90=8E=EF=BC=8C=E6=8E=A7=E4=BB=B6=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/parameter/RootDesignDefinePane.java | 7 +++++++ .../widget/FormWidgetDefinePaneFactoryBase.java | 4 ++-- .../widget/ui/designer/FieldEditorDefinePane.java | 14 ++++++++++++++ .../ui/designer/TextFieldEditorDefinePane.java | 4 ++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java index 6cfa4a2667..82d17f9ff8 100644 --- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java @@ -17,6 +17,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor; import com.fr.design.widget.ui.designer.AbstractDataModify; @@ -53,6 +54,12 @@ public class RootDesignDefinePane extends AbstractDataModify { initComponent(); } + public RootDesignDefinePane(XCreator xCreator, FormDesigner designer) { + super(xCreator, designer); + this.root = (XWParameterLayout) xCreator; + initComponent(); + } + public void initComponent() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); diff --git a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java index 0de1e2bdaf..9c69ec3e10 100644 --- a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java +++ b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java @@ -85,8 +85,8 @@ public class FormWidgetDefinePaneFactoryBase { Appearance dn = defineMap.get(widget.getClass()); DataModify definePane = null; try { - Constructor con = dn.getDefineClass().getConstructor(XCreator.class); - definePane = (DataModify)con.newInstance(creator); + Constructor con = dn.getDefineClass().getConstructor(XCreator.class, FormDesigner.class); + definePane = (DataModify)con.newInstance(creator, designer); operator.did(definePane.dataUI(), dn.getDisplayName()); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), 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 ad47924d43..d2f7911455 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 @@ -9,8 +9,12 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.mainframe.FormDesigner; import com.fr.design.widget.ui.designer.component.FontSizeComboPane; import com.fr.form.ui.FieldEditor; +import com.fr.form.ui.Widget; +import com.fr.form.ui.container.WParameterLayout; +import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import javax.swing.*; @@ -34,6 +38,11 @@ public abstract class FieldEditorDefinePane extends Abstr this.initComponents(); } + public FieldEditorDefinePane(XCreator xCreator, FormDesigner designer) { + super(xCreator, designer); + this.initComponents(); + } + protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); labelNameTextField = new UITextField(); @@ -70,6 +79,11 @@ public abstract class FieldEditorDefinePane extends Abstr e.setAllowBlank(this.allowBlankCheckBox.isSelected()); e.setErrorMessage(this.errorMsgTextField.getText()); e.setFontSize(fontSizePane.getValue()); + if (!ComparatorUtils.equals(e.getLabelName(), labelNameTextField.getText())) { + XCreator xCreator = designer.getSelectionModel().getSelection().getSelectedCreator(); + Widget selectedWidget = xCreator.toData(); + ((WParameterLayout) designer.getParaComponent().toData()).setNameTagModified(selectedWidget.getWidgetName(), true); + } e.setLabelName(labelNameTextField.getText()); return e; } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java index 6facca8573..0d22cc99b1 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java @@ -9,6 +9,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.mainframe.FormDesigner; import com.fr.design.widget.ui.designer.component.FormWidgetValuePane; import com.fr.form.ui.TextEditor; import com.fr.general.Inter; @@ -27,6 +28,9 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane super(xCreator); } + public TextFieldEditorDefinePane(XCreator xCreator, FormDesigner designer) { + super(xCreator, designer); + } @Override protected JPanel setFirstContentPane() { From c17f1a17b1e0bbd86812e7e35894385e54f3b1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 27 Feb 2018 10:00:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8D=E5=B0=84=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=8A=8AFieldEditorDefinePane=E4=B8=AD=E7=9A=84design?= =?UTF-8?q?er=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E4=BB=8EWidgetPropertyPane=E4=B8=AD=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/parameter/RootDesignDefinePane.java | 7 ------- .../fr/design/widget/FormWidgetDefinePaneFactoryBase.java | 4 ++-- .../design/widget/ui/designer/FieldEditorDefinePane.java | 7 ++----- .../widget/ui/designer/TextFieldEditorDefinePane.java | 4 ---- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java index 82d17f9ff8..16863ba1de 100644 --- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java @@ -54,13 +54,6 @@ public class RootDesignDefinePane extends AbstractDataModify { initComponent(); } - public RootDesignDefinePane(XCreator xCreator, FormDesigner designer) { - super(xCreator, designer); - this.root = (XWParameterLayout) xCreator; - initComponent(); - } - - public void initComponent() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1); diff --git a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java index 9c69ec3e10..0de1e2bdaf 100644 --- a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java +++ b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java @@ -85,8 +85,8 @@ public class FormWidgetDefinePaneFactoryBase { Appearance dn = defineMap.get(widget.getClass()); DataModify definePane = null; try { - Constructor con = dn.getDefineClass().getConstructor(XCreator.class, FormDesigner.class); - definePane = (DataModify)con.newInstance(creator, designer); + Constructor con = dn.getDefineClass().getConstructor(XCreator.class); + definePane = (DataModify)con.newInstance(creator); operator.did(definePane.dataUI(), dn.getDisplayName()); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), 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 d2f7911455..5a3c37bf9e 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 @@ -10,6 +10,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.FormDesigner; +import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.widget.ui.designer.component.FontSizeComboPane; import com.fr.form.ui.FieldEditor; import com.fr.form.ui.Widget; @@ -38,11 +39,6 @@ public abstract class FieldEditorDefinePane extends Abstr this.initComponents(); } - public FieldEditorDefinePane(XCreator xCreator, FormDesigner designer) { - super(xCreator, designer); - this.initComponents(); - } - protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); labelNameTextField = new UITextField(); @@ -79,6 +75,7 @@ public abstract class FieldEditorDefinePane extends Abstr e.setAllowBlank(this.allowBlankCheckBox.isSelected()); e.setErrorMessage(this.errorMsgTextField.getText()); e.setFontSize(fontSizePane.getValue()); + designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); if (!ComparatorUtils.equals(e.getLabelName(), labelNameTextField.getText())) { XCreator xCreator = designer.getSelectionModel().getSelection().getSelectedCreator(); Widget selectedWidget = xCreator.toData(); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java index 0d22cc99b1..35f918da46 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java @@ -28,10 +28,6 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane super(xCreator); } - public TextFieldEditorDefinePane(XCreator xCreator, FormDesigner designer) { - super(xCreator, designer); - } - @Override protected JPanel setFirstContentPane() { regPane = createRegPane(); From b9aaedc1415c2b8ec65e5e97f0d8adcc918de186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 27 Feb 2018 10:04:00 +0800 Subject: [PATCH 3/3] . --- .../src/com/fr/design/parameter/RootDesignDefinePane.java | 1 - .../fr/design/widget/ui/designer/TextFieldEditorDefinePane.java | 1 - 2 files changed, 2 deletions(-) diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java index 16863ba1de..6cee032503 100644 --- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java @@ -17,7 +17,6 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor; import com.fr.design.widget.ui.designer.AbstractDataModify; diff --git a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java index 35f918da46..cd20e74396 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java @@ -9,7 +9,6 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.mainframe.FormDesigner; import com.fr.design.widget.ui.designer.component.FormWidgetValuePane; import com.fr.form.ui.TextEditor; import com.fr.general.Inter;