REPORT-3293 9.0设计器控件设置重画

designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java

@@ -25,10 +25,6 @@ public class AccessibleBackgroundEditor extends UneditableAccessibleEditor {
         super(new BackgroundWrapper());
     }
 
-    protected void setBorderVisible(){
-        this.setBorder(BorderFactory.createLineBorder(Color.lightGray));
-    }
-
     @Override
     protected void showEditorPane() {
         if (backgroundPane == null) {

designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java

@@ -15,6 +15,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.form.ui.container.WParameterLayout;
+import com.fr.general.Background;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
@@ -112,7 +113,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         WParameterLayout wParameterLayout = (WParameterLayout) creator.toData();
         wParameterLayout.setDesignWidth((int) designerWidth.getValue());
         wParameterLayout.setDelayDisplayContent(displayReport.isSelected());
-        wParameterLayout.setBackground(wParameterLayout.getBackground());
+        wParameterLayout.setBackground((Background) background.getValue());
         wParameterLayout.setPosition(hAlignmentPane.getSelectedIndex());
         return wParameterLayout;
     }

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

@@ -32,11 +32,13 @@ public class ComboBoxDefinePane extends DictEditorDefinePane<ComboBox> {
 
 	protected  void populateSubDictionaryEditorBean(ComboBox ob){
 		removeRepeatCheckBox.setSelected(ob.isRemoveRepeat());
+		waterMarkField.setText(ob.getWaterMark());
 		formWidgetValuePane.populate(ob);
 	}
 
 	protected  ComboBox updateSubDictionaryEditorBean(){
 		ComboBox combo = (ComboBox) creator.toData();
+		combo.setWaterMark(waterMarkField.getText());
 		combo.setRemoveRepeat(removeRepeatCheckBox.isSelected());
 		formWidgetValuePane.update(combo);
 		return combo;

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

@@ -176,7 +176,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         String formatText = e.getFormatText();
         fomatHeadGroup.setSelectedIndex(getDateType(e));
         currentFormatComboBox.setSelectedItem(formatText);
-
+        waterMarkDictPane.populate(e);
 		returnTypeComboBox.setSelectedIndex(e.isReturnDate() ? 0 : 1);
         formWidgetValuePane.populate(e);
         startDv.populate(e.getStartDate());
@@ -186,7 +186,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     @Override
     protected DateEditor updateSubDirectWriteEditorBean() {
         DateEditor ob = new DateEditor();
-
+        waterMarkDictPane.update(ob);
         ob.setFormatText(this.getSimpleDateFormat().toPattern());
         ob.setReturnDate(returnTypeComboBox.getSelectedIndex() == 0);
         formWidgetValuePane.update(ob);

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

@@ -45,7 +45,10 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
-        frFontPane.update(freeButton.getFont());
+        FRFont frFont = freeButton.getFont();
+        if(frFont != null){
+            frFontPane.update(frFont);
+        }
         return freeButton;
     }
 }

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

@@ -41,7 +41,54 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     private JPanel limitNumberPane;
     private WaterMarkDictPane waterMarkDictPane;
 
-    private ActionListener actionListener1 = new ActionListener() {
+    private ActionListener actionListener1;
+
+    private ActionListener actionListener2;
+
+
+    private ActionListener actionListener3;
+
+
+    private ActionListener actionListener4 ;
+
+    private ChangeListener changeListener1;
+
+    private ChangeListener changeListener2 ;
+
+    public NumberEditorDefinePane() {
+        super();
+    }
+
+
+    @Override
+    public String title4PopupWindow() {
+        return "number";
+    }
+
+    @Override
+    protected JPanel setFirstContentPane() {
+        // richer:数字的允许直接编辑没有意义
+        waterMarkDictPane = new WaterMarkDictPane();
+        formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")),  formWidgetValuePane},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane}
+        };
+        double[] rowSize = {p, p, p, p, p};
+        double[] columnSize = {p,f};
+        int[][] rowCount = {{1, 3},{1, 1},{1, 1}};
+        JPanel advancePane =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+        JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        advancePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        boundsPane.add(advancePane);
+        return boundsPane;
+    }
+
+    private void initListeners(){
+        actionListener1 = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 if (allowDecimalsCheckBox.isSelected()) {
                     limitNumberPane.setVisible(true);
@@ -51,7 +98,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
             }
         };
 
-    private ActionListener actionListener2 = new ActionListener() {
+        actionListener2 = new ActionListener() {
 
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -78,7 +125,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         };
 
 
-    private ActionListener actionListener3 = new ActionListener() {
+        actionListener3 = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 if (setMaxValueCheckBox.isSelected()) {
                     maxValueSpinner.setEnabled(true);
@@ -98,7 +145,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         };
 
 
-    private ActionListener actionListener4 = new ActionListener() {
+        actionListener4 = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 if (setMinValueCheckBox.isSelected()) {
                     minValueSpinner.setEnabled(true);
@@ -117,7 +164,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
             }
         };
 
-    private ChangeListener changeListener1 = new ChangeListener() {
+        changeListener1 = new ChangeListener() {
 
             @Override
             public void stateChanged(ChangeEvent e) {
@@ -129,7 +176,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
             }
         };
 
-    private ChangeListener changeListener2 = new ChangeListener() {
+        changeListener2 = new ChangeListener() {
 
             @Override
             public void stateChanged(ChangeEvent e) {
@@ -140,41 +187,10 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
                 }
             }
         };
-
-    public NumberEditorDefinePane() {
-        super();
-    }
-
-
-    @Override
-    public String title4PopupWindow() {
-        return "number";
-    }
-
-    @Override
-    protected JPanel setFirstContentPane() {
-        // richer:数字的允许直接编辑没有意义
-        waterMarkDictPane = new WaterMarkDictPane();
-        formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")),  formWidgetValuePane},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane}
-        };
-        double[] rowSize = {p, p, p, p, p};
-        double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 3},{1, 1},{1, 1}};
-        JPanel advancePane =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
-        JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        advancePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        boundsPane.add(advancePane);
-        return boundsPane;
     }
 
-
     public JPanel setValidatePane() {
+        initListeners();
 //        super.addValidatePane();
         this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
         this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
@@ -218,7 +234,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         double[] rowSize = {p, p, p, p, p};
         double[] columnSize = {p,f};
         int[][] rowCount = {{1, 1},{1, 1},{1, 1},{1, 1},{1, 1}};
-        JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 3);
+        JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
         panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         return panel;
 

designer_form/src/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java

@@ -109,9 +109,12 @@ public class FormWidgetValuePane extends JPanel {
 
     public void populate(DataControl ob) {
         WidgetValue widgetValue = ob.getWidgetValue();
+        if(widgetValue == null){
+            return;
+        }
         for (int i = 0; i < editor.length; i++) {
-            if (editor[i].accept(widgetValue)) {
-                setCardValue(i, widgetValue);
+            if (editor[i].accept(widgetValue.getValue())) {
+                setCardValue(i, widgetValue.getValue());
                 break;
             }
         }

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

@@ -122,8 +122,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
             }
             //这边计算的时候会先把组件间隔去掉
             moveComponents2FitLayout(xfl);
-            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-            formDesigner.getSelectionModel().setSelectedCreator(xfl);
+
 
             for (int i = 0; i < components.length; i++) {
                 Component comp = xfl.getComponent(i);
@@ -139,6 +138,8 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
                 xfl.addCompInterval(xfl.getAcualInterval());
             }
             xfl.toData().setLayoutType(WBodyLayoutType.FIT);
+            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+            formDesigner.getSelectionModel().setSelectedCreator(xfl);
             return true;
         } catch (Exception e) {
             FRLogger.getLogger().error(e.getMessage());