From ce2736ce7e3935d685e4faf094a4f35cca659b3d Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 1 Sep 2017 15:27:16 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4233=20[9.0=E4=B8=80=E8=BD=AE=E5=9B=9E?= =?UTF-8?q?=E5=BD=92]=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/CellWidgetPropertyPane.java | 1 + designer/src/com/fr/design/widget/WidgetPane.java | 2 -- .../mainframe/widget/ui/FormWidgetCardPane.java | 14 -------------- .../widget/ui/designer/DateEditorDefinePane.java | 2 +- .../widget/ui/designer/IframeEditorDefinePane.java | 2 +- .../widget/ui/designer/MultiFileEditorPane.java | 2 +- .../widget/ui/designer/NumberEditorDefinePane.java | 2 +- .../design/widget/ui/designer/RadioDefinePane.java | 2 +- .../ui/designer/TextFieldEditorDefinePane.java | 2 +- .../layout/FRAbsoluteLayoutDefinePane.java | 2 +- 10 files changed, 8 insertions(+), 23 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java b/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java index 60f45450c..f9224b3c6 100644 --- a/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java +++ b/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java @@ -129,6 +129,7 @@ public class CellWidgetPropertyPane extends BasicPane { } } }); + DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); } diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index fdfba03a2..10ebf66a5 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -12,7 +12,6 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.CellWidgetPropertyPane; -import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.widget.btn.ButtonConstants; import com.fr.form.ui.Button; @@ -94,7 +93,6 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener @Override public void attributeChange() { CellWidgetPropertyPane.getInstance().update(); - DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); } }; 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 fe5c305ac..7fdb11e66 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 @@ -206,20 +206,6 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { widgetBoundPane.update(); } fireValueChanged(); - - if (xCreator.acceptType(XWScaleLayout.class)) { - XCreator xCreator1 = xCreator.getEditingChildCreator(); - xCreator1.resetData(widget); - xCreator.removeAll(); - xCreator.add(xCreator1); - }else if(xCreator.acceptType(XWTitleLayout.class)){ - XCreator xCreator1 = ((XWTitleLayout) xCreator).getXCreator(0); - xCreator1.resetData(widget); - xCreator.removeAll(); - xCreator.add(xCreator1); - } else { - xCreator.resetData(widget); - } } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 2a99a9965..966244c37 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -185,7 +185,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane { @Override public IframeEditor updateBean() { - IframeEditor ob = new IframeEditor(); + IframeEditor ob = (IframeEditor)creator.toData(); ob.setSrc(srcTextField.getText()); List parameterList = parameterViewPane.update(); ob.setParameters(parameterList.toArray(new ParameterProvider[parameterList.size()])); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java b/designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java index 40797f9f4..714f26882 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java @@ -85,7 +85,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane @Override protected MultiFileEditor updateSubFieldEditorBean() { - MultiFileEditor ob = new MultiFileEditor(); + MultiFileEditor ob = (MultiFileEditor)creator.toData(); ob.setAccept((String) acceptType.getSelectedItem()); ob.setSingleFile(singleFileCheckBox.isSelected()); ob.setMaxSize(fileSizeField.getValue()); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java index 00f204f1c..9387df85c 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java @@ -278,7 +278,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane @Override protected NumberEditor updateSubFieldEditorBean() { - NumberEditor ob = new NumberEditor(); + NumberEditor ob = (NumberEditor)creator.toData(); formWidgetValuePane.update(ob); ob.setAllowDecimals(allowDecimalsCheckBox.isSelected()); if (allowDecimalsCheckBox.isSelected()) { diff --git a/designer_form/src/com/fr/design/widget/ui/designer/RadioDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/RadioDefinePane.java index 8ca631cff..afb618bd6 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/RadioDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/RadioDefinePane.java @@ -41,6 +41,6 @@ public class RadioDefinePane extends AbstractDataModify { @Override public Radio updateBean() { - return new Radio(); + return (Radio)creator.toData(); } } \ No newline at end of file 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 5378c00ed..cc5abe66e 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 @@ -108,7 +108,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane @Override protected TextEditor updateSubFieldEditorBean() { - TextEditor ob = newTextEditorInstance(); + TextEditor ob = (TextEditor)creator.toData(); ob.setRegex(this.regPane.update()); ob.setWaterMark(waterMarkDictPane.getText()); formWidgetValuePane.update(ob); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java index 94141e4bb..05b0e2636 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java @@ -99,7 +99,7 @@ public class FRAbsoluteLayoutDefinePane extends AbstractDataModify