架构调整

Former-commit-id: 9ce25fba97dfbfa9610f95f37136a0c2a78249d5

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -87,14 +87,16 @@ public class JavaFxApplication extends Application {
     private ContextMenu table_right_menu;
     private XEventHandler xEventHandler = new XEventHandler();
     private boolean dragMD = false;
+    private Stage primaryStage;
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-
+        this.primaryStage = primaryStage;
         BorderPane root = mMainLoader.getRoot();
 
         primaryStage.setTitle("DBtool");
         primaryStage.setScene(new Scene(root, 700, 500));
+        primaryStage.centerOnScreen();
         primaryStage.show();
 
         primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
@@ -591,6 +593,30 @@ public class JavaFxApplication extends Application {
                     }
                 }
             });
+            detailTableController.getSys().selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    currentTable.setSys(newValue);
+                }
+            });
+            detailTableController.getAjax().selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    currentTable.setAjax(newValue);
+                }
+            });
+            detailTableController.getHtml().selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    currentTable.setHtml(newValue);
+                }
+            });
+            detailTableController.getApi().selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    currentTable.setApi(newValue);
+                }
+            });
             detailTableController.getCreate().selectedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
@@ -651,28 +677,10 @@ public class JavaFxApplication extends Application {
                     }
                 }
             });
-            detailTableController.getSys().selectedProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    currentTable.setSys(newValue);
-                }
-            });
-            detailTableController.getAjax().selectedProperty().addListener(new ChangeListener<Boolean>() {
+            detailTableController.getAdd().setOnMouseClicked(new EventHandler<MouseEvent>() {
                 @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    currentTable.setAjax(newValue);
-                }
-            });
-            detailTableController.getHtml().selectedProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    currentTable.setHtml(newValue);
-                }
-            });
-            detailTableController.getApi().selectedProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    currentTable.setApi(newValue);
+                public void handle(MouseEvent event) {
+                    Dialog.showInput(primaryStage, "新增业务", "请输入:");
                 }
             });
         }

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java

@@ -1,8 +1,10 @@
 package xyz.wbsite.dbtool.javafx.ctrl;
 
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
 
 public class DetailTableController {
 
@@ -11,6 +13,10 @@ public class DetailTableController {
     @FXML
     private TextField tablecomment;
 
+    @FXML
+    private FlowPane methods;
+    @FXML
+    private Button add;
     @FXML
     private CheckBox create;
     @FXML
@@ -32,6 +38,22 @@ public class DetailTableController {
     @FXML
     private CheckBox api;
 
+    public FlowPane getMethods() {
+        return methods;
+    }
+
+    public void setMethods(FlowPane methods) {
+        this.methods = methods;
+    }
+
+    public Button getAdd() {
+        return add;
+    }
+
+    public void setAdd(Button add) {
+        this.add = add;
+    }
+
     public CheckBox getCreate() {
         return create;
     }

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -20,6 +20,7 @@ import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
+import javafx.scene.control.TextInputDialog;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.VBox;
@@ -49,6 +50,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
@@ -874,6 +876,27 @@ public class Dialog {
         popup.show();
     }
 
+    public static void showInput(Stage stage, String title, String hint) {
+        TextInputDialog dialog = new TextInputDialog("");
+        dialog.setTitle(title);
+        dialog.setHeaderText(null);
+        dialog.setContentText(hint);
+        double x = stage.getX();
+        double y = stage.getY();
+        double width = stage.getWidth();
+        double height = stage.getHeight();
+        double awidth = dialog.getWidth();
+        double aheight = dialog.getHeight();
+
+        dialog.setX(stage.getX() + stage.getWidth() / 2);
+        dialog.setY(stage.getY() + stage.getHeight() / 2 );
+        Optional<String> result = dialog.showAndWait();
+
+        if (result.isPresent()) {
+            System.out.println("Your name: " + result.get());
+        }
+    }
+
     private static void check(OptionApiController controller, boolean check, String key) {
         for (Api api : controller.getData()) {
             if (api.getMethod().contains(key)) {

src/main/resources/fxml/DetailTable.fxml

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
+
 <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
-          xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
+          xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="xyz.wbsite.dbtool.javafx.ctrl.DetailTableController">
     <columnConstraints>
         <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
@@ -20,22 +24,37 @@
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
     </rowConstraints>
     <children>
-        <Label GridPane.rowIndex="0" GridPane.columnIndex="0" text="*" alignment="CENTER" textAlignment="CENTER"
-               textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
-        <Label GridPane.rowIndex="0" GridPane.columnIndex="1" text="对象名称" GridPane.halignment="CENTER"
+        <Label alignment="CENTER" text="*" textAlignment="CENTER" textFill="RED" GridPane.columnIndex="0"
+               GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.valignment="CENTER"/>
+        <Label text="对象名称" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="0"
+               GridPane.valignment="CENTER"/>
+        <TextField fx:id="tablename" GridPane.columnIndex="2" GridPane.rowIndex="0"/>
+
+        <Label alignment="CENTER" text="*" textAlignment="CENTER" textFill="RED" GridPane.columnIndex="0"
+               GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER"/>
+        <Label text="对象注释" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1"
                GridPane.valignment="CENTER"/>
-        <TextField GridPane.rowIndex="0" GridPane.columnIndex="2" fx:id="tablename"/>
+        <TextField fx:id="tablecomment" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
 
-        <Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="*" alignment="CENTER" textAlignment="CENTER"
-               textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
-        <Label GridPane.rowIndex="1" GridPane.columnIndex="1" text="对象注释" GridPane.halignment="CENTER"
+        <Label text="基础配置" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2"
                GridPane.valignment="CENTER"/>
-        <TextField GridPane.rowIndex="1" GridPane.columnIndex="2" fx:id="tablecomment"/>
-        <Label GridPane.rowIndex="2" GridPane.columnIndex="1" text="基本方法" GridPane.halignment="CENTER"
+
+        <HBox alignment="CENTER_LEFT" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2"
+              GridPane.valignment="CENTER">
+            <children>
+                <CheckBox fx:id="sys" selected="true" text="系统字段" GridPane.columnIndex="2" GridPane.rowIndex="4"/>
+                <CheckBox fx:id="ajax" selected="false" text="AJAX接口" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
+                <CheckBox fx:id="html" selected="false" text="HTML页面" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
+                <CheckBox fx:id="api" selected="false" text="API接口" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
+            </children>
+        </HBox>
+
+        <Label text="基本业务" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3"
                GridPane.valignment="CENTER"/>
-        <HBox GridPane.rowIndex="2" GridPane.columnIndex="2" alignment="CENTER_LEFT" GridPane.halignment="CENTER"
+        <FlowPane alignment="CENTER_LEFT" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3"
                   GridPane.valignment="CENTER">
             <children>
                 <CheckBox fx:id="create" mnemonicParsing="false" text="create"/>
@@ -45,19 +64,15 @@
                 <CheckBox fx:id="get" mnemonicParsing="false" text="get"/>
                 <CheckBox fx:id="search" mnemonicParsing="false" text="search"/>
             </children>
-        </HBox>
+        </FlowPane>
 
-        <Label GridPane.rowIndex="3" GridPane.columnIndex="1" text="其他配置" GridPane.halignment="CENTER"
+        <Label text="扩展业务" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="4"
                GridPane.valignment="CENTER"/>
-
-        <HBox GridPane.rowIndex="3" GridPane.columnIndex="2" alignment="CENTER_LEFT" GridPane.halignment="CENTER"
-              GridPane.valignment="CENTER">
+        <FlowPane fx:id="methods" alignment="CENTER_LEFT" GridPane.columnIndex="2" GridPane.halignment="CENTER"
+                  GridPane.rowIndex="4" GridPane.valignment="CENTER">
             <children>
-                <CheckBox fx:id="sys" selected="true" GridPane.rowIndex="4" GridPane.columnIndex="2" text="系统字段"/>
-                <CheckBox fx:id="ajax" selected="false" GridPane.rowIndex="3" GridPane.columnIndex="2" text="AJAX接口"/>
-                <CheckBox fx:id="html" selected="false" GridPane.rowIndex="3" GridPane.columnIndex="2" text="HTML页面"/>
-                <CheckBox fx:id="api" selected="false" GridPane.rowIndex="3" GridPane.columnIndex="2" text="API接口"/>
+                <Button fx:id="add" mnemonicParsing="false" text="+"/>
             </children>
-        </HBox>
+        </FlowPane>
     </children>
 </GridPane>

src/main/resources/fxml/main.fxml

@@ -13,8 +13,8 @@
 <?import javafx.scene.control.TreeView?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.Pane?>
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
-            prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.91" xmlns:fx="http://javafx.com/fxml/1"
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0"
+            prefWidth="700.0" xmlns="http://javafx.com/javafx/8.0.91" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="xyz.wbsite.dbtool.javafx.ctrl.MainController">
     <top>
         <MenuBar BorderPane.alignment="CENTER">

src/main/resources/modules/SpringBoot/java/frame/utils/RandomUtil.java

@@ -30,10 +30,4 @@ public class RandomUtil {
         }
         return rs.toString();
     }
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 5; i++) {
-            System.out.println(getString("12345ABCDE", 10));
-        }
-    }
 }