Skip to content
GitLab
Commit 42466f7a authored by xiandafu's avatar xiandafu
Browse files

update beetl

parent 107142fb
Hide whitespace changes
Inline Side-by-side
admin-console/pom.xml
View file @ 42466f7a
......@@ -6,14 +6,14 @@
<parent>
<groupId>com.ibeetl</groupId>
<artifactId>admin</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-core</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</dependency>
<dependency>
......
admin-core/pom.xml
View file @ 42466f7a
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.ibeetl</groupId>
<artifactId>admin</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
......@@ -44,7 +44,7 @@
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>beetl-framework-starter</artifactId>
<version>1.2.3.RELEASE</version>
<version>1.2.5.RELEASE</version>
</dependency>
<dependency>
......
admin-core/src/main/resources/codeTemplate/html/edit.html
View file @ 42466f7a
......@@ -42,7 +42,7 @@
<input type="hidden" name="${item.name}" value=\${${entity.code}.${item.name}} ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''}/>
@}
@}
<input type="hidden" name="${entity.idAttribute.name}" value=\${${entity.code}.${entity.idAttribute.name}} ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''}/>
<input type="hidden" name="${entity.idAttribute.name}" value=\${${entity.code}.${entity.idAttribute.name}} />
<layui:submitButtons id="updateButton" />
</form>
<!--#} -->
......
admin-core/src/main/resources/codeTemplate/html/index.html
View file @ 42466f7a
<!--#layout("/common/layout.html",{"jsBase":"/js/${target.urlBase}/${entity.code}/"}){ -->
<layui:searchForm formId="searchForm" condition="\${search}">
<layui:searchForm formId="searchForm" condition="${'${search\}'}">
</layui:searchForm>
<div class="layui-btn-group">
......
admin-core/src/main/resources/codeTemplate/java/pojo.java
View file @ 42466f7a
......@@ -54,8 +54,7 @@ public class ${className} extends BaseEntity{
private ${attr.type} ${attr.name} ;
@}
public ${className}()
{
public ${className}(){
}
@for(attr in attrs){
......@@ -65,7 +64,7 @@ public class ${className} extends BaseEntity{
*/
@}
public ${attr.type} get${attr.methodName}(){
return ${attr.name};
return ${attr.name};
}
@if(!isEmpty(attr.comment)){
/**${attr.comment}
......
admin-core/src/main/resources/codeTemplate/java/query.java
View file @ 42466f7a
......@@ -14,12 +14,12 @@ public class ${entity.name}Query extends PageParam {
@if(isNotEmpty(attr.dictType)) {
\@Query(name = "${attr.displayName}", display = true,type=Query.TYPE_DICT,dict="${attr.dictType}")
private ${attr.javaType} ${attr.name};
@} else if(attr.isDateRange) {
@} else if(attr.dateRange) {
\@Query(name = "${attr.displayName}", display = true,type=Query.TYPE_DATE_BETWEEN)
private String ${attr.name};
private Date ${strutil.replace (attr.name,"Range","")}Start;
private Date ${strutil.replace (attr.name,"Range","")}End;
@} else if(attr.isDateTimeRange) {
@} else if(attr.dateTimeRange) {
\@Query(name = "${attr.displayName}", display = true,type=Query.TYPE_DATETIME_BETWEEN)
private String ${attr.name};
private Date ${strutil.replace (attr.name,"Range","")}Start;
......@@ -30,7 +30,7 @@ public class ${entity.name}Query extends PageParam {
@}
@}
@for(attr in attrs) {
@if(attr.isDateRange) {
@if(attr.dateRange) {
public String get${upperFirst(attr.name)}(){
return ${attr.name};
}
......@@ -55,7 +55,7 @@ public class ${entity.name}Query extends PageParam {
public void set${upperFirst(strutil.replace (attr.name,"Range",""))}End(${attr.javaType} ${strutil.replace (attr.name,"Range","")}End){
this.${strutil.replace (attr.name,"Range","")}End = ${strutil.replace (attr.name,"Range","")}End;
}
@} else if(attr.isDateTimeRange) {
@} else if(attr.dateTimeRange) {
public String get${upperFirst(attr.name)}(){
return ${attr.name};
}
......
admin-core/src/main/resources/codeTemplate/maven/pomTemplate.xml
View file @ 42466f7a
......@@ -19,19 +19,18 @@
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-core</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</dependency>
<!-- admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-console</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>6.0.5</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
admin-core/src/main/resources/codeTemplate/md/entity.md
View file @ 42466f7a
......@@ -12,7 +12,7 @@ queryByCondition
and #function("${entity.code}.query")#
@for(attr in entity.list){
@if(attr.showInQuery){
@if(attr.isDateRange || attr.isDateTimeRange){
@if(attr.dateRange || attr.dateTimeRange){
\@if(!isEmpty(${strutil.replace (attr.name,"Range","")}Start)){
and t.${attr.colName} > #${strutil.replace (attr.name,"Range","")}Start#
\@}
......
changelog.txt 0 → 100644
View file @ 42466f7a
3.
\ No newline at end of file
pom.xml
View file @ 42466f7a
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibeetl</groupId>
<artifactId>admin</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<packaging>pom</packaging>
<properties>
<java.version>1.8</java.version>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment