js api

admin-console/src/main/resources/static/js/admin/user/add.js

@@ -9,7 +9,7 @@ layui.define([ 'form', 'laydate', 'table','userApi'], function(exports) {
 			},
 			initSubmit:function(){
 				$("#saveUser").click(function(){
-					userApi.addUser(function(){
+					userApi.addUser($('#addForm'),function(){
 						parent.window.dataReload();
 						Common.info("添加成功");
 						Lib.closeFrame();

admin-console/src/main/resources/static/js/admin/user/changePassword.js

@@ -9,7 +9,7 @@ layui.define([ 'form', 'table','userApi'], function(exports) {
 			},
 			initSubmit:function(){
 				$("#savePassword").click(function(){
-					userApi.changePassword(function(){
+					userApi.changePassword($('#changePasswordForm'),function(){
 						Common.info("密码更改成功");
 						Lib.closeFrame();
 					});

admin-console/src/main/resources/static/js/admin/user/edit.js

@@ -9,7 +9,7 @@ layui.define([ 'form', 'laydate', 'table','userApi'], function(exports) {
 			},
 			initSubmit:function(){
 				$("#saveUser").click(function(){
-					userApi.updateUser(function(){
+					userApi.updateUser($('#updateForm'),function(){
 						parent.window.dataReload();
 						Common.info("更新成功");
 						Lib.closeFrame();

admin-console/src/main/resources/static/js/admin/user/index.js

-layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+layui.define([ 'form', 'laydate', 'table','userApi' ], function(exports) {
 	var form = layui.form;
 	var laydate = layui.laydate;
 	var table = layui.table;
+	var userApi=layui.userApi;
 	var userTable = null;
+	
 	var view ={
 		
 		init:function(){

admin-console/src/main/resources/static/js/admin/user/userApi.js

 /*访问后台的代码*/
 layui.define([], function(exports) {
-	var api={
-			updateUser:function(callback){
-				Lib.submitForm($('#updateForm'),{},callback)
+    var api = {
+        updateUser : function(form, callback) {
+            Lib.submitForm("/admin/user/update.json", form, {}, callback)
         },
-			addUser:function(callback){
-				Lib.submitForm($('#addForm'),{},callback)
+        addUser : function(form, callback) {
+            Lib.submitForm("/admin/user/add.json", form, {}, callback)
         },
-			del:function(ids,callback){
-				Common.post("/admin/user/delete.json",{"ids":ids},function(){
+        del : function(ids, callback) {
+            Common.post("/admin/user/delete.json", {
+                "ids" : ids
+            }, function() {
                 callback();
             })
         },
-			changePassword:function(callback){
-				Lib.submitForm($('#changePasswordForm'),{},callback)
+        changePassword : function(form, callback) {
+            Lib.submitForm("/admin/user/changePassword.json", form, {},
+                    callback)
         },
-			addUserRole:function(form,callback){
-				Lib.submitForm(form,{},callback)
+        addUserRole : function(form, callback) {
+            Lib.submitForm("/admin/user/role/add.json", form, {}, callback)
         },
-			delUserRole:function(ids,callback){
-				Common.post("/admin/user/role/delete.json",{"ids":ids},function(){
+        delUserRole : function(ids, callback) {
+            Common.post("/admin/user/role/delete.json", {
+                "ids" : ids
+            }, function() {
                 callback();
             })
         },
 
     };
 
-	 exports('userApi',api);
+    exports('userApi', api);
 
 });
\ No newline at end of file

admin-console/src/main/resources/templates/admin/user/add.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
 
 <form class="layui-form layui-form-pane" id="addForm"
-	action="/admin/user/add.json">
+	>
 	<div class="layui-row">
 		<div class="layui-form-item">
 			<label class="layui-form-label">用户姓名</label>

admin-console/src/main/resources/templates/admin/user/changePassword.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
 
 <form class="layui-form layui-form-pane" id="changePasswordForm"
-	action="/admin/user/changePassword.json">
+	>
 	<div class="layui-row">
 		<div class="layui-form-item">
 			<label class="layui-form-label">用户姓名</label>

admin-console/src/main/resources/templates/admin/user/edit.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
 
 <form class="layui-form layui-form-pane" id="updateForm"
-	action="/admin/user/update.json">
+	>
 	<div class="layui-row">
 		<div class="layui-form-item">
 			<label class="layui-form-label">用户姓名</label>

admin-console/src/main/resources/templates/admin/user/userRoleAdd.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
 
 <form class="layui-form layui-form-pane" id="userRoleAddForm"
-	action="/admin/user/role/add.json">
+	>
 	
 	<div class="layui-row">
 		<div class="layui-form-item">

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

 <!--# layout("/common/layout.html",{"jsBase":"/js/${target.urlBase}/${entity.code}/"}){ -->
 
-<form class="layui-form layui-form-pane" id="addForm"
-	action="/${target.urlBase}/${entity.code}/add.json">
+<form class="layui-form layui-form-pane" id="addForm">
 	@ var list = entity.generalList;
 	@ var size = list.~size; /*一行显示俩个，生成后在根据显示要求调整*/
 	@ for(var i=0;i<size;i++){

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

 <!--# layout("/common/layout.html",{"jsBase":"/js/${target.urlBase}/${entity.code}/"}){ -->
 
-<form class="layui-form layui-form-pane" id="updateForm"
-	action="/${target.urlBase}/${entity.code}/update.json">
+<form class="layui-form layui-form-pane" id="updateForm">
 	@ var list = entity.generalList;
 	@ var size = list.~size; /*一行显示俩个，生成后在根据显示要求调整*/
 	@ for(var i=0;i<size;i++){
@@ -13,7 +12,6 @@
 		<div class="layui-form-item">
 		@for(item in array){
 		@if(item==null){continue;}
-		
 			<div class="layui-inline">
 			<label class="layui-form-label">${item.displayName}</label>
 			<div class="layui-input-inline">
@@ -21,10 +19,8 @@
 					 class="layui-input" >
 			</div>
 			</div>
-		
 		@}
 		</div>
-		
 	</div>
 	@}
 	<input type="hidden" name="${entity.idAttribute.name}" value=\${${entity.code}.${entity.idAttribute.name}} />
@@ -37,5 +33,4 @@ layui.use(['edit'], function(){
 	var ${entity.code}Edit = layui.edit
 	${entity.code}Edit.init();
 });
-
 </script>

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

@@ -9,13 +9,11 @@ layui.define([ 'form', 'laydate', 'table','${entity.code}Api'], function(exports
         },
         initSubmit:function(){
             $("#addButton").click(function(){
-					${entity.code}Api.add${upperFirst(entity.code)}(function(){
+                ${entity.code}Api.add${upperFirst(entity.code)}($('#addForm'),function(){
                     parent.window.dataReload();
                     Common.info("添加成功");
                     Lib.closeFrame();
                 });
-					
-					
             });
         
             $("#addButton-cancel").click(function(){

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

@@ -3,7 +3,6 @@ layui.define(['table', '${entity.code}Api'], function(exports) {
     var table=layui.table;
     var view = {
         init:function(){
-				
         },
         delBatch:function(){
             var data = Common.getMoreDataFromTable(table,"${entity.code}Table");
@@ -17,9 +16,7 @@ layui.define(['table', '${entity.code}Api'], function(exports) {
                     dataReload();
                 })
             })
-				
         }
-				
     }
     exports('del',view);
 	

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

@@ -9,24 +9,17 @@ layui.define([ 'form', 'laydate', 'table','${entity.code}Api'], function(exports
         },
         initSubmit:function(){
             $("#updateButton").click(function(){
-					${entity.code}Api.update${upperFirst(entity.code)}(function(){
+                ${entity.code}Api.update${upperFirst(entity.code)}($('#updateForm'),function(){
                     parent.window.dataReload();
                     Common.info("更新成功");
                     Lib.closeFrame();
                 });
-					
-					
             });
-				
             $("#updateButton-cancel").click(function(){
                 Lib.closeFrame();
             });
         }
-				
     }
-	
-	
-	
     exports('edit',view);
 	
 });
\ No newline at end of file

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

 /*访问后台的代码*/
 layui.define([], function(exports) {
     var api={
-			update${upperFirst(entity.code)}:function(callback){
-				Lib.submitForm($('#updateForm'),{},callback)
+            update${upperFirst(entity.code)}:function(form,callback){
+                Lib.submitForm("/${target.urlBase}/${entity.code}/update.json",form,{},callback)
             },
-			add${upperFirst(entity.code)}:function(callback){
-				Lib.submitForm($('#addForm'),{},callback)
+            add${upperFirst(entity.code)}:function(form,callback){
+                Lib.submitForm("/${target.urlBase}/${entity.code}/add.json",form,{},callback)
             },
             del:function(ids,callback){
                 Common.post("/${target.urlBase}/${entity.code}/delete.json",{"ids":ids},function(){
@@ -14,7 +14,5 @@ layui.define([], function(exports) {
             }
 		
     };
-	
     exports('${entity.code}Api',api);
-	
 });
\ No newline at end of file

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

@@ -4,7 +4,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
     var table = layui.table;
     var ${entity.code}Table = null;
     var view ={
-		
         init:function(){
             this.initTable();
             this.initSearchForm();
@@ -12,18 +11,16 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
             window.dataReload = function(){
                 Lib.doSearchForm($("#searchForm"),${entity.code}Table,form)
             }
-			
-			
         },
         initTable:function(){
             ${entity.code}Table = table.render({
                 elem : '#${entity.code}Table',
                 height : Lib.getTableHeight(1),
                 method : 'post',
-				url : Common.CTX + '/${target.urlBase}/${entity.code}/list.json' //数据接口
-				,page : Lib.tablePage //开启分页
+                url : Common.CTX + '/${target.urlBase}/${entity.code}/list.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
                 ,limit : 10,
-				cols : [ [ //表头
+                cols : [ [ // 表头
                 {
                 type : 'checkbox',
                 fixed:'left',
@@ -32,7 +29,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 {
                 field : '${attr.name}',
                 title : '${attr.displayName}',
-					
                 @if(attrLP.first){
                 fixed:'left',
                 @}
@@ -55,18 +51,17 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
         },
         initToolBar:function(){
             toolbar = {
-					add : function() { //获取选中数据
+                add : function() { // 获取选中数据
                     var url = "/${target.urlBase}/${entity.code}/add.do";
                     Common.openDlg(url,"${entity.displayName}管理>新增");
                 },
-					edit : function() { //获取选中数目
+                edit : function() { // 获取选中数目
                     var data = Common.getOneFromTable(table,"${entity.code}Table");
                     if(data==null){
                         return ;
                     }
                     var url = "/${target.urlBase}/${entity.code}/edit.do?${entity.idAttribute.name}="+data.${entity.idAttribute.name};
                     Common.openDlg(url,"${entity.displayName}管理>"+data.${entity.nameAttribute.name}+">编辑");
-						
                 },
                 del : function() { 
                     layui.use(['del'], function(){
@@ -74,8 +69,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                         delView.delBatch();
                     });
                 }
-					
-					
             };
             $('.ext-toolbar').on('click', function() {
                 var type = $(this).data('type');
@@ -83,7 +76,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
             });
         }
 	}
-
     exports('index',view);
 	
 });
\ No newline at end of file

admin-core/src/main/resources/static/js/lib.js

@@ -192,11 +192,18 @@ var Lib = {
 		var index = parent.layer.getFrameIndex(window.name); // 先得到当前iframe层的索引
 		parent.layer.close(index); // 再执行关闭
 	},
+	/*不再使用，因为没有提供url*/
 	submitForm : function(form, paras, callBack) {
 		var url = form.attr("action");
 		var formPara = form.serializeJson();
 		Common.post(url, formPara, callBack);
 
+	},
+	submitForm : function(url,form, paras, callBack) {
+		
+		var formPara = form.serializeJson();
+		Common.post(url, formPara, callBack);
+
 	},
 	getTableHeight : function(queryLine) {
 		// 表格相对高度

admin-core/src/main/resources/templates/core/codeGen/edit.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/core/codeGen/"}){ -->
  <div class="layui-btn-group">
   
-    <button class="layui-btn ext-toolbar"  data-type="html">预览HTML</button>
+    
     <button class="layui-btn ext-toolbar" data-type="js">预览JS</button>
     <button class="layui-btn ext-toolbar" data-type="java">预览Java</button>
     <button class="layui-btn ext-toolbar" data-type="sql">预览SQL</button>
+    <button class="layui-btn ext-toolbar"  data-type="html">预览HTML</button>
     <button class="layui-btn ext-toolbar" data-type="gen">立即生成</button>
     <button class="layui-btn ext-toolbar" data-type="cancel">取消</button>
   </div>