diff --git a/README.md b/README.md index 9a4cad9..c86cb37 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ # Advantage - 支持DDL SQL/INSERT SQL/SIMPLE JSON生成模式 - 自动记忆最近生成的内容，最多保留9个 -- 支持特殊字符模板(`#`请用`井`代替;`$`请用`￥`代替) - 提供众多通用模板，易于使用，复制粘贴加简单修改即可完成CRUD操作 - +- 支持特殊字符模板(`#`请用`井`代替;`$`请用`￥`代替) +- 根据comment=(mysql)或者comment on table(pgsql/oracle)生成类名注释 # Url @@ -33,6 +33,7 @@ |更新日期|更新内容| |----|----| +|20200525|1.一些fix,关于封装工具类以及layui模板优化等.
2.优化表备注的获取逻辑.
3.生成时间格式改为yyyy-MM-dd,移除具体的时间,只保留日期| |20200522|1.新增insert-sql模式,支持对"insert into table (xxx) values (xxx)"语句进行处理,生成java代码(感谢三叔的建议).| |20200517|1.代码重构！异常处理优化,Freemarker相关工具类优化,简化模板生成部分,通过template.json来配置需要生成的模板,不需要配置java文件.
2.修复包含comment关键字时注释无法识别的问题.(感谢@1nchaos的反馈).
3.赞赏优化,感谢大家的赞赏.
4.新增mapper2(Mybatis-Annotation模板)(感谢@baisi525和@CHKEGit的建议).| |20200503|1.优化对特殊字符的处理,对于包含#和$等特殊字符的,在模板使用井和￥代替便可,escapeString方法会自动处理.
2.优化mybatisplus实体类相关(感谢@chunchengmeigui的反馈).
3.修优化对所有类型的判断(感谢@cnlw的反馈).
4.移除swagger-entity,该功能已经包含在‘swagger-ui’的下拉选项中
5.升级hutool和lombok版本| diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java b/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java index bf5d9f2..a9e7be2 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java +++ b/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java @@ -14,7 +14,7 @@ public class GlobalDefaultExceptionHandler { @ResponseBody public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) { e.printStackTrace(); - return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage()); + return ReturnT.ERROR(e.getMessage()); } } diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java b/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java index bc2ffcf..4a822f5 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java +++ b/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java @@ -34,10 +34,10 @@ public class IndexController { @PostMapping("/genCode") @ResponseBody - public ReturnT> codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception { + public ReturnT codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception { if (paramInfo.getTableSql().trim().length()<1) { - return new ReturnT<>(ReturnT.FAIL_CODE, "表结构信息不可为空"); + return ReturnT.ERROR("表结构信息不可为空"); } //1.Parse Table Structure 表结构解析 @@ -68,7 +68,7 @@ public class IndexController { //3.generate the code by freemarker template and param . Freemarker根据参数和模板生成代码 Map result = generatorService.getResultByParams(params); - return new ReturnT<>(result); + return ReturnT.SUCCESS(result); } } diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java b/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java index 7978362..d516cc0 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java +++ b/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java @@ -5,29 +5,61 @@ import lombok.Data; import java.io.Serializable; /** - * common return - * @author xuxueli 2015-12-4 16:32:31 + * common returnT:公共返回封装类 + * @author zhengkai.blog.csdn.net */ @Data -public class ReturnT implements Serializable { +public class ReturnT implements Serializable { public static final long serialVersionUID = 42L; public static final int SUCCESS_CODE = 200; public static final int FAIL_CODE = 500; - public static final ReturnT SUCCESS = new ReturnT<>(null); - public static final ReturnT FAIL = new ReturnT<>(FAIL_CODE, null); - + public static final int PAGE_CODE = 0; + public static final String OBJECT_NOT_FOUND = "找不到该对象"; + public static final String OPERATION_SUCCESS = "操作成功"; + private int code; private String msg; - private T data; - + private Object data; + private int count; + public ReturnT(int code, String msg) { this.code = code; this.msg = msg; } - public ReturnT(T data) { + public ReturnT(int code, String msg,Object data) { + this.code = code; + this.msg = msg; + this.data = data; + } + public ReturnT(Object data) { this.code = SUCCESS_CODE; this.data = data; } - + public ReturnT( Object data , int count ) { + this.code = PAGE_CODE; + this.data = data; + this.count = count; + } + public static ReturnT PAGE( Object data , int count){ + return new ReturnT(data,count); + } + public static ReturnT PAGE( Object data , long count){ + return new ReturnT(data,Integer.parseInt(count+"")); + } + public static ReturnT SUCCESS(){ + return new ReturnT(SUCCESS_CODE,OPERATION_SUCCESS); + } + public static ReturnT SUCCESS(String msg){ + return new ReturnT(SUCCESS_CODE,msg); + } + public static ReturnT SUCCESS(Object data){ + return new ReturnT(data); + } + public static ReturnT ERROR(String msg){ + return new ReturnT(FAIL_CODE,msg); + } + public static ReturnT ERROR(){ + return new ReturnT(FAIL_CODE,OBJECT_NOT_FOUND); + } } diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java index 1544fa8..4d8ddf7 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java +++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java @@ -80,28 +80,17 @@ public class TableParseUtil { // class Comment String classComment = null; //mysql是comment=,pgsql/oracle是comment on table, - if (tableSql.contains("comment=")) { - String classCommentTmp = tableSql.substring(tableSql.lastIndexOf("comment=")+8).replaceAll("`","").trim(); - if (classCommentTmp.indexOf(" ")!=classCommentTmp.lastIndexOf(" ")) { - classCommentTmp = classCommentTmp.substring(classCommentTmp.indexOf(" ")+1, classCommentTmp.lastIndexOf(" ")); - } - if (classCommentTmp!=null && classCommentTmp.trim().length()>0) { - classComment = classCommentTmp; - }else{ - //修复表备注为空问题 - classComment = className; - } - }else if(tableSql.contains("comment on table")) { - //COMMENT ON TABLE CT_BAS_FEETYPE IS 'CT_BAS_FEETYPE'; - String classCommentTmp = tableSql.substring(tableSql.lastIndexOf("comment on table")+17).trim(); - //证明这是一个常规的COMMENT ON TABLE xxx IS 'xxxx' + //2020-05-25 优化表备注的获取逻辑 + if (tableSql.contains("comment=")||tableSql.contains("comment on table")) { + String classCommentTmp = (tableSql.contains("comment="))? + tableSql.substring(tableSql.lastIndexOf("comment=")+8).trim():tableSql.substring(tableSql.lastIndexOf("comment on table")+17).trim(); if (classCommentTmp.contains("`")) { classCommentTmp = classCommentTmp.substring(classCommentTmp.indexOf("`")+1); classCommentTmp = classCommentTmp.substring(0,classCommentTmp.indexOf("`")); classComment = classCommentTmp; }else{ //非常规的没法分析 - classComment = tableName; + classComment = className; } }else{ //修复表备注为空问题 diff --git a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl b/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl index a9604ed..ab7cdb6 100644 --- a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl +++ b/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl @@ -9,7 +9,7 @@ import java.util.Map; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @RestController @RequestMapping("/${classInfo.className?uncap_first}") diff --git a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl b/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl index e20de00..77e2dc3 100644 --- a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl +++ b/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl @@ -6,7 +6,7 @@ import java.util.List; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @Data<#if swagger?exists && swagger==true> @ApiModel("${classInfo.classComment}") diff --git a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl index 14bc245..ba92731 100644 --- a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl @@ -4,7 +4,7 @@ import java.util.List; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ public interface I${classInfo.className}DAO { diff --git a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl index a3b62c0..4e0da92 100644 --- a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl @@ -8,7 +8,7 @@ import java.util.List; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @Repository public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao{ diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl b/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl index 7a80dbd..ac86bab 100644 --- a/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @Entity @Data diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl b/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl index bbe7ff2..6371e17 100644 --- a/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl @@ -17,7 +17,7 @@ import java.util.Map; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @RestController @RequestMapping("/${classInfo.className?uncap_first}") diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl b/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl index dbfb469..7573fad 100644 --- a/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @Repository public interface ${classInfo.className}Repository extends JpaRepository<${classInfo.className},Integer> { diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl index ce1d950..cb5a47b 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl @@ -20,7 +20,7 @@ import java.util.Map; /** * @description ${classInfo.classComment} * @author ${authorName} -* @date ${.now?string('yyyy-MM-dd HH:mm:ss')} +* @date ${.now?string('yyyy-MM-dd')} */ @Slf4j @RestController @@ -37,17 +37,17 @@ public class ${classInfo.className}Controller { public Object save(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first}){ log.info("${classInfo.className?uncap_first}:"+JSON.toJSONString(${classInfo.className?uncap_first})); ${classInfo.className} old${classInfo.className} = ${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_id",${classInfo.className?uncap_first}.get${classInfo.className}Id())); - ${classInfo.className?uncap_first}.setModifyDate(new Date()); + ${classInfo.className?uncap_first}.setUpdateTime(new Date()); if(old${classInfo.className}!=null){ ${classInfo.className?uncap_first}Mapper.updateById(${classInfo.className?uncap_first}); }else{ if(${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_name",${classInfo.className?uncap_first}.get${classInfo.className}Name()))!=null){ - return new ReturnT<>(ReturnT.FAIL_CODE,"保存失败，名字重复"); + return ${returnUtil}.ERROR("保存失败，名字重复"); } - ${classInfo.className?uncap_first}.setCreateDate(new Date()); + ${classInfo.className?uncap_first}.setCreateTime(new Date()); ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first}); } - return new ReturnT<>(ReturnT.SUCCESS_CODE,"保存成功"); + return ${returnUtil}.SUCCESS("保存成功"); } /** @@ -58,9 +58,9 @@ public class ${classInfo.className}Controller { ${classInfo.className} ${classInfo.className?uncap_first} = ${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_id",id)); if(${classInfo.className?uncap_first}!=null){ ${classInfo.className?uncap_first}Mapper.deleteById(id); - return new ReturnT<>(ReturnT.SUCCESS_CODE,"删除成功"); + return ${returnUtil}.SUCCESS("删除成功"); }else{ - return new ReturnT<>(ReturnT.FAIL_CODE,"没有找到该对象"); + return ${returnUtil}.ERROR("没有找到该对象"); } } @@ -71,14 +71,14 @@ public class ${classInfo.className}Controller { public Object find(int id){ ${classInfo.className} ${classInfo.className?uncap_first} = ${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_id",id)); if(${classInfo.className?uncap_first}!=null){ - return new ReturnT<>(${classInfo.className?uncap_first}); + return ${returnUtil}.SUCCESS(${classInfo.className?uncap_first}); }else{ - return new ReturnT<>(ReturnT.FAIL_CODE,"没有找到该对象"); + return ${returnUtil}.ERROR("没有找到该对象"); } } /** - * 分页查询 + * 自动分页查询 */ @PostMapping("/list") public Object list(String searchParams, @@ -96,12 +96,33 @@ public class ${classInfo.className}Controller { //执行分页 IPage<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.selectPage(buildPage, queryWrapper); //返回结果 - return new ReturnT<>(pageList.getRecords(),Integer.parseInt(pageList.getTotal()+"")); + return ${returnUtil}.PAGE(pageList.getRecords(),pageList.getTotal()); + } + /** + * 手工分页查询(按需使用) + */ + @PostMapping("/list2") + public ReturnT list2(String searchParams, + @RequestParam(required = false, defaultValue = "0") int page, + @RequestParam(required = false, defaultValue = "10") int limit) { + log.info("searchParams:"+ JSON.toJSONString(searchParams)); + //通用模式 + ${classInfo.className} queryParamDTO = JSON.parseObject(searchParams, ${classInfo.className}.class); + //专用DTO模式 + //QueryParamDTO queryParamDTO = JSON.parseObject(searchParams, QueryParamDTO.class); + //queryParamDTO.setPage((page - 1)* limit); + //queryParamDTO.setLimit(limit); + //(page - 1) * limit, limit + List<${classInfo.className}> itemList = ${classInfo.className?uncap_first}Mapper.pageAll(queryParamDTO,(page - 1)* limit,limit); + Integer itemCount = ${classInfo.className?uncap_first}Mapper.countAll(queryParamDTO); + //返回结果 + return ReturnT.PAGE(itemList,itemCount); } @GetMapping("/list") public ModelAndView listPage(){ return new ModelAndView("cms/${classInfo.className?uncap_first}-list"); } + @GetMapping("/edit") public ModelAndView editPage(int id){ ${classInfo.className} ${classInfo.className?uncap_first} = ${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_id",id)); diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl index dce63e0..ed01b9d 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableId; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @Data<#if swagger?exists && swagger==true> @ApiModel("${classInfo.classComment}") diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl index 1b7901b..321b76a 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl @@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import ${packageName}.entity.${classInfo.className}; +import java.util.List; /** * @description ${classInfo.classComment} * @author ${authorName} - * @date ${.now?string('yyyy-MM-dd HH:mm:ss')} + * @date ${.now?string('yyyy-MM-dd')} */ @Mapper public interface ${classInfo.className}Mapper extends BaseMapper<${classInfo.className}> { @@ -23,7 +24,7 @@ public interface ${classInfo.className}Mapper extends BaseMapper<${classInfo.cla //add here if need page limit //" limit ￥{page},￥{limit} " + " ") - List<${classInfo.className}> pageAll(${classInfo.className} queryParamDTO); + List<${classInfo.className}> pageAll(${classInfo.className} queryParamDTO,int page,int limit); @Select(" @@ -52,11 +52,20 @@ 删除 - + @@ -66,8 +75,7 @@ layui.use(['form', 'table'], function () { var $ = layui.jquery, form = layui.form, - table = layui.table, - layuimini = layui.layuimini; + table = layui.table; table.render({ elem: '#currentTableId', @@ -83,23 +91,26 @@ {type: "checkbox", width: 50, fixed: "left"}, <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#list classInfo.fieldList as fieldItem > - {field: '${fieldItem.fieldName}', width: 150, title: '${fieldItem.fieldComment}', sort: true}, <#if fieldItem_has_next> + {field: '${fieldItem.fieldName}', title: '${fieldItem.fieldComment}', sort: true}, <#if fieldItem_has_next> - {title: '操作', minWidth: 50, templet: '#currentTableBar', fixed: "right", align: "center"} + /* 需要时间请自行解封 + {title: '创建时间', sort: true,templet: "
{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd')}}
"}, + {title: '修改时间', sort: true,templet: "
{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd')}}
"}, + */ + {title: '操作', minWidth: 400, templet: '#currentTableBar', fixed: "right", align: "center"} ]], - limits: [10, 20, 50 , 100], - limit: 10, + limits: [20 , 50 , 100], + limit: 20, page: true }); var result; - // 监听搜索操作 + /** + * submit(data-search-btn):监听搜索操作 + */ form.on('submit(data-search-btn)', function (data) { result = JSON.stringify(data.field); - // layer.alert(result, { - // title: '最终的搜索信息' - // }); //执行搜索重载 table.reload('currentTableId', { @@ -113,51 +124,54 @@ return false; }); + var searchBtn = $("#searchBtn"); - // 监听添加操作 - $(".data-add-btn").on("click", function () { - var index = layer.open({ - title: '添加${classInfo.classComment}', - type: 2, - shade: 0.2, - maxmin:true, - shadeClose: true, - area: ['800px', '500px'], - content: '￥{request.contextPath}/${classInfo.className?uncap_first}/edit?id=0', - }); - layer.full(index); - return false; - }); - - // 监听删除操作 - $(".data-delete-btn").on("click", function () { - var checkStatus = table.checkStatus('currentTableId') - , data = checkStatus.data; - layer.alert(JSON.stringify(data)); - }); - - //监听表格复选框选择 - table.on('checkbox(currentTableFilter)', function (obj) { - console.log(obj) - }); - - //监听表格编辑删除等功能按钮 - table.on('tool(currentTableFilter)', function (obj) { - var data = obj.data; - if (obj.event === 'edit') { + /** + * toolbar监听事件:表格添加按钮 + */ + table.on('toolbar(currentTableFilter)', function (obj) { + if (obj.event === 'add') { var index = layer.open({ - title: '编辑${classInfo.classComment}', + title: '添加', type: 2, shade: 0.2, maxmin:true, shadeClose: true, - area: ['800px', '500px'], + area: ['1000px', '700px'], + content: '￥{request.contextPath}/${classInfo.className?uncap_first}/edit?id=0', + }); + return false; + }else if(obj.event === 'del') { + var checkStatus = table.checkStatus('currentTableId') + , data = checkStatus.data; + layer.alert(JSON.stringify(data)); + } + }); + /** + * checkbox(currentTableFilter):表格复选框选择 + */ + table.on('checkbox(currentTableFilter)', function (obj) { + //console.log(obj) + }); + + /** + * tool监听事件:表格编辑删除等功能按钮 + */ + table.on('tool(currentTableFilter)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var index = layer.open({ + title: '编辑', + type: 2, + shade: 0.2, + maxmin:true, + shadeClose: true, + area: ['1000px', '700px'], content: '￥{request.contextPath}/${classInfo.className?uncap_first}/edit?id='+obj.data.${classInfo.className?uncap_first}Id, }); - layer.full(index); return false; } else if (obj.event === 'delete') { - layer.confirm('真的删除行么', function (index) { + layer.confirm('确认删除该记录吗？', function (index) { $.ajax({ type: 'POST', url: "￥{request.contextPath}/${classInfo.className?uncap_first}/delete", diff --git a/generator-web/src/main/resources/templates/index.ftl b/generator-web/src/main/resources/templates/index.ftl index 88905cf..35d5727 100644 --- a/generator-web/src/main/resources/templates/index.ftl +++ b/generator-web/src/main/resources/templates/index.ftl @@ -229,11 +229,11 @@
作者名称
- +
返回封装
- +
包名路径