Merge pull request #525 in BA/design from ~ZHENG/design:dev to dev

* commit '422e021582a5fae426e79774d77dc34e22f30db4':
  可设置dialog size
  聚合报表没有单元格数据源

designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java

@@ -46,6 +46,7 @@ import com.fr.stable.StringUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
+    private static final Dimension DIALOG_SIZE = new Dimension(500, 500);
     private JPopupMenu popMenu;
     private UIMenuTable tablePane;
     private UIButton addButton;
@@ -79,6 +80,9 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
         }
     }
 
+    protected Dimension getDialogSize() {
+        return DIALOG_SIZE;
+    }
 
     /**
      * 刷新下拉列表和按钮
@@ -120,7 +124,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
                                 fireTargetChanged();
                             }
                         });
-                        dialog.setSize(500, 500);
+                        dialog.setSize(getDialogSize());
                         GUICoreUtils.centerWindow(dialog);
                         dialog.setVisible(true);
                     }
@@ -202,7 +206,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
                         fireTargetChanged();
                     }
                 });
-                dialog.setSize(500, 500);
+                dialog.setSize(getDialogSize());
                 dialog.setVisible(true);
             } else {
                 popMenu.show(UICorrelationComboBoxPane.this, addButton.getX() + 1, addButton.getY() + addButton.getHeight());

designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -168,7 +168,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
     }
 
     protected ChartDataPane createChartDataPane(String plotID) {
-        return ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+        ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+        chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData());
+        return chartDataPane;
     }
 
     protected void addTypePane() {