From 68bfa011f31de187e35be61899b66bf4f4823765 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 22 Mar 2018 18:19:00 +0800
Subject: [PATCH] =?UTF-8?q?mantis:0000012=20=E4=B8=8B=E6=8B=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=9C=89=E7=BC=BA=E7=9C=81=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/complexCfgList.jsp      | 19 ++++++++------
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 25 +++++++++----------
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 25 +++++++++----------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index f9a570046..409022bba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -65,8 +65,8 @@
 							<div class="col-md-12">
 								<div class="pull-left">
 									<c:set var="state"><spring:message code='state'/></c:set>
-									<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
-										<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="state"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
@@ -75,7 +75,8 @@
 								</div>
 								<div class="pull-left">
 									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+									<form:select path="requestId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+										<form:option value=""><spring:message code="${request_number}"></spring:message></form:option>
 										<c:forEach items="${requestInfos}" var="requestInfo" >
 											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 										</c:forEach>
@@ -83,7 +84,8 @@
 								</div>
 								<div class="pull-left">
 									<c:set var="flI18n"><spring:message code='type'/></c:set>
-									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+									<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+										<form:option value=""><spring:message code="${flI18n}"></spring:message></form:option>
 										<c:forEach items="${fls}" var="fl" >
 											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 										</c:forEach>
@@ -91,7 +93,8 @@
 								</div>
 								<div class="pull-left">
 									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+									<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+										<form:option value=""><spring:message code="${attributeI18n}"></spring:message></form:option>
 										<c:forEach items="${xzs}" var="xz" >
 											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 										</c:forEach>
@@ -99,7 +102,8 @@
 								</div>
 								<div class="pull-left">
 									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+									<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+										<form:option value=""><spring:message code="${labelI18n}"></spring:message></form:option>
 										<c:forEach items="${lables}" var="lable" >
 											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
 										</c:forEach>
@@ -110,7 +114,8 @@
 								</button> --%>
 								<div class="pull-left">
 								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
-									<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
+									<select name="orderBy" class="selectpicker select2 input-small">
+										<option value="" <c:if test="${empty page.orderBy}">selected</c:if> ><spring:message code="${sortI18n}"/></option>
 										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
 										<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
 										<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 94ce304cb..27e4c836f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -65,9 +65,8 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-									<c:set var="state"><spring:message code='state'/></c:set>
-									<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
-										<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="state"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
@@ -120,8 +119,8 @@
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button> --%>
 								<div class="pull-left">
-								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
-									<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
+									<select name="orderBy" class="selectpicker select2 input-small">
+										<option value="" <c:if test="${empty page.orderBy}">selected</c:if> ><spring:message code="sort"/></option>
 										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
 										<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
 										<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
@@ -153,32 +152,32 @@
 										</c:when>
 										<c:otherwise>
 											<div class="pull-left">
-												<c:set var="request_number"><spring:message code='request_number'/></c:set>
-												<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+												<form:select path="requestId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="request_number"></spring:message></form:option>
 													<c:forEach items="${requestInfos}" var="requestInfo" >
 														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 													</c:forEach>
 												</form:select>
 											</div>
 											<div class="pull-left">
-												<c:set var="flI18n"><spring:message code='type'/></c:set>
-												<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="type"></spring:message></form:option>
 													<c:forEach items="${fls}" var="fl" >
 														<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 													</c:forEach>
 												</form:select>
 											</div>
 											<div class="pull-left">
-												<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-												<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="attribute"></spring:message></form:option>
 													<c:forEach items="${xzs}" var="xz" >
 														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 													</c:forEach>
 												</form:select>
 											</div>
 											<div class="pull-left">
-												<c:set var="labelI18n"><spring:message code='label'/></c:set>
-												<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="label"></spring:message></form:option>
 													<c:forEach items="${lables}" var="lable" >
 														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
 													</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 4004f2f9b..799f9b5d4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -64,9 +64,8 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-									<c:set var="state"><spring:message code='state'/></c:set>
-									<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
-										<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="state"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
@@ -78,32 +77,32 @@
 									</c:when>
 									<c:otherwise>
 										<div class="pull-left">
-											<c:set var="request_number"><spring:message code='request_number'/></c:set>
-											<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+											<form:select path="requestId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="request_number"></spring:message></form:option>
 												<c:forEach items="${requestInfos}" var="requestInfo" >
 													<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 												</c:forEach>
 											</form:select>
 										</div>
 										<div class="pull-left">
-											<c:set var="flI18n"><spring:message code='type'/></c:set>
-											<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+											<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value="${fl.serviceDictId}"><spring:message code="type"></spring:message></form:option>
 												<c:forEach items="${fls}" var="fl" >
 													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 												</c:forEach>
 											</form:select>
 										</div>
 										<div class="pull-left">
-											<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-											<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+											<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="attribute"></spring:message></form:option>
 												<c:forEach items="${xzs}" var="xz" >
 													<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 												</c:forEach>
 											</form:select>
 										</div>
 										<div class="pull-left">
-											<c:set var="labelI18n"><spring:message code='label'/></c:set>
-											<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+											<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="label"></spring:message></form:option>
 												<c:forEach items="${lables}" var="lable" >
 													<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
 												</c:forEach>
@@ -115,8 +114,8 @@
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button> --%>
 								<div class="pull-left">
-								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
-									<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
+									<select name="orderBy" class="selectpicker select2 input-small">
+										<option value="" <c:if test="${empty page.orderBy}">selected</c:if> ><spring:message code="sort"/></option>
 										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
 										<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
 										<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>