open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、优化

Browse Source
master
wangbing 5 years ago
parent c98b653dd1
commit c29ef0a9d5
9 changed files with 167 additions and 199 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
Unescape View File

@ -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"));

8
src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java
Unescape View File

@ -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")) {

2
src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java
Unescape View File

@ -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())) {

2
src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java
Unescape View File

@ -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())) {

52
src/main/resources/modules/SpringBoot/resources/static/css/base.css
Unescape View File

@ -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 {
text-align: center;
}
.full {
width: 100%;
height: 100%;
@ -591,21 +607,11 @@ code {
width: 55px;
padding: 0px 5px;
}
.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样式 */

119
src/main/resources/modules/SpringBoot/resources/templates/control/header.ftl
Unescape View File

@ -1,119 +0,0 @@
<div id="header">
<div class="logo">
<img @click="this.nav.toHome()" src="${context}/static/img/logo.png">
</div>
<a class="home" href="${context}">Home</a>
<div class="menu">
<ul>
<li>
<a href="${context}/1">首页</a>
</li>
<li>
<a href="${context}/2">工作台</a>
</li>
<li>
<a href="${context}/3">消息中心</a>
</li>
<li>
<a href="${context}/4">关于我</a>
</li>
</ul>
</div>
</div>
<style>
#header {
width: 100%;
height: 50px;
line-height: 50px;
overflow: hidden;
background: #2a2a2a;
box-shadow: 0px 2px 8px 0px;
}
#header .logo {
display: inline-block;
height: 50px;
width: 50px;
margin-left: 10px;
text-align: center;
}
#header .logo img {
width: 50%;
height: 50%;
vertical-align: middle;
}
.home {
display: inline-block;
color: #ffffff;
font-weight: bold;
transition: all 0.3s;
}
.home:hover {
color: #ffffff;
transform: translate(2px);
}
#header .menu {
display: inline-block;
float: right;
}
#header .menu ul {
display: inline-block;
}
#header .menu ul li {
display: inline-block;
vertical-align: top;
}
#header .menu ul li a {
color: #ffffff;
display: inline-block;
text-align: center;
position: relative;
margin: 0px 15px;
height: 50px;
}
#header .menu ul li a:after {
content: "";
display: inline-block;
background: #ffffff;
width: 0%;
height: 2px;
position: absolute;
bottom: 2px;
left: 50%;
transition: all 0.3s;
}
#header .menu ul li a img {
margin-top: 8px;
height: 32px;
}
#header .menu ul li a:hover:after {
width: 100%;
left: 0%;
}
#header .tx {
display: inline-block;
float: right;
height: 50px;
width: 50px;
margin-left: 20px;
}
#header .tx img {
width: 50%;
height: 50%;
vertical-align: middle;
}
</style>

127
src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
Unescape View File

@ -1,11 +1,63 @@
<div id="app" v-cloak>
<el-card class="box-card">
<el-card class="box-card search">
<el-form :inline="true" :model="vm" ref="vm" label-width="90px">
<#list fields as item>
<#if item.isQuery>
<#if item.fieldType.javaType() =="Boolean">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-radio-group v-model="vm.${item.getFName()}" clearable>
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<#elseif item.fieldType.javaType() =="String" && item.fieldType != "Dict">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input v-model="vm.${item.getFName()}" clearable size="small" placeholder="请输入${item.fieldComment?default("")}"></el-input>
</el-form-item>
<#elseif item.fieldType.javaType() =="String" && item.fieldType == "Dict">
<#elseif item.fieldType.javaType() =="Byte">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :min="-128" :max="127" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Short">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :min="-32768" :max="32767" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Integer">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :min="-2147483648" :max="2147483647" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Long">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Float">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="0.01" step-strictly :precision="2"></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Double">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="0.01" step-strictly :precision="2"></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Character">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input v-model="vm.${item.getFName()}" clearable size="small" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
</el-form-item>
<#elseif item.fieldType.javaType() =="Date">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-date-picker
size="small"
v-model="vm.${item.getFName()}"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<#elseif item.fieldType.javaType() =="BigDecimal">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="1" step-strictly :precision="2" :step="0.01"></el-input-number>
</el-form-item>
</#if>
</#if>
</#list>
<el-form-item>
@ -25,10 +77,62 @@
<el-dialog class="form" :title="form.title" :visible.sync="form.dialog">
<el-form :model="form" :inline="true" :rules="formRules" ref="form" label-width="90px">
<#list fields as item>
<#if item.isQuery && !item.isSystem>
<#if !item.isSystem>
<#if item.fieldType.javaType() =="Boolean">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input v-model="form.${item.getFName()}" clearable size="small" placeholder="请输入${item.fieldComment?default("")}"></el-input>
<el-radio-group v-model="vm.${item.getFName()}" clearable>
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<#elseif item.fieldType.javaType() =="String" && item.fieldType != "Dict">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input v-model="vm.${item.getFName()}" clearable size="small" placeholder="请输入${item.fieldComment?default("")}"></el-input>
</el-form-item>
<#elseif item.fieldType.javaType() =="String" && item.fieldType == "Dict">
<#elseif item.fieldType.javaType() =="Byte">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :min="-128" :max="127" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Short">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :min="-32768" :max="32767" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Integer">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :min="-2147483648" :max="2147483647" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Long">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="1" step-strictly></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Float">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="0.01" step-strictly :precision="2"></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Double">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="0.01" step-strictly :precision="2"></el-input-number>
</el-form-item>
<#elseif item.fieldType.javaType() =="Character">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input v-model="vm.${item.getFName()}" clearable size="small" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
</el-form-item>
<#elseif item.fieldType.javaType() =="Date">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-date-picker
size="small"
v-model="vm.${item.getFName()}"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<#elseif item.fieldType.javaType() =="BigDecimal">
<el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
<el-input-number v-model="vm.${item.getFName()}"clearable size="small" placeholder="请输入${item.fieldComment?default("")}" :step="1" step-strictly :precision="2" :step="0.01"></el-input-number>
</el-form-item>
</#if>
</#if>
</#list>
</el-form>
@ -121,23 +225,6 @@
</el-pagination>
</el-card>
</div>
<style>
#app {
padding: 10px;
}
.box-card {
margin: 10px;
}
.form .el-dialog{
width: 700px;
}
.form .el-dialog .el-form-item__content {
width: 220px;
}
</style>
<script>
var app = new Vue({
mixins: [mixin],

20
src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
Unescape View File

@ -1,5 +1,5 @@
<div id="app" v-cloak>
<el-card class="box-card">
<el-card class="box-card search">
<el-form :inline="true" :model="vm" ref="vm" label-width="90px">
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="vm.dictName" clearable size="small" placeholder=""></el-input>
@ -159,24 +159,6 @@
</el-pagination>
</el-card>
</div>
<style>
#app {
padding: 10px;
}
.box-card {
margin: 10px;
}
.form .el-dialog {
width: 700px;
}
.form .el-dialog .el-form-item__content {
width: 220px;
}
</style>
<script>
var app = new Vue({
mixins: [mixin],

20
src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
Unescape View File

@ -1,5 +1,5 @@
<div id="app" v-cloak>
<el-card class="box-card">
<el-card class="box-card search">
<el-form :inline="true" :model="vm" ref="vm" label-width="90px">
<el-form-item label="字典名称">
<el-input disabled v-model="vm.dictName" clearable size="small"></el-input>
@ -155,24 +155,6 @@
</el-pagination>
</el-card>
</div>
<style>
#app {
padding: 10px;
}
.box-card {
margin: 10px;
}
.form .el-dialog {
width: 700px;
}
.form .el-dialog .el-form-item__content {
width: 220px;
}
</style>
<script>
var app = new Vue({
mixins: [mixin],

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.