From e64f7d5b22f8b2a1b4b10599658b0153190f3913 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 29 Mar 2018 15:39:21 +0800
Subject: [PATCH] =?UTF-8?q?select=E6=B7=BB=E5=8A=A0=E8=AF=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/basicInfo.jsp |  3 ++-
 .../WEB-INF/include/form/complexInfo.jsp      |  4 +++-
 .../webapp/WEB-INF/include/form/ipInfo.jsp    | 15 ++++++++----
 .../include/form/multiple/basicInfo.jsp       |  3 ++-
 .../WEB-INF/include/form/stringInfo.jsp       |  6 +++--
 .../WEB-INF/views/cfg/complexCfgList.jsp      | 14 ++++++-----
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 23 +++++++------------
 .../WEB-INF/views/cfg/multipleCfgList.jsp     |  2 +-
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 16 ++++++-------
 9 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index c91da6d59..a464d89c9 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -7,7 +7,8 @@
        <div class="form-group">
            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
            <div class="col-md-6">
-               <select name="requestId" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
+               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
+               		<option><spring:message code="select"/></option>
                	<c:forEach items="${requestInfos}" var="requestInfo">
                		<option value="${requestInfo.id}"
                		 <c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index f32c07523..ba8b76628 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -54,7 +54,8 @@
         <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
             <div class="col-md-6">
-            	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+            	<select name="matchMethod" class="selectpicker select2 form-control" >
+					<option><spring:message code="select"/></option>
 					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
 					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
@@ -71,6 +72,7 @@
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
             <div class="col-md-6">
             	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+					<option><spring:message code="select"/></option>
 					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
 					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index efc3aa2fd..15a1164a2 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -15,7 +15,8 @@
         <div class="form-group">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
             <div class="col-md-6">
-            	 <select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+            	 <select name="ipType" class="selectpicker show-tick form-control">
+                   <option><spring:message code="select"/></option>
                    <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
                    <option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
                  </select>
@@ -117,7 +118,8 @@
 		        <div class="form-group">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
 		            <div class="col-md-6">
-		            	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+		            	<select name="direction" class="selectpicker show-tick form-control">
+		                   <option><spring:message code="select"/></option>
 		                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
 		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
 		                 </select>
@@ -129,7 +131,8 @@
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
 		            <div class="col-md-6">
-		            	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+		            	<select name="protocol" class="selectpicker show-tick form-control">
+		                   <option><spring:message code="select"/></option>
 		                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
 		                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
 		                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
@@ -149,7 +152,8 @@
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
 		            <div class="col-md-6">
-		            	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+		            	<select name="protocol" class="selectpicker show-tick form-control">
+		                   <option><spring:message code="select"/></option>
 		                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
 		                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
 		                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
@@ -163,7 +167,8 @@
 		        <div class="form-group">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
 		            <div class="col-md-6">
-		            	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+		            	<select name="direction" class="selectpicker show-tick form-control" >
+		                   <option><spring:message code="select"/></option>
 		                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
 		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
 		                 </select>
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
index a02f4fb2c..21a3995d3 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
@@ -35,7 +35,8 @@
        <div class="form-group">
            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
            <div class="col-md-6">
-               <select name="requestId" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
+               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
+               	<option><spring:message code="select"/></option>
                	<c:forEach items="${requestInfos}" var="requestInfo">
                		<option value="${requestInfo.id}"
                		 <c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index 9da9b031a..651fa435a 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -52,7 +52,8 @@
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
 		            <div class="col-md-6">
-		            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
+		            	<select name="matchMethod" class="selectpicker select2 form-control" >
+							<option><spring:message code="select"/></option>
 							<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
 							<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
 							<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
@@ -68,7 +69,8 @@
 		        <div class="form-group">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
 		            <div class="col-md-6">
-		            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+		            	<select name="isHexbin" class="selectpicker select2 form-control" >
+							<option><spring:message code="select"/></option>
 							<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
 							<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
 							<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index b93746346..6c8894760 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -145,7 +145,8 @@
 										<div class="form-group">
 	                                            <label class="control-label"><spring:message code='request_number'/></label>
 	                                            <c:set var="select"><spring:message code='select'/></c:set>
-	                                            <form:select path="requestId" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${requestInfos}" var="requestInfo" >
 														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 													</c:forEach>
@@ -158,8 +159,8 @@
 									
 											<div class="form-group">
 	                                            <label class="control-label"><spring:message code='type'/></label>
-	                                            <c:set var="select"><spring:message code='select'/></c:set>
-	                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fls}" var="fl" >
 													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 												</c:forEach>
@@ -173,7 +174,8 @@
 											<div class="form-group">
 	                                            <label class="control-label"><spring:message code='attribute'/></label>
 	                                            <c:set var="select"><spring:message code='select'/></c:set>
-	                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${xzs}" var="xz" >
 														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 													</c:forEach>
@@ -186,8 +188,8 @@
 									
 											<div class="form-group">
 	                                            <label class="control-label"><spring:message code='label'/></label>
-	                                          	<c:set var="select"><spring:message code='select'/></c:set>
-	                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></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/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 3d172297d..4aa6d75ab 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -192,8 +192,8 @@
 										
 												<div class="form-group">
 		                                            <label class="control-label"><spring:message code='request_number'/></label>
-		                                            <c:set var="select"><spring:message code='select'/></c:set>
-		                                            <form:select path="requestId" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+		                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+														<form:option value=""><spring:message code="select"/></form:option>
 														<c:forEach items="${requestInfos}" var="requestInfo" >
 															<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 														</c:forEach>
@@ -206,8 +206,8 @@
 										
 												<div class="form-group">
 		                                            <label class="control-label"><spring:message code='type'/></label>
-		                                            <c:set var="select"><spring:message code='select'/></c:set>
-		                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+		                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${fls}" var="fl" >
 														<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 													</c:forEach>
@@ -220,8 +220,8 @@
 										
 												<div class="form-group">
 		                                            <label class="control-label"><spring:message code='attribute'/></label>
-		                                            <c:set var="select"><spring:message code='select'/></c:set>
-		                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+		                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+														<form:option value=""><spring:message code="select"/></form:option>
 														<c:forEach items="${xzs}" var="xz" >
 															<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 														</c:forEach>
@@ -234,20 +234,17 @@
 										
 												<div class="form-group">
 		                                            <label class="control-label"><spring:message code='label'/></label>
-		                                          	<c:set var="select"><spring:message code='select'/></c:set>
-		                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+		                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+														<form:option value=""><spring:message code="select"/></form:option>
 														<c:forEach items="${lables}" var="lable" >
 															<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
 														</c:forEach>
 													</form:select>
 												</div>
-	                                          
 	                                        </div>
 										</c:otherwise>
 									</c:choose>
 								</div>
-								
-								
 								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
@@ -265,7 +262,6 @@
 										
 										</div>
 									</div>
-									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="edit_time"/>：</label>
@@ -274,7 +270,6 @@
 										
 										</div>
 									</div>
-									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label>&nbsp;</label>
@@ -283,7 +278,6 @@
 										
 										</div>
 									</div>
-									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="audit_time"/>：</label>
@@ -292,7 +286,6 @@
 										
 										</div>
 									</div>
-									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label>&nbsp;</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index d5207c09a..593f6ea97 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -13,7 +13,7 @@
 		}else if("${cfg.complexCfg.cfgDesc}"){
 			$("#intype").val("${cfg.complexCfg.cfgDesc}");
 		}else if("${cfg.complexCfg.district}"){
-			$("#seltype").val("${cfg.complexCfg.district}");
+			$("#intype").val("${cfg.complexCfg.district}");
 		}else if("${cfg.complexCfg.keywords}"){
 			$("#intype").val("${cfg.complexCfg.keywords}");
 		}else{
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 6200f4d48..427ed087a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -149,8 +149,8 @@
 											
 													<div class="form-group">
 			                                            <label class="control-label"><spring:message code='request_number'/></label>
-			                                            <c:set var="select"><spring:message code='select'/></c:set>
-			                                            <form:select path="requestId" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+			                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+															<form:option value=""><spring:message code="select"/></form:option>
 															<c:forEach items="${requestInfos}" var="requestInfo" >
 																<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 															</c:forEach>
@@ -163,8 +163,8 @@
 											
 													<div class="form-group">
 			                                            <label class="control-label"><spring:message code='type'/></label>
-			                                            <c:set var="select"><spring:message code='select'/></c:set>
-			                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+			                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+														<form:option value=""><spring:message code="select"/></form:option>
 														<c:forEach items="${fls}" var="fl" >
 															<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 														</c:forEach>
@@ -177,8 +177,8 @@
 											
 													<div class="form-group">
 			                                            <label class="control-label"><spring:message code='attribute'/></label>
-			                                            <c:set var="select"><spring:message code='select'/></c:set>
-			                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+			                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+															<form:option value=""><spring:message code="select"/></form:option>
 															<c:forEach items="${xzs}" var="xz" >
 																<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 															</c:forEach>
@@ -191,8 +191,8 @@
 											
 													<div class="form-group">
 			                                            <label class="control-label"><spring:message code='label'/></label>
-			                                          	<c:set var="select"><spring:message code='select'/></c:set>
-			                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+			                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+															<form:option value=""><spring:message code="select"/></form:option>
 															<c:forEach items="${lables}" var="lable" >
 																<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
 															</c:forEach>