From 6e04c5616f562773aa1ced2bdb7ec8a8c8107ac1 Mon Sep 17 00:00:00 2001
From: "duxiaod@qq.com" <micheng2019>
Date: Sat, 4 May 2019 11:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=A6=E5=8F=B3=E4=B8=A4=E5=88=97=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E7=BE=8E=E8=A7=82=E5=92=8C=E9=80=82=E5=90=88?=
 =?UTF-8?q?=E5=A4=9A=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/curd/viewForm.xml   | 55 ++++++++++---------
 .../modules/gen/curd/viewFormMany.xml         | 17 ++++--
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/templates/modules/gen/curd/viewForm.xml b/src/main/resources/templates/modules/gen/curd/viewForm.xml
index 02a445ec4..bafa74703 100644
--- a/src/main/resources/templates/modules/gen/curd/viewForm.xml
+++ b/src/main/resources/templates/modules/gen/curd/viewForm.xml
@@ -39,48 +39,53 @@
 	<form:form id="inputForm" modelAttribute="${className}" action="${r"${ctx}"}/${urlPrefix}/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<sys:message content="${r"${message}"}"/>		
+		<table class="table-form">
+			<tr>
 		<#list table.columnList as c>
 			<#if c.isEdit?? && c.isEdit == "1" && (c.isNotBaseField || c.simpleJavaField == 'remarks')>
-		<div class="control-group">
-			<label class="control-label">${c.comments}：</label>
-			<div class="controls">
+				<td class="tit">${c.comments}：</td>
+				<td>
 			<#if c.showType == "input">
-				<form:input path="${c.javaFieldId}" htmlEscape="false"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xlarge <#if c.isNull != "1">required</#if><#if c.javaType == "Long" || c.javaType == "Integer"> digits</#if><#if c.javaType == "Double"> number</#if>"/>
+					<form:input path="${c.javaFieldId}" htmlEscape="false"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xlarge <#if c.isNull != "1">required</#if><#if c.javaType == "Long" || c.javaType == "Integer"> digits</#if><#if c.javaType == "Double"> number</#if>"/>
 			<#elseif c.showType == "textarea">
-				<form:textarea path="${c.javaFieldId}" htmlEscape="false" rows="4"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xxlarge <#if c.isNull != "1">required</#if>"/>
+					<form:textarea path="${c.javaFieldId}" htmlEscape="false" rows="4"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xxlarge <#if c.isNull != "1">required</#if>"/>
 			<#elseif c.showType == "select">
-				<form:select path="${c.javaFieldId}" class="input-xlarge <#if c.isNull != "1">required</#if>">
-					<form:option value="" label=""/>
-					<form:options items="${"$"}{fns:getDictList('${c.dictType}')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-				</form:select>
+					<form:select path="${c.javaFieldId}" class="input-xlarge <#if c.isNull != "1">required</#if>">
+						<form:option value="" label=""/>
+						<form:options items="${"$"}{fns:getDictList('${c.dictType}')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					</form:select>
 			<#elseif c.showType == "checkbox">
-				<form:checkboxes path="${c.javaFieldId}" items="${"$"}{fns:getDictList('${c.dictType}')}" itemLabel="label" itemValue="value" htmlEscape="false" class="<#if c.isNull != "1">required</#if>"/>
+					<form:checkboxes path="${c.javaFieldId}" items="${"$"}{fns:getDictList('${c.dictType}')}" itemLabel="label" itemValue="value" htmlEscape="false" class="<#if c.isNull != "1">required</#if>"/>
 			<#elseif c.showType == "radiobox">
-				<form:radiobuttons path="${c.javaFieldId}" items="${"$"}{fns:getDictList('${c.dictType}')}" itemLabel="label" itemValue="value" htmlEscape="false" class="<#if c.isNull != "1">required</#if>"/>
+					<form:radiobuttons path="${c.javaFieldId}" items="${"$"}{fns:getDictList('${c.dictType}')}" itemLabel="label" itemValue="value" htmlEscape="false" class="<#if c.isNull != "1">required</#if>"/>
 			<#elseif c.showType == "dateselect">
-				<input name="${c.javaFieldId}" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate <#if c.isNull != "1">required</#if>"
-					value="<fmt:formatDate value="${"$"}{${className}.${c.javaFieldId}}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
+					<input name="${c.javaFieldId}" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate <#if c.isNull != "1">required</#if>"
+						value="<fmt:formatDate value="${"$"}{${className}.${c.javaFieldId}}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+						onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 			<#elseif c.showType == "userselect">
-				<sys:treeselect id="${c.simpleJavaField}" name="${c.javaFieldId}" value="${"$"}{${className}.${c.javaFieldId}}" labelName="${c.javaFieldName}" labelValue="${"$"}{${className}.${c.javaFieldName}}"
-					title="用户" url="/sys/office/treeData?type=3" cssClass="<#if c.isNull != "1">required</#if>" allowClear="true" notAllowSelectParent="true"/>
+					<sys:treeselect id="${c.simpleJavaField}" name="${c.javaFieldId}" value="${"$"}{${className}.${c.javaFieldId}}" labelName="${c.javaFieldName}" labelValue="${"$"}{${className}.${c.javaFieldName}}"
+						title="用户" url="/sys/office/treeData?type=3" cssClass="<#if c.isNull != "1">required</#if>" allowClear="true" notAllowSelectParent="true"/>
 			<#elseif c.showType == "officeselect">
-				<sys:treeselect id="${c.simpleJavaField}" name="${c.javaFieldId}" value="${"$"}{${className}.${c.javaFieldId}}" labelName="${c.javaFieldName}" labelValue="${"$"}{${className}.${c.javaFieldName}}"
-					title="部门" url="/sys/office/treeData?type=2" cssClass="<#if c.isNull != "1">required</#if>" allowClear="true" notAllowSelectParent="true"/>
+					<sys:treeselect id="${c.simpleJavaField}" name="${c.javaFieldId}" value="${"$"}{${className}.${c.javaFieldId}}" labelName="${c.javaFieldName}" labelValue="${"$"}{${className}.${c.javaFieldName}}"
+						title="部门" url="/sys/office/treeData?type=2" cssClass="<#if c.isNull != "1">required</#if>" allowClear="true" notAllowSelectParent="true"/>
 			<#elseif c.showType == "areaselect">
-				<sys:treeselect id="${c.simpleJavaField}" name="${c.javaFieldId}" value="${"$"}{${className}.${c.javaFieldId}}" labelName="${c.javaFieldName}" labelValue="${"$"}{${className}.${c.javaFieldName}}"
-					title="区域" url="/sys/area/treeData" cssClass="<#if c.isNull != "1">required</#if>" allowClear="true" notAllowSelectParent="true"/>
+					<sys:treeselect id="${c.simpleJavaField}" name="${c.javaFieldId}" value="${"$"}{${className}.${c.javaFieldId}}" labelName="${c.javaFieldName}" labelValue="${"$"}{${className}.${c.javaFieldName}}"
+						title="区域" url="/sys/area/treeData" cssClass="<#if c.isNull != "1">required</#if>" allowClear="true" notAllowSelectParent="true"/>
 			<#elseif c.showType == "fileselect">
-				<form:hidden id="${c.simpleJavaField}" path="${c.javaFieldId}" htmlEscape="false"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xlarge"/>
-				<sys:ckfinder input="${c.simpleJavaField}" type="files" uploadPath="/${moduleName}<#if subModuleName != "">/${subModuleName}</#if>/${className}" selectMultiple="true"/>
+					<form:hidden id="${c.simpleJavaField}" path="${c.javaFieldId}" htmlEscape="false"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xlarge"/>
+					<sys:ckfinder input="${c.simpleJavaField}" type="files" uploadPath="/${moduleName}<#if subModuleName != "">/${subModuleName}</#if>/${className}" selectMultiple="true"/>
 			</#if>
 			<#if c.isNull != "1">
-				<span class="help-inline"><font color="red">*</font> </span>
+					<span class="help-inline"><font color="red">*</font> </span>
+			</#if>
+				</td>
+			<#if c_index%2==0>
+			</tr>
+		<tr>
 			</#if>
-			</div>
-		</div>
 			</#if>
 		</#list>
+		</table>
 		<div class="form-actions">
 			<shiro:hasPermission name="${permissionPrefix}:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
diff --git a/src/main/resources/templates/modules/gen/curd/viewFormMany.xml b/src/main/resources/templates/modules/gen/curd/viewFormMany.xml
index f6b834c62..da8b71972 100644
--- a/src/main/resources/templates/modules/gen/curd/viewFormMany.xml
+++ b/src/main/resources/templates/modules/gen/curd/viewFormMany.xml
@@ -72,12 +72,13 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="${className}" action="${r"${ctx}"}/${urlPrefix}/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${r"${message}"}"/>		
+		<sys:message content="${r"${message}"}"/>
+		<table class="table-form">
+		<tr>		
 		<#list table.columnList as c>
 			<#if c.isEdit?? && c.isEdit == "1" && (c.isNotBaseField || c.simpleJavaField == 'remarks')>
-		<div class="control-group">
-			<label class="control-label">${c.comments}：</label>
-			<div class="controls">
+			<td class="tit">${c.comments}：</td>
+			<td>
 			<#if c.showType == "input">
 				<form:input path="${c.javaFieldId}" htmlEscape="false"<#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="input-xlarge <#if c.isNull != "1">required</#if><#if c.javaType == "Long" || c.javaType == "Integer"> digits</#if><#if c.javaType == "Double"> number</#if>"/>
 			<#elseif c.showType == "textarea">
@@ -111,10 +112,14 @@
 			<#if c.isNull != "1">
 				<span class="help-inline"><font color="red">*</font> </span>
 			</#if>
-			</div>
-		</div>
+			</td>
+			<#if c_index%2==0>
+			</tr>
+			<tr>
+			</#if>
 			</#if>
 		</#list>
+		</table>
 		<#list table.childList as child>
 			<div class="control-group">
 				<label class="control-label">${child.comments}：</label>
-- 
Gitee