Merge pull request #771 in BA/design from ~MANGO/design:release to release

* commit '3517d4546fd28f761d2f06cd9b8b7ca733509f3f':
  调整布局
  调整布局
  还原修改

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -45,7 +45,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         ChartCollection cc = createChartCollection();
 		
 		chartComponent = new ChartComponent();
-		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+		chartComponent.setPreferredSize(new Dimension(200, 170));// 在单元格弹出时 需要调整保证属性表的大小.
 		chartComponent.setSupportEdit(false);
 		chartComponent.populate(cc);
 		

designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@@ -79,7 +79,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
 
         eastPane.setLayout(new BorderLayout());
 
-        eastPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 10));
+        eastPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 5));
         JPanel button = new JPanel();
         button.setPreferredSize(new Dimension(45, 20));
         button.setLayout(new GridLayout(1, 2, 5, 0));