From 8046a7668fe57143b262c7562754a1108635a001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 10 Jan 2024 21:14:22 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-111995=20=E4=BB=A3=E7=A0=81=E8=B4=A8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/server/PlatformManagerAction.java | 2 ++ .../dscolumn/ResultSetGroupDockingPane.java | 34 +++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java index d1e2f6f52d..18a73cbbe9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java @@ -1,9 +1,11 @@ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.utils.DesignUtils; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; public class PlatformManagerAction extends UpdateAction { diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java index afc76a1a44..f1c6f3d826 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java @@ -113,7 +113,25 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { } DSColumn dSColumn = (DSColumn) cellElement.getValue(); recordGrouper = dSColumn.getGrouper(); - if (recordGrouper instanceof FunctionGrouper && !((FunctionGrouper) recordGrouper).isCustom()) { + if (recordGrouper instanceof FunctionGrouper) { + populateFunctionGrouper(); + } else if (recordGrouper instanceof SummaryGrouper) { + cardPane.select("summaryPane").populate(); + this.goBox.setSelectedIndex(BIND_SUMMARY); + this.functionComboBox.setFunction(((SummaryGrouper) recordGrouper).getFunction()); + } else if (recordGrouper instanceof CustomGrouper) { + // 自定义分组 or 高级分组 + cardPane.select("groupPane").populate(); + this.goBox.setSelectedIndex(BIND_GROUP); + this.groupComboBox.setSelectedIndex(ADVANCED); + } + checkButtonEnabled(); + //加上面板组件的交互事件监听 + this.addListener(); + } + + private void populateFunctionGrouper() { + if (!((FunctionGrouper) recordGrouper).isCustom()) { int mode = recordGrouper.getDivideMode(); if (mode == FunctionGrouper.GROUPING_MODE) { cardPane.select("groupPane").populate(); @@ -127,24 +145,12 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { cardPane.setVisible(false); this.goBox.setSelectedIndex(BIND_SELECTED); } - } else if (recordGrouper instanceof FunctionGrouper && ((FunctionGrouper) recordGrouper).isCustom()) { + } else { // 这种情况也放到自定义分组里面 cardPane.select("groupPane").populate(); this.goBox.setSelectedIndex(BIND_GROUP); this.groupComboBox.setSelectedIndex(ADVANCED); - } else if (recordGrouper instanceof SummaryGrouper) { - cardPane.select("summaryPane").populate(); - this.goBox.setSelectedIndex(BIND_SUMMARY); - this.functionComboBox.setFunction(((SummaryGrouper) recordGrouper).getFunction()); - } else if (recordGrouper instanceof CustomGrouper) { - // 自定义分组 or 高级分组 - cardPane.select("groupPane").populate(); - this.goBox.setSelectedIndex(BIND_GROUP); - this.groupComboBox.setSelectedIndex(ADVANCED); } - checkButtonEnabled(); - //加上面板组件的交互事件监听 - this.addListener(); } @Override