Merge pull request #1165 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit '8fcb43bc80ed378666636270460023ccd3e8444c':
  REPORT-4233 [9.0一轮回归]日期控件设置不能为空，没有提示

designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java

@@ -128,6 +128,7 @@ public class CellWidgetPropertyPane extends BasicPane {
                 }
             }
         });
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
     }
 
 

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();
         }
     };
 

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);
-        }
     }
 
 

designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@@ -185,7 +185,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 
     @Override
     protected DateEditor updateSubDirectWriteEditorBean() {
-        DateEditor ob = new DateEditor();
+        DateEditor ob = (DateEditor)creator.toData();
         waterMarkDictPane.update(ob);
         ob.setFormatText(this.getSimpleDateFormat().toPattern());
         ob.setReturnDate(returnTypeComboBox.getSelectedIndex() == 0);

designer_form/src/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java

@@ -73,7 +73,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 
 	@Override
 	public IframeEditor updateBean() {
-		IframeEditor ob = new IframeEditor();
+		IframeEditor ob = (IframeEditor)creator.toData();
 		ob.setSrc(srcTextField.getText());
 		List<ParameterProvider> parameterList = parameterViewPane.update();
 		ob.setParameters(parameterList.toArray(new ParameterProvider[parameterList.size()]));

designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java

@@ -85,7 +85,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
 
 	@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());

designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@@ -278,7 +278,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     @Override
     protected NumberEditor updateSubFieldEditorBean() {
 
-        NumberEditor ob = new NumberEditor();
+        NumberEditor ob = (NumberEditor)creator.toData();
         formWidgetValuePane.update(ob);
         ob.setAllowDecimals(allowDecimalsCheckBox.isSelected());
         if (allowDecimalsCheckBox.isSelected()) {

designer_form/src/com/fr/design/widget/ui/designer/RadioDefinePane.java

@@ -41,6 +41,6 @@ public class RadioDefinePane extends AbstractDataModify<Radio> {
 	
 	@Override
 	public Radio updateBean() {
-		return new Radio();
+		return  (Radio)creator.toData();
 	}
 }

designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@@ -108,7 +108,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
 
     @Override
     protected TextEditor updateSubFieldEditorBean() {
-        TextEditor ob = newTextEditorInstance();
+        TextEditor ob = (TextEditor)creator.toData();
         ob.setRegex(this.regPane.update());
         ob.setWaterMark(waterMarkDictPane.getText());
         formWidgetValuePane.update(ob);

designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java

@@ -99,7 +99,7 @@ public class FRAbsoluteLayoutDefinePane extends AbstractDataModify<WAbsoluteLayo
     }
 
     public WAbsoluteLayout updateSubPane() {
-        return new WAbsoluteLayout();
+        return (WAbsoluteLayout)creator.toData();
     }
 
     public void populateSubPane(WAbsoluteLayout ob) {