From 88b8591d034f3f4191a56c44b058be2f4b079e12 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 5 Sep 2017 15:56:06 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4361=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=85=83=E7=B4=A0=20=E6=95=B0=E6=8D=AE=E5=88=97=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AE=BE=E7=BD=AE=20=E5=88=86=E7=BB=84=20=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dscolumn/ResultSetGroupDockingPane.java | 37 ++++++++++++------- .../cellquick/CellDSColumnEditor.java | 2 +- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java index 530c92f84..da32086d9 100644 --- a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java +++ b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java @@ -7,7 +7,6 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.mainframe.ElementCasePane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.report.cell.TemplateCellElement; @@ -41,12 +40,12 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { private ItemListener listener; - public ResultSetGroupDockingPane(ElementCasePane ePane) { + public ResultSetGroupDockingPane() { super(); - this.initComponents(ePane); + this.initComponents(); } - public void initComponents(ElementCasePane ePane) { + public void initComponents() { goBox = new UIComboBox(new String[]{Inter.getLocText("BindColumn-Group"), Inter.getLocText("BindColumn-Select"), Inter.getLocText("BindColumn-Summary")}); initCardPane(); contentPane = layoutPane(); @@ -66,22 +65,23 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { }; goBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent ee) { - checkButtonEnabled(); int i = goBox.getSelectedIndex(); if (i == BIND_GROUP) { cardLayout.show(cardPane, "groupPane"); - cardPane.setPreferredSize(new Dimension(156, 20)); - TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane,2,10); + cardPane.setPreferredSize(new Dimension(158, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 10); + checkButtonEnabled(); } else if (i == BIND_SELECTED) { cardLayout.show(cardPane, "listPane"); cardPane.setPreferredSize(new Dimension(0, 0)); - TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane,2,0); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); } else if (i == BIND_SUMMARY) { cardLayout.show(cardPane, "summaryPane"); - cardPane.setPreferredSize(new Dimension(156, 20)); - TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane,2,10); + cardPane.setPreferredSize(new Dimension(158, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 10); CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr(); cellExpandAttr.setDirection(Constants.NONE); + checkButtonEnabled(); } } }); @@ -96,7 +96,6 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { cardLayout = new CardLayout(); cardPane.setLayout(cardLayout); - JPanel pane = new JPanel(new BorderLayout(3, 0)); groupComboBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { checkButtonEnabled(); @@ -104,7 +103,9 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { }); advancedButton = new UIButton(Inter.getLocText("Custom")); advancedButton.addActionListener(groupAdvancedListener); - pane.add(groupComboBox, BorderLayout.WEST); + + JPanel pane = new JPanel(new BorderLayout(0, 10)); + pane.add(groupComboBox, BorderLayout.NORTH); pane.add(advancedButton, BorderLayout.CENTER); cardPane.add(pane, "groupPane"); @@ -124,7 +125,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { // RecordGrouper recordGrouper = dSColumn.getGrouper(); if (recordGrouper instanceof FunctionGrouper && !((FunctionGrouper) recordGrouper).isCustom()) { - int mode = ((FunctionGrouper) recordGrouper).getDivideMode(); + int mode = recordGrouper.getDivideMode(); if (mode == FunctionGrouper.GROUPING_MODE) { cardLayout.show(cardPane, "groupPane"); this.goBox.setSelectedIndex(BIND_GROUP); @@ -152,7 +153,6 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { this.goBox.setSelectedIndex(BIND_GROUP); this.groupComboBox.setSelectedIndex(ADVANCED); } - checkButtonEnabled(); } @@ -190,6 +190,15 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { advancedButton.setEnabled(true); } } + if (advancedButton.isEnabled()) { + cardPane.setPreferredSize(new Dimension(158, 50)); + cardPane.revalidate(); + cardPane.repaint(); + } else { + cardPane.setPreferredSize(new Dimension(158, 20)); + cardPane.revalidate(); + cardPane.repaint(); + } } public void addListener(ItemListener listener) { diff --git a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 4ea7a138c..1399ad2eb 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -217,7 +217,7 @@ public class CellDSColumnEditor extends CellQuickEditor { DSColumnBasicEditorPane() { dataPane = new SelectedDataColumnPane(true, true, tc, cellElement); - groupPane = new ResultSetGroupDockingPane(tc); + groupPane = new ResultSetGroupDockingPane(); dataPane.addListener(dataListener); groupPane.addListener(groupListener);