From 68c08af6411b072f48004386c5ef5b9f71e2ef0a Mon Sep 17 00:00:00 2001 From: fr_shine Date: Fri, 18 Nov 2016 15:36:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 052fee20d..92177a8e3 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/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() { From 422e021582a5fae426e79774d77dc34e22f30db4 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Fri, 18 Nov 2016 16:20:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AF=E8=AE=BE=E7=BD=AEdialog=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/frpane/UICorrelationComboBoxPane.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java b/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java index c5837727e..b2e30f41f 100644 --- a/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java +++ b/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());