diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java index c599d56..98131eb 100644 --- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java +++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java @@ -53,11 +53,17 @@ public class GroupManagementController { // groupDataModel.setSelectedGroupType(newValue.); } }); - ProcessChain.create() + initData(); + + } + + private void initData() { + ProcessChain.create().addRunnableInPlatformThread(() -> { + tabPane.getTabs().clear(); + }) .addSupplierInExecutor(() -> Request.connector(GroupTypeFeign.class).getAllGroupTypes()) .addConsumerInPlatformThread(rel -> { for (GroupTypeVO groupType : rel) { - Tab tab = new Tab(groupType.getName()); Flow flow = new Flow(GroupDetailController.class); ViewFlowContext viewFlowContext = new ViewFlowContext(); @@ -74,8 +80,11 @@ public class GroupManagementController { .run(); } - @OnEvent("test-message") - private void onNewChatMessage(Event e) { + @OnEvent("refresh") + private void onRefresh(Event e) { System.err.println(this.getClass() + "\t" + e.getContent()); + + initData(); + } } diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java index e9ea7d6..4e431ee 100644 --- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java +++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java @@ -15,6 +15,8 @@ import io.datafx.controller.flow.action.ActionTrigger; import io.datafx.controller.flow.context.FXMLViewFlowContext; import io.datafx.controller.flow.context.ViewFlowContext; import io.datafx.core.concurrent.ProcessChain; +import io.datafx.eventsystem.Event; +import io.datafx.eventsystem.OnEvent; import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.geometry.Pos; @@ -306,4 +308,11 @@ public class GroupTypeManagementController { } + @OnEvent("refresh") + private void onRefresh(Event e) { + System.err.println(this.getClass() + "\t" + e.getContent()); + + initData(); + + } } diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java index 59c68ff..9585c6f 100644 --- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java +++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java @@ -176,9 +176,9 @@ public class MenuManagementController { deleteButton.setToggleGroup(group); try { - addButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY+".add-circle-outline")); - editButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY+".create-outline")); - deleteButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY+".trash-outline")); + addButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".add-circle-outline")); + editButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".create-outline")); + deleteButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".trash-outline")); } catch (Exception e) { e.printStackTrace(); } @@ -260,7 +260,7 @@ public class MenuManagementController { parentIdTextField.setDisable(true); cancelButton.setOnAction(event -> { - infoPane.setDisable(true); + infoPane.setDisable(true); }); @@ -686,8 +686,11 @@ public class MenuManagementController { dialog.close(); } - @OnEvent("test-message") - private void onNewChatMessage(Event e) { + @OnEvent("refresh") + private void onRefresh(Event e) { System.err.println(this.getClass() + "\t" + e.getContent()); + + initTreeData(); + } } diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java index 8b85c88..88189a9 100644 --- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java +++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java @@ -25,6 +25,8 @@ import io.datafx.controller.flow.context.ActionHandler; import io.datafx.controller.flow.context.FlowActionHandler; import io.datafx.controller.util.VetoException; import io.datafx.core.concurrent.ProcessChain; +import io.datafx.eventsystem.Event; +import io.datafx.eventsystem.OnEvent; import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.geometry.Pos; @@ -377,4 +379,12 @@ public class UserManagementController { private void test() { System.err.println(); } + + @OnEvent("refresh") + private void onRefresh(Event e) { + System.err.println(this.getClass() + "\t" + e.getContent()); + + search(); + + } } diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java index 2f622c2..4805ad5 100644 --- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java +++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java @@ -89,7 +89,7 @@ public class MainController { private JFXToggleButton styleBut; //刷新按钮 @FXML - @EventTrigger("test-message1") + @EventTrigger("refresh") private JFXButton refreshButton; //内容面板tabPane @@ -224,15 +224,12 @@ public class MainController { return popOver; } - @EventProducer("test-message") - private String getMessage() { + @EventProducer("refresh") + private String refresh() { return "--------=================-----------"; } - @EventProducer("test-message1") - private String getMessage1() { - return "--------=================-----------"; - } + private void initData() { diff --git a/client/src/main/resources/fxml/main/components/user_info.fxml b/client/src/main/resources/fxml/main/components/user_info.fxml index 2f5ec20..d22dae9 100644 --- a/client/src/main/resources/fxml/main/components/user_info.fxml +++ b/client/src/main/resources/fxml/main/components/user_info.fxml @@ -8,14 +8,13 @@ - - - + + - +