From c29ef0a9d5a371be1ffc0781da0700539470b28a Mon Sep 17 00:00:00 2001 From: wangbing <1919101440@qq.com> Date: Fri, 22 Nov 2019 00:24:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manger/callable/SpringBootCallable.java | 2 +- .../xyz/wbsite/dbtool/javafx/po/Field.java | 8 +- .../dbtool/javafx/po/MySqlDBmapper.java | 2 + .../dbtool/javafx/po/OracleDBmapper.java | 2 + .../SpringBoot/resources/static/css/base.css | 56 +++++-- .../resources/templates/control/header.ftl | 119 --------------- .../resources/templates/screen/module/mgr.ftl | 137 ++++++++++++++---- .../templates/screen/module/system/dict.ftl | 20 +-- .../screen/module/system/dictItem.ftl | 20 +-- 9 files changed, 167 insertions(+), 199 deletions(-) delete mode 100644 src/main/resources/modules/SpringBoot/resources/templates/control/header.ftl diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java index 9de6dab6..a77a1fcc 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java @@ -833,7 +833,7 @@ public class SpringBootCallable implements Callable { File system = new File(screen.getAbsolutePath(), "system"); system.mkdirs(); Tool.outputResource(option + "/resources/templates/control/nav.ftl", new File(control.getAbsolutePath(), "nav.ftl")); - Tool.outputResource(option + "/resources/templates/control/header.ftl", new File(control.getAbsolutePath(), "header.ftl")); +// Tool.outputResource(option + "/resources/templates/control/header.ftl", new File(control.getAbsolutePath(), "header.ftl")); // Tool.outputResource(option + "/resources/templates/control/footer.ftl", new File(control.getAbsolutePath(), "footer.ftl")); Tool.outputResource(option + "/resources/templates/control/macro.ftl", new File(control.getAbsolutePath(), "macro.ftl")); // Tool.outputResource(option + "/resources/templates/control/mint-ui-extend.ftl", new File(control.getAbsolutePath(), "mint-ui-extend.ftl")); diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java index 82f766e4..bb408e8c 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java @@ -114,7 +114,11 @@ public class Field extends Table { value = "true"; } else if (fieldType.name().matches("Dict")) { value = "\"code\""; - } else if (fieldType.name().matches("Byte|Short|Integer")) { + } else if (fieldType.name().matches("Byte")) { + value = "(byte)1"; + } else if (fieldType.name().matches("Short")) { + value = "(short)1"; + }else if (fieldType.name().matches("Integer")) { value = "1"; } else if (fieldType.name().matches("Bytes")) { value = "null"; @@ -128,8 +132,6 @@ public class Field extends Table { value = "'A'"; } else if (fieldType.name().matches("Date")) { value = "new Date()"; - } else if (fieldType.name().matches("Date")) { - value = "new Date()"; } else if (fieldType.name().matches("BigDecimal")) { value = "new BigDecimal()"; } else if (fieldType.name().matches("String_super")) { diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java index 17d9c2e0..2180753e 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java @@ -81,6 +81,8 @@ public class MySqlDBmapper extends AbstractDBmapper { sb.append("DATETIME"); } else if (FieldType.Bytes.name().equals(type.name())) { sb.append("BLOB"); + } else if (FieldType.Character.name().equals(type.name())) { + sb.append("CHAR(1)"); } else if (FieldType.String_1.name().equals(type.name())) { sb.append("CHAR(1)"); } else if (FieldType.String_10.name().equals(type.name())) { diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java index da063c74..7e58792d 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java @@ -32,6 +32,8 @@ public class OracleDBmapper extends AbstractDBmapper { sb.append("DATE"); } else if (FieldType.Bytes.name().equals(type.name())) { sb.append("BLOB"); + } else if (FieldType.Character.name().equals(type.name())) { + sb.append("CHAR(1)"); } else if (FieldType.String_1.name().equals(type.name())) { sb.append("CHAR(1)"); } else if (FieldType.String_10.name().equals(type.name())) { diff --git a/src/main/resources/modules/SpringBoot/resources/static/css/base.css b/src/main/resources/modules/SpringBoot/resources/static/css/base.css index 0d33d762..2fef3769 100644 --- a/src/main/resources/modules/SpringBoot/resources/static/css/base.css +++ b/src/main/resources/modules/SpringBoot/resources/static/css/base.css @@ -7,6 +7,20 @@ font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif; } +::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +::-webkit-scrollbar-thumb { + background-color: #e8e8e8; + border-radius: 3px; +} + +::-webkit-scrollbar-track { + background-color: #f9f9f9; +} + html { line-height: 1.15; -ms-text-size-adjust: 100%; @@ -386,9 +400,11 @@ code { .m-t-50 { margin-top: 50px; } -.center{ + +.center { text-align: center; } + .full { width: 100%; height: 100%; @@ -591,21 +607,11 @@ code { width: 55px; padding: 0px 5px; } -.page_list p{ + +.page_list p { padding: 0px 20px; line-height: 35px; } -::-webkit-scrollbar { - width: 7px; - height: 7px; - background-color: #ffffff; -} -::-webkit-scrollbar-thumb { - background-color: #16C0F8; -} -::-webkit-scrollbar-track { - background-color: #ffffff; -} .el-scrollbar.hidden_x > .el-scrollbar__wrap { overflow-x: hidden !important; @@ -685,3 +691,27 @@ code { height: 50px; width: 100%; } + +/* 以下为APP样式 */ +#app { + padding: 10px; +} + +.box-card { + margin: 10px; +} + +.box-card.search .el-form-item__content, +.box-card.search .el-form-item__content > div { + width: 220px; +} + +.form .el-dialog { + width: 700px; +} + +.form .el-dialog .el-form-item__content, +.form .el-dialog .el-form-item__content > div{ + width: 220px; +} +/* 以上为APP样式 */ \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/header.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/header.ftl deleted file mode 100644 index d4b1752f..00000000 --- a/src/main/resources/modules/SpringBoot/resources/templates/control/header.ftl +++ /dev/null @@ -1,119 +0,0 @@ - - diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl index 8fb53ee5..95c7ba10 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl @@ -1,11 +1,63 @@
- + <#list fields as item> <#if item.isQuery> +<#if item.fieldType.javaType() =="Boolean"> + + + 是 + 否 + + +<#elseif item.fieldType.javaType() =="String" && item.fieldType != "Dict"> +<#elseif item.fieldType.javaType() =="String" && item.fieldType == "Dict"> + +<#elseif item.fieldType.javaType() =="Byte"> + + + +<#elseif item.fieldType.javaType() =="Short"> + + + +<#elseif item.fieldType.javaType() =="Integer"> + + + +<#elseif item.fieldType.javaType() =="Long"> + + + +<#elseif item.fieldType.javaType() =="Float"> + + + +<#elseif item.fieldType.javaType() =="Double"> + + + +<#elseif item.fieldType.javaType() =="Character"> + + + +<#elseif item.fieldType.javaType() =="Date"> + + + + +<#elseif item.fieldType.javaType() =="BigDecimal"> + + + + @@ -24,13 +76,65 @@ -<#list fields as item> -<#if item.isQuery && !item.isSystem> - - - - - + <#list fields as item> + <#if !item.isSystem> + <#if item.fieldType.javaType() =="Boolean"> + + + 是 + 否 + + + <#elseif item.fieldType.javaType() =="String" && item.fieldType != "Dict"> + + + + <#elseif item.fieldType.javaType() =="String" && item.fieldType == "Dict"> + + <#elseif item.fieldType.javaType() =="Byte"> + + + + <#elseif item.fieldType.javaType() =="Short"> + + + + <#elseif item.fieldType.javaType() =="Integer"> + + + + <#elseif item.fieldType.javaType() =="Long"> + + + + <#elseif item.fieldType.javaType() =="Float"> + + + + <#elseif item.fieldType.javaType() =="Double"> + + + + <#elseif item.fieldType.javaType() =="Character"> + + + + <#elseif item.fieldType.javaType() =="Date"> + + + + + <#elseif item.fieldType.javaType() =="BigDecimal"> + + + + + + 取 消 @@ -121,23 +225,6 @@
-