From 63054ec530a3154e730972f5833df7d6494913ac Mon Sep 17 00:00:00 2001
From: 王彬 <wangbin@taover.com>
Date: Fri, 6 Jul 2018 15:06:27 +0800
Subject: [PATCH] 1.优化生成代码

---
 src/com/taover/base/template/ControllerTemplate.ftl         |  4 ++--
 src/com/taover/base/template/HtmlLayuiTemplate.ftl          | 85 ++++++++++++++++++++++++++++---------------------------------------------------------
 src/com/taover/base/template/model/bussiness/ViewModel.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 src/com/taover/business/GenerateView.java                   |  7 ++++++-
 4 files changed, 88 insertions(+), 65 deletions(-)

diff --git a/src/com/taover/base/template/ControllerTemplate.ftl b/src/com/taover/base/template/ControllerTemplate.ftl
index ebcbd5b..8409cbc 100644
--- a/src/com/taover/base/template/ControllerTemplate.ftl
+++ b/src/com/taover/base/template/ControllerTemplate.ftl
@@ -103,7 +103,7 @@ public class ${controllerClassName} {
 			@RequestParam(value="sort", required=false) String sort,
 			@RequestParam(value="order", required=false) String order,
 			@RequestParam(value="page", required=false) Integer page,
-			@RequestParam(value="rows", required=false) Integer pageSize,
+			@RequestParam(value="pageSize", required=false) Integer pageSize,
 			HttpServletRequest request) {
 		//参数检验
 		if(page == null){
@@ -112,7 +112,7 @@ public class ${controllerClassName} {
 		if(pageSize == null){
 			pageSize = 20;
 		}
-		if("".equals(sort)){
+		if(sort == null || "".equals(sort)){
 			sort = "id";
 			order = "desc";
 		}
diff --git a/src/com/taover/base/template/HtmlLayuiTemplate.ftl b/src/com/taover/base/template/HtmlLayuiTemplate.ftl
index 2367a1e..4e533a1 100644
--- a/src/com/taover/base/template/HtmlLayuiTemplate.ftl
+++ b/src/com/taover/base/template/HtmlLayuiTemplate.ftl
@@ -49,11 +49,13 @@
   	  
   	<!-- 添加表单 -->
   	<form id="form-data-add" class="layui-hide layui-form" lay-filter="form-data-add">
+  	  <div class="layui-form-item">
 	  <#list fields as tempField>
 	  	<#if (tempField["name"]!="id")>
 		${tempField["layui-form-item"]}
 		</#if>
 	  </#list>
+	  </div>
 	  
 	  <div class="layui-form-item">
 	    <div class="layui-input-block">
@@ -65,9 +67,11 @@
   	
   	<!-- 修改表单 -->
   	<form id="form-data-edit" class="layui-hide layui-form" lay-filter="form-data-edit">  		
+	  <div class="layui-form-item">
 	  <#list fields as tempField>
 		${tempField["layui-form-item"]}
 	  </#list>
+	  </div>
 	  
 	  <div class="layui-form-item">
 	    <div class="layui-input-block">
@@ -76,10 +80,7 @@
 	    </div>
 	  </div>
   	</form>
-  	
-  	<!-- 隐藏信息 -->
-  	<input id="data-checkList" type="hidden" name="ids" value=""/>
-  	
+  	  	
   <script src="/plugins/layuiadmin/layui/layui.js"></script>
   <script>
   layui.config({
@@ -173,14 +174,17 @@
     		  });
     	  }
       } else if(obj.event === 'edit'){ //修改按钮操作入口    	
-		var formHtml = '<form id="activeForm" class="layui-form" lay-filter="activeForm" style="padding:20px;">' + $('#form-data-edit').html() + '</form>';
+		$('#form-data-edit').removeClass('layui-hide');
 		layer.open({
 			title: '修改窗口',
 			type: 1,
-			content: formHtml,
-			btn: null
+			content: $('#form-data-edit'),
+			btn: null,
+			end: function(){
+				$('#form-data-edit').addClass('layui-hide');
+			}
 		});
-		form.val('activeForm', data);
+		form.val('form-data-edit', data);
 		form.render();
 		$('.me-date-form').each(function(index, element){
 			laydate.render({
@@ -190,45 +194,6 @@
 		});
 	  }
     });
-  	
-  	//表格的checkbox事件
-    table.on('checkbox(table-data-main)', function(obj){
-      var ids = $('#data-checkList').val();
-      var idsArray = new Array();
-	  var resultArray = new Array();
-      if(ids != ''){
-    	  idsArray = ids.split(',');
-          resultArray = ids.split(',');  
-      }
-      
-      if(obj.checked){
-    	  if(obj.type === 'one'){
-    		  resultArray.push(obj.data.id);
-    	  }else{
-    		  var tempData = window.document.global_tableData.rows;
-    		  for(var i=0; i<tempData.length; ++i){
-    			  resultArray.push(tempData[i].id);
-    		  }
-    	  }
-      }else{
-    	  if(obj.type === 'one'){
-    		  resultArray = new Array();
-    		  $(idsArray).each(function(index, item){
-    			  if(obj.data.id != item){
-    				resultArray.push(item);
-    			  }
-    		  });
-    	  }else{
-    		  resultArray = new Array();
-    	  }
-      }
-      
-      var tempResult = '';
-      if(resultArray.length > 0){
-    	  tempResult = resultArray.join(',');  
-      }
-      $('#data-checkList').val(tempResult);
-   	});
     
     //搜索按钮点击事件
     form.on('submit(btn-search-bar)', function(data){
@@ -248,15 +213,18 @@
 			var layer = layui.layer;
 			var form = layui.form;
 			var laydate = layui.laydate;
-			var formHtml = '<form id="activeForm" class="layui-form " style="padding:20px;">' + $('#form-data-add').html() + '</form>';
+			$('#form-data-add').removeClass('layui-hide');
 			layer.open({
 				title: '添加窗口',
 				type: 1,
-				content: formHtml,
-				btn: null
+				content: $('#form-data-add'),
+				btn: null,
+				end: function(){
+					$('#form-data-add').addClass('layui-hide');
+				}
 			});
 			form.render();
-			$('#activeForm .me-date-form').each(function(index, element){
+			$('#form-data-add .me-date-form').each(function(index, element){
 				laydate.render({
 					elem: element,
 					type: 'datetime'
@@ -272,7 +240,7 @@
 			var layer = layui.layer;
 			var form = layui.form;
 			var table = layui.table;
-			var formArray = $('#activeForm').serializeArray();
+			var formArray = $('#form-data-add').serializeArray();
 			var params = {};
 			layui.each(formArray, function(index, item){
 				params[item.name] = item.value;
@@ -305,13 +273,16 @@
 			var layer = layui.layer;
 			var form = layui.form;
 			var table = layui.table;
-			var ids = $('#data-checkList').val();
-			if(ids == '' || ids.length == 0){
+			var checkedData = table.checkStatus('table-data-main').data; //test即为基础参数id对应的值
+			if(checkedData == null || checkedData.length == 0){
 				layer.alert('没有选择任何选项，请选择需要删除记录再进行该操作');
 				return;
 			}else{
-				var idsArray = ids.split(',');				
-				layer.confirm('您当前选择了'+idsArray.length+'条记录，是否确认删除？', function(){
+				var ids = checkedData[0].id;
+				for(var i=1; i<checkedData.length; ++i){
+					ids += ','+checkedData[i].id;
+				}				
+				layer.confirm('您当前选择了'+checkedData.length+'条记录，是否确认删除？', function(){
 					$.ajax({
 						url: '/${controllerPathMap}/delete.htm',
 						type: 'post',
@@ -344,7 +315,7 @@
 			var layer = layui.layer;
 			var form = layui.form;
 			var table = layui.table;
-			var formArray = $('#activeForm').serializeArray();
+			var formArray = $('#form-data-edit').serializeArray();
 			var params = {};
 			layui.each(formArray, function(index, item){
 				params[item.name] = item.value;
diff --git a/src/com/taover/base/template/model/bussiness/ViewModel.java b/src/com/taover/base/template/model/bussiness/ViewModel.java
index 65b8d4c..2a2dc73 100644
--- a/src/com/taover/base/template/model/bussiness/ViewModel.java
+++ b/src/com/taover/base/template/model/bussiness/ViewModel.java
@@ -59,22 +59,27 @@ public class ViewModel {
 			String easyuiSearchDom = "";
 			String layuiSearchDom = "";
 			String layuiFormDom = "";
+			String layuiTableHeaderDom = "";
 			if(remarkPart.length > 1){
 				easyuiSearchDom = ViewModel.parseEasyuiSearchSelect(fieldName, cnName, remarkPart[1]);
 				layuiSearchDom = ViewModel.parseLayuiSearchSelect(fieldName, cnName, remarkPart[1]);
 				layuiFormDom = ViewModel.parseLayuiFormSelect(fieldName, cnName, remarkPart[1]);
+				layuiTableHeaderDom = ViewModel.parseLayuiTableHeaderSelect(fieldName, cnName, remarkPart[1]);
 			}else if("java.util.Date|java.sql.Time|java.sql.Timestamp".indexOf(fieldType) != -1){
 				easyuiSearchDom = ViewModel.parseEasyuiSearchDatetime(fieldName, cnName);
 				layuiSearchDom = ViewModel.parseLayuiSearchDatetime(fieldName, cnName);
 				layuiFormDom = ViewModel.parseLayuiFormDatetime(fieldName, cnName);
+				layuiTableHeaderDom = ViewModel.parseLayuiTableHeader(fieldName, cnName);
 			}else if("Byte|Long|Integer|Short".indexOf(fieldType) != -1){
 				easyuiSearchDom = ViewModel.parseEasyuiSearchNumber(fieldName, cnName);
 				layuiSearchDom = ViewModel.parseLayuiSearchNumber(fieldName, cnName);
 				layuiFormDom = ViewModel.parseLayuiFormNumber(fieldName, cnName);
+				layuiTableHeaderDom = ViewModel.parseLayuiTableHeader(fieldName, cnName);
 			}else{
 				easyuiSearchDom = ViewModel.parseEasyuiSearchText(fieldName, cnName);
 				layuiSearchDom = ViewModel.parseLayuiSearchText(fieldName, cnName);
 				layuiFormDom = ViewModel.parseLayuiFormText(fieldName, cnName);
+				layuiTableHeaderDom = ViewModel.parseLayuiTableHeader(fieldName, cnName);
 			}
 			//构造easyui筛选栏元素
 			columnMap.put("easyui-search-item", easyuiSearchDom);
@@ -86,7 +91,7 @@ public class ViewModel {
 			columnMap.put("layui-form-item", layuiFormDom);
 			
 			//构造layui表格表头
-			columnMap.put("layui-table-item", ViewModel.parseLayuiTableHeader(fieldName, cnName));
+			columnMap.put("layui-table-item", layuiTableHeaderDom);
 			
 			model.fields.add(columnMap);
 		}
@@ -241,7 +246,7 @@ public class ViewModel {
 	}
 	
 	public static String parseLayuiFormSelect(String name, String cnName, String optionStr){
-		String LayuiFormEle = "<div class=\"layui-form-item\">"
+		String LayuiFormEle = "<div class=\"layui-inline\">"
 		        + "<label class=\"layui-form-label\">"+cnName+"</label>"
 		        + "<div class=\"layui-input-block\">"
 		        	+ "<select name=\""+name+"\">"
@@ -287,7 +292,7 @@ public class ViewModel {
 	 * @return
 	 */
 	public static String parseLayuiFormDatetime(String name, String cnName){
-		String dateBoxDom = "<div class=\"layui-form-item\">"
+		String dateBoxDom = "<div class=\"layui-inline\">"
 	        + "<label class=\"layui-form-label\">"+cnName+"</label>"
 	        + "<div class=\"layui-input-block\">"
 	        	+"<input type=\"text\" name=\""+name+"\" placeholder=\"请输入\" class=\"layui-input me-date-form\" >" 
@@ -296,7 +301,7 @@ public class ViewModel {
 	}
 	
 	public static String parseLayuiFormNumber(String name, String cnName){
-		String dateBoxDom = "<div class=\"layui-form-item\">"
+		String dateBoxDom = "<div class=\"layui-inline\">"
 	        + "<label class=\"layui-form-label\">"+cnName+"</label>"
 	        + "<div class=\"layui-input-block\">"
 	        	+"<input type=\"number\" name=\""+name+"\" class=\"layui-input\" >" 
@@ -305,7 +310,7 @@ public class ViewModel {
 	}
 	
 	public static String parseLayuiFormText(String name, String cnName){
-		String dateBoxDom = "<div class=\"layui-form-item\">"
+		String dateBoxDom = "<div class=\"layui-inline\">"
 	        + "<label class=\"layui-form-label\">"+cnName+"</label>"
 	        + "<div class=\"layui-input-block\">"
 	        	+"<input type=\"text\" name=\""+name+"\" placeholder=\"请输入\" class=\"layui-input\" >" 
@@ -317,6 +322,48 @@ public class ViewModel {
 		String header = "{title:'"+cnName+"', field:'"+name+"', width:100, sort: true},";
 		return header;
 	}
+	
+	public static String parseLayuiTableHeaderSelect(String name, String cnName, String optionStr){
+		String header = "{title:'"+cnName+"', field:'"+name+"', width:100, sort: true, ";
+		String[] options = optionStr.split(",");
+		List<String> optionsList = new ArrayList<String>();
+		for(int i=0; i<options.length; ++i){
+			String tempOption = options[i];
+			if(tempOption.contains("，")){
+				String[] optionsExt = tempOption.split("，");
+				if(optionsExt.length > 0){
+					for(int j=0; j<optionsExt.length; ++j){
+						optionsList.add(optionsExt[j]);
+					}
+				}
+			}else{
+				optionsList.add(options[i]);
+			}
+		}
+		
+		String remarkStr = "\t\t\t\t//"+cnName+":";
+		String caseStr = "";
+		for(int i=0; i<optionsList.size(); ++i){
+			String optionsItem = optionsList.get(i);
+			String[] optionsArr = optionsItem.split("-");
+			String optionName = "未知名称";
+			if(optionsArr.length > 1){
+				optionName = optionsArr[1];
+			}
+			caseStr += "\t\t\t\t\tcase "+optionsArr[0]+": return '"+optionName+"';\n";
+			remarkStr += optionsArr[0]+"-"+optionName+",";
+		}
+		String displayInfo = " templet: function(d){ \n"
+	    		+ remarkStr +"\n"
+	    		+ "\t\t\t\tswitch(d."+name+"){ \n"
+	    			+ caseStr
+	    			+ "\t\t\t\t\tdefault: return '未知状态';\n"
+	    		+ "\t\t\t\t}\n"
+	    	+ "\t\t\t}";
+		
+		header = header + displayInfo + "},";
+		return header;
+	}
 
 	public String getTableName(){
 		return tableName;
diff --git a/src/com/taover/business/GenerateView.java b/src/com/taover/business/GenerateView.java
index 2500db9..cf557a6 100644
--- a/src/com/taover/business/GenerateView.java
+++ b/src/com/taover/business/GenerateView.java
@@ -34,6 +34,11 @@ public class GenerateView {
 		String dbType       = properties.getProperty("dbtype");   
 		String dbPackagePath    = properties.getProperty("packageName");
 		String tableName    = properties.getProperty("TableName");	
+		//如果文件已存在是否覆盖
+		boolean coverWhenFileExists = false;
+		if(properties.getProperty("coverWhenFileExists") != null){
+			coverWhenFileExists = Boolean.valueOf(properties.getProperty("coverWhenFileExists"));
+		}
 		
 		//WebRootPath读取
 		String webRootPath = properties.getProperty("WebRootPath");
@@ -85,7 +90,7 @@ public class GenerateView {
 			String moduleName = tableNameCurr.split("_")[0];
 			
 			//生成view
-			generateView(webRootPath, tableNameCurr, columnsInTable, false, moduleName);
+			generateView(webRootPath, tableNameCurr, columnsInTable, coverWhenFileExists, moduleName);
 			
 			System.out.println(tableNameCurr + " : 生成结束");
 		}
--
libgit2 0.21.2