From 74bef58ba34a0c7105185610434b585a636c8f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AC=A7=E6=96=87?= <owen.zou@outlook.com>
Date: Tue, 25 Dec 2018 22:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=89=80=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=83=BD=E4=BC=9A=E5=9C=A8=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 ++
 pom.xml                                       |  2 +-
 .../controller/MainUIController.java          | 23 ++++++++++++++++---
 src/main/resources/fxml/MainUI.fxml           |  2 +-
 .../resources/fxml/selectTableColumn.fxml     |  7 +++---
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9ec64e75..53a034c6 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,8 @@ Eclipse or IntelliJ IDEA中启动, 找到```com.zzg.mybatis.generator.MainUI```
 
 ### 赞助
 本工具纯属个人业余时间开发与维护，如果你觉得软件对你有用，欢迎赞助，金额随意 :)
+
+<img src="https://user-images.githubusercontent.com/3505708/38162358-423d2d18-3512-11e8-9b52-c188bf37671d.png" width="200"> <img src="https://user-images.githubusercontent.com/3505708/38162365-56f8f55c-3512-11e8-8fd8-b8ae4f0ad3c8.png" width="200">
 - - -
 Licensed under the Apache 2.0 License
 
diff --git a/pom.xml b/pom.xml
index 0758df30..b848c50f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.zzg</groupId>
     <artifactId>mybatis-generator-gui</artifactId>
-    <version>0.8.7</version>
+    <version>0.8.8-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/zzg/mybatis/generator/controller/MainUIController.java b/src/main/java/com/zzg/mybatis/generator/controller/MainUIController.java
index 5f81160e..4689d10a 100644
--- a/src/main/java/com/zzg/mybatis/generator/controller/MainUIController.java
+++ b/src/main/java/com/zzg/mybatis/generator/controller/MainUIController.java
@@ -325,9 +325,10 @@ public void saveGeneratorConfig() {
             try {
                 GeneratorConfig generatorConfig = getGeneratorConfigFromUI();
                 generatorConfig.setName(name);
+                ConfigHelper.deleteGeneratorConfig(name);
                 ConfigHelper.saveGeneratorConfig(generatorConfig);
             } catch (Exception e) {
-                AlertUtil.showErrorAlert("删除配置失败");
+                AlertUtil.showErrorAlert("保存配置失败");
             }
         }
     }
@@ -368,11 +369,27 @@ public void setGeneratorConfigIntoUI(GeneratorConfig generatorConfig) {
         generateKeysField.setText(generatorConfig.getGenerateKeys());
         modelTargetProject.setText(generatorConfig.getModelPackageTargetFolder());
         daoTargetPackage.setText(generatorConfig.getDaoPackage());
-        daoTargetProject.setText(generatorConfig.getDaoTargetFolder());
-        mapperTargetPackage.setText(generatorConfig.getMappingXMLPackage());
+		daoTargetProject.setText(generatorConfig.getMapperName());
+		mapperName.setText(generatorConfig.getMapperName());
+		mapperTargetPackage.setText(generatorConfig.getMappingXMLPackage());
         mappingTargetProject.setText(generatorConfig.getMappingXMLTargetFolder());
+        tableNameField.setText(generatorConfig.getTableName());
+        domainObjectNameField.setText(generatorConfig.getDomainObjectName());
+        offsetLimitCheckBox.setSelected(generatorConfig.isOffsetLimit());
+        commentCheckBox.setSelected(generatorConfig.isComment());
+        overrideXML.setSelected(generatorConfig.isOverrideXML());
+        needToStringHashcodeEquals.setSelected(generatorConfig.isNeedToStringHashcodeEquals());
+        useTableNameAliasCheckbox.setSelected(generatorConfig.getUseTableNameAlias());
+        forUpdateCheckBox.setSelected(generatorConfig.isNeedForUpdate());
+        annotationDAOCheckBox.setSelected(generatorConfig.isAnnotationDAO());
+        annotationCheckBox.setSelected(generatorConfig.isAnnotation());
+        useActualColumnNamesCheckbox.setSelected(generatorConfig.isUseActualColumnNames());
         encodingChoice.setValue(generatorConfig.getEncoding());
         useExample.setSelected(generatorConfig.isUseExample());
+        useDAOExtendStyle.setSelected(generatorConfig.isUseDAOExtendStyle());
+        useSchemaPrefix.setSelected(generatorConfig.isUseSchemaPrefix());
+        jsr310Support.setSelected(generatorConfig.isJsr310Support());
+        
     }
 
     @FXML
diff --git a/src/main/resources/fxml/MainUI.fxml b/src/main/resources/fxml/MainUI.fxml
index 4de33f73..a444f11b 100644
--- a/src/main/resources/fxml/MainUI.fxml
+++ b/src/main/resources/fxml/MainUI.fxml
@@ -222,7 +222,7 @@
                                              <HBox.margin>
                                                 <Insets right="10.0" />
                                              </HBox.margin></CheckBox>
-                                           <CheckBox fx:id="useSchemaPrefix" mnemonicParsing="false" selected="true" text="使用Schema前缀" />
+                                           <CheckBox fx:id="useSchemaPrefix" mnemonicParsing="false" text="使用Schema前缀" />
                                        </children>
                                     </HBox>
                                      <HBox prefHeight="100.0" prefWidth="200.0" spacing="18.0">
diff --git a/src/main/resources/fxml/selectTableColumn.fxml b/src/main/resources/fxml/selectTableColumn.fxml
index 18cf955f..97ce33e9 100644
--- a/src/main/resources/fxml/selectTableColumn.fxml
+++ b/src/main/resources/fxml/selectTableColumn.fxml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.Text?>
+
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="526.0" prefWidth="730.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.zzg.mybatis.generator.controller.SelectTableColumnController">
    <children>
       <TableView fx:id="columnListView" editable="true" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
@@ -20,7 +21,7 @@
       </TableView>
       <Button focusTraversable="false" layoutX="642.0" layoutY="453.0" mnemonicParsing="false" onAction="#ok" prefHeight="27.0" prefWidth="59.0" text="确认" AnchorPane.bottomAnchor="13.0" AnchorPane.rightAnchor="29.0" />
       <Button focusTraversable="false" layoutX="556.0" layoutY="486.0" mnemonicParsing="false" onAction="#cancel" text="取消" AnchorPane.bottomAnchor="13.0" AnchorPane.rightAnchor="113.0" />
-      <Text layoutX="12.0" layoutY="64.0" lineSpacing="5.0" strokeType="OUTSIDE" strokeWidth="0.0" text="2. 如果要定制列的Java数据类型, 字段名或者自动类型转换双击对应的地方编辑即可" wrappingWidth="706.0" />
-      <Text layoutX="14.0" layoutY="35.0" strokeType="OUTSIDE" strokeWidth="0.0" text="1. 如果要忽略请取消列的选择" />
+      <Text layoutX="12.0" layoutY="62.0" lineSpacing="5.0" strokeType="OUTSIDE" strokeWidth="0.0" text="2. 如果要定制列的Java数据类型, 编辑Java Type和Property Name或者你自己的Type Handler, 注意要按Enter键保存，然后再点击确认方可生效。" wrappingWidth="706.0" />
+      <Text layoutX="14.0" layoutY="35.0" strokeType="OUTSIDE" strokeWidth="0.0" text="1. 如果不想生成某列请取消勾选对应的列" />
    </children>
 </AnchorPane>