diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java index da2aab65..af474a71 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java @@ -693,11 +693,21 @@ public class JavaFxApplication extends Application { Field field = currentTable.getFields().get(row); String newValue = (String) event.getNewValue(); + if (mainController.getMcdx().isSelected()) { + newValue = Tool.any2Underline(newValue); + } + field.setFieldName(newValue); - if (newValue.endsWith("_ID")) { + if (newValue.toUpperCase().endsWith("_ID")) { field.setFieldType(FieldType.Long); - loadTable(); } + if (newValue.toUpperCase().endsWith("_TIME") || newValue.toUpperCase().endsWith("_DATE")) { + field.setFieldType(FieldType.Date); + } + if (newValue.toUpperCase().endsWith("_TYPE")) { + field.setFieldType(FieldType.Dict); + } + loadTable(); } }); diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java index 9512565b..bf7b8592 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java @@ -5,6 +5,7 @@ import javafx.event.Event; import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Button; +import javafx.scene.control.CheckBox; import javafx.scene.control.TableView; import javafx.scene.control.TreeView; import javafx.scene.layout.Pane; @@ -31,6 +32,8 @@ public class MainController { private Button add; @FXML private Button sub; + @FXML + private CheckBox mcdx; private JavaFxApplication main; @@ -214,4 +217,12 @@ public class MainController { modelSave(actionEvent); System.exit(0); } + + public CheckBox getMcdx() { + return mcdx; + } + + public void setMcdx(CheckBox mcdx) { + this.mcdx = mcdx; + } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java index 2f55d03b..f41cea4d 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java @@ -97,6 +97,21 @@ public class Tool { return ""; } + + /** + * abbCdd AbbCdd abbc --> ABB_CDD + * + * @param param + * @return + */ + public static String any2Underline(String param) { + if (param == null || "".equals(param.trim())) { + return ""; + } + param = param.replaceAll("([a-z0-9])([A-Z])", "$1_$2"); + return param.toUpperCase(); + } + /** * FileCreateRequest -> create * diff --git a/src/main/resources/fxml/main.fxml b/src/main/resources/fxml/main.fxml index 90b6c7ae..a6dce381 100644 --- a/src/main/resources/fxml/main.fxml +++ b/src/main/resources/fxml/main.fxml @@ -12,10 +12,9 @@ - @@ -74,8 +73,9 @@ -