Merge branch 'master' of https://gitee.com/xiandafu/springboot-plus

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java

@@ -9,7 +9,7 @@ import com.ibeetl.admin.core.entity.CoreRoleFunction;
 
 import java.util.List;
 
-@SqlResource("core.coerRoleFunction")
+@SqlResource("core.coreRoleFunction")
 public interface CoreRoleFunctionDao extends BaseMapper<CoreRoleFunction> {
 
 

admin-core/src/main/resources/codeTemplate/html/add.html

@@ -17,7 +17,7 @@
             <label class="layui-form-label">${item.displayName}</label>
             <div class="layui-input-inline">
 				@if(isEmpty(item.dictType)){
-                <input type="text" name="${item.name}" class="layui-input" ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''}>
+                <input type="text" name="${item.name}" class="layui-input${item.javaType=='Date'?' input-date'}" ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''}>
 				@}else{
                 <layui:simpleDictSelect style='layui-input-inline' type="${item.dictType}" layVerify="${verifyFormat(item.verifyList)}" 
                 			id="${item.name}" name="${item.name}" value="" />

admin-core/src/main/resources/codeTemplate/html/edit.html

@@ -16,7 +16,7 @@
             <label class="layui-form-label">${item.displayName}</label>
             <div class="layui-input-inline">
 				@if(isEmpty(item.dictType)){
-                <input type="text" id="${item.name}" name="${item.name}"  value="\${${entity.code}.${item.name}}"  ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''} class="layui-input" >
+                <input type="text" id="${item.name}" name="${item.name}"  value="\${${entity.code}.${item.name}${item.javaType=='Date'?',"yyyy-MM-dd"'}}"  ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''} class="layui-input${item.javaType=='Date'?' input-date'}" >
 				@}else{
                 <layui:simpleDictSelect style='layui-input-inline' type="${item.dictType}" 
 					id="${item.name}" name="${item.name}" value="\${${entity.code}.${item.name}}" layVerify="${verifyFormat(item.verifyList)}" />

admin-core/src/main/resources/codeTemplate/js/edit.js

@@ -10,7 +10,7 @@ layui.define([ 'form', 'laydate', 'table','${entity.code}Api'], function(exports
         initSubmit:function(){
             $("#updateButton").click(function(){
                 form.on('submit(form)', function(){
-                    ${entity.code}Api.update${upperFirst(entity.code)}($('#updateForm'),function(
+                    ${entity.code}Api.update${upperFirst(entity.code)}($('#updateForm'),function(){
                        parent.window.dataReload();
                        Common.info("更新成功");
                        Lib.closeFrame();
@@ -20,6 +20,7 @@ layui.define([ 'form', 'laydate', 'table','${entity.code}Api'], function(exports
             $("#updateButton-cancel").click(function(){
                 Lib.closeFrame();
             });
+        }
             
     }
     exports('edit',view);

admin-core/src/main/resources/static/js/core/codeGen/edit.js

@@ -36,7 +36,7 @@ layui.define([ 'form', 'laydate', 'table','codeApi'], function(exports) {
 						gen:function(){
 							codeApi.gen(function(){
 								Common.info("代码生成成功，请刷新工程");
-								Lib.closeFrame();
+								
 							});
 						},
 						cancel:function(){