REPORT-3163 合作开发9.0设计器=>界面微调

designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@@ -113,7 +113,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
 //        mainSplitPane.setOneTouchExpandable(true);
 
         this.add(getLeftPane(), BorderLayout.CENTER);
-        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 12, 10));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 15));
 //        mainSplitPane.setDividerLocation(getLeftPreferredSize());
         this.checkButtonEnabled();
     }
@@ -161,10 +161,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
         topToolBar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = { p, f };
+        double[] columnSize = { p, f, 155};
-        double[] rowSize = { p};
+        double[] rowSize = {20};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(getAddItemText()), topToolBar},
+                new Component[]{new UILabel(getAddItemText()), null, topToolBar},
         };
         JPanel leftTopPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
         leftTopPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 6, 0));

designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -28,12 +28,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private JPanel leftPane;
     private JPanel rightPane;
     private FixedPopupPane currentPopupPane;
-    private static final int CONTAINER_WIDTH = 288;
+    private static final int CONTAINER_WIDTH = 286;
     private static final int TAB_WIDTH = 38;
     private static final int TAB_BUTTON_WIDTH = 32;
     private static final int TAB_BUTTON_HEIGHT = 28;
     private static final int CONTENT_WIDTH = CONTAINER_WIDTH - TAB_WIDTH;
-    private static final int POPUP_TOOLPANE_HEIGHT = 25;
+    private static final int POPUP_TOOLPANE_HEIGHT = 28;
     private static final int ARROW_RANGE_START = CONTENT_WIDTH - 30;
     // 弹出对话框高度
     private static final int POPUP_MIN_HEIGHT = 145;

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -677,8 +677,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.FORM);
         EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(WidgetPropertyPane.getInstance(formDesign));
+        if (formDesign.getParaComponent() != null) {
         EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(formDesign));
         EastRegionContainerPane.getInstance().setParameterHeight(ParameterPropertyPane.getInstance(formDesign).getPreferredSize().height);
+        }
         if (EastRegionContainerPane.getInstance().getWidgetLibPane() == null) {
             new Thread() {
                 public void run() {