From cf244187e56d82c9597c7ed05899a4e7d9bcf766 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 25 May 2018 16:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ipInfo=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1Ip=E7=95=8C=E9=9D=A2=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4voipForm=E7=95=8C=E9=9D=A2=E5=92=8CipInfo?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84ip=E5=85=83=E7=B4=A0=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E4=BF=AE=E6=94=B9switchIpInfo=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/ipInfo.jsp    | 204 ++++++++++--------
 .../WEB-INF/views/cfg/av/voip/voipForm.jsp    |  63 +++---
 .../webapp/static/global/scripts/common.js    |  32 ++-
 3 files changed, 166 insertions(+), 133 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 15b8329ba..7c38ef0f3 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -2,24 +2,14 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-            <div class="col-md-6">
-                <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
-            </div>
-            <div for="cfgDesc"></div>
-        </div>
-    </div>
     <div class="col-md-6">
         <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 required">
-                   <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
+                   <option value="4" <c:if test="${_cfg.ipType==4 || _cfg.ipType==null }">selected</c:if> >V4</option>
                    <option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
                  </select>
-                 <!--  <input class="form-control" type="text"  value="${_cfg.ipType}">-->
             </div>
             <div for="ipType"></div>
         </div>
@@ -28,84 +18,128 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+            <div class="col-md-6">
+            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
+                   <option value="1" <c:if test="${_cfg.ipPattern==1}">selected</c:if> ><spring:message code="ip_subnet"/></option>
+                   <option value="2" <c:if test="${_cfg.ipPattern==2}">selected</c:if>><spring:message code="ip_range"/></option>
+                   <option value="3" <c:if test="${_cfg.ipPattern==3 || _cfg.ipPattern==null}">selected</c:if>>IP</option>
+                 </select>
+            </div>
+            <div for="ipPattern"></div>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
             <div class="col-md-6">
-                <input class="form-control required ipCheck" type="text" name="srcIp" value="${_cfg.srcIp}">
+                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
             </div>
-            <div for="srcIp"></div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_address_mask"/></label>
-            <div class="col-md-6">
-                 <input class="form-control required ipMask" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
-            </div>
-            <div for="srcIpMask"></div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-            <div class="col-md-6">
-                <input class="form-control required" type="text" name="srcPort" range="[0,65535]" value="${_cfg.srcPort}">
-            </div>
-            <div for="srcPort"></div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port_mask"/></label>
-            <div class="col-md-6">
-                 <input class="form-control required" type="text" name="srcPortMask" range="[0,65535]" value="${_cfg.srcPortMask}">
-            </div>
-            <div for="srcPortMask"></div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-            <div class="col-md-6">
-                <input class="form-control required ipCheck" type="text" name="dstIp" value="${_cfg.dstIp}">
-            </div>
-            <div for="dstIp"></div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_address_mask"/></label>
-            <div class="col-md-6">
-                 <input class="form-control required ipMask" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
-            </div>
-            <div for="dstIpMask"></div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
-            <div class="col-md-6">
-                <input class="form-control required" type="text" name="dstPort" range="[0,65535]" value="${_cfg.dstPort}">
-            </div>
-            <div for="dstPort"></div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port_mask"/></label>
-            <div class="col-md-6">
-                 <input class="form-control required" type="text" name="dstPortMask" range="[0,65535]" value="${_cfg.dstPortMask}">
-            </div>
-            <div for="dstPortMask"></div>
+            <div for="srcIpAddress"></div>
         </div>
     </div>
 </div>
 <c:choose>
+	<c:when test="${_cfg.cfgId==null}">
+		<div class="row hidden port">
+	</c:when>
+	<c:otherwise>
+		<div class="row port">
+	</c:otherwise>
+</c:choose>
+    <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+            <div class="col-md-6">
+            	 <select name="portPattern" class="selectpicker show-tick form-control required">
+                   <option value="1" <c:if test="${_cfg.portPattern==1 || _cfg.portPattern== null}">selected</c:if> >port</option>
+                   <option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
+                 </select>
+            </div>
+            <div for="portPattern"></div>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div class="form-group ">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+            <div class="col-md-6">
+                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
+            </div>
+            <div for="srcPort"></div>
+        </div>
+    </div>
+</div>
+<c:choose>
+	<c:when test="${_cfg.cfgId==null}">
+		<div class="row hidden destPort">
+	</c:when>
+	<c:otherwise>
+		<div class="row destPort">
+	</c:otherwise>
+</c:choose>
+    <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+            <div class="col-md-6">
+                   <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+            </div>
+            <div for="destIpAddress"></div>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div class="form-group ">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+            <div class="col-md-6">
+                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
+            </div>
+            <div for="destPort"></div>
+        </div>
+    </div>
+</div>
+<c:choose>
+	<c:when test="${_cfg.cfgId==null}">
+		<div class="row hidden protocol">
+	</c:when>
+	<c:otherwise>
+		<div class="row protocol">
+	</c:otherwise>
+</c:choose>
+    <div class="col-md-6">
+        <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 required">
+                   <option value=""><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 || _cfg.protocol==null}">selected</c:if>><spring:message code="arbitrary"/></option>
+                </select>
+                <input type="hidden" name="protocolId" value="0">
+            </div>
+            <div for="protocol"></div>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <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 required" >
+                   <option value=""><spring:message code="select"/></option>
+                   <option value="0" <c:if test="${_cfg.direction==0 || _cfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
+                   <option value="1" <c:if test="${_cfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
+                   <option value="2" <c:if test="${_cfg.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
+                 </select>
+            </div>
+            <div for="direction"></div>
+        </div>
+    </div>
+</div>
+<c:if test="${_cfg.cfgId==null}">
+	<div class="row">
+	<button type="button" class="btn btn-red-hollow center-block" onClick="more(this);" data-click-times="0"><spring:message code="show_more"/></button>
+	</div>
+</c:if>
+<%-- <c:choose>
 	<c:when test="${action==5}">
 		<input type="hidden" name="protocol" value="0">
 		<input type="hidden" name="direction" value="0">
@@ -136,7 +170,7 @@
 		                   <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>
 		                </select>
-		                <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
+		                <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}">
 		            </div>
 		            <div for="protocol"></div>
 		        </div>
@@ -157,7 +191,7 @@
 		                   <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>
 		                </select>
-		                <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
+		                <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}">
 		            </div>
 		            <div for="protocol"></div>
 		        </div>
@@ -217,5 +251,5 @@
 		    </div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose> --%>
 <!--/row-->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 6ce612d88..21a8a7f1b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -249,21 +249,7 @@ var delContent=function(contentClassName,addBtnClassName){
 							            <div for="voipIps[${status.index }].ipPattern"></div>
 							        </div>
 							    </div>
-							     <div class="col-md-6">
-							        <div class="form-group">
-							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
-							            <div class="col-md-6">
-							            	 <select name="voipIps[${status.index }].portPattern" class="selectpicker show-tick form-control required">
-							                   <option value="1" <c:if test="${voipIp.portPattern==1 || voipIp.portPattern== null}">selected</c:if> >port</option>
-							                   <option value="2" <c:if test="${voipIp.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
-							                 </select>
-							            </div>
-							            <div for="voipIps[${status.index }].portPattern"></div>
-							        </div>
-							    </div>
-							</div>
-							<div class="row">
-							   <div class="col-md-6">
+							    <div class="col-md-6">
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
 							            <div class="col-md-6">
@@ -272,15 +258,6 @@ var delContent=function(contentClassName,addBtnClassName){
 							            <div for="voipIps[${status.index }].srcIpAddress"></div>
 							        </div>
 							    </div>
-							    <div class="col-md-6">
-							        <div class="form-group ">
-							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-							            <div class="col-md-6">
-							                 <input class="form-control required" type="text" name="voipIps[${status.index }].srcPort" value="${voipIp.srcPort}">
-							            </div>
-							            <div for="voipIps[${status.index }].srcPort"></div>
-							        </div>
-							    </div>
 							</div>
 							<c:choose>
 								<c:when test="${voipIp.cfgId==null}">
@@ -289,12 +266,42 @@ var delContent=function(contentClassName,addBtnClassName){
 								<c:otherwise>
 									<div class="row port">
 								</c:otherwise>
+							</c:choose>
+							    <div class="col-md-6">
+							        <div class="form-group">
+							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+							            <div class="col-md-6">
+							            	 <select name="voipIps[${status.index }].portPattern" class="selectpicker show-tick form-control required">
+							                   <option value="1" <c:if test="${voipIp.portPattern==1 || voipIp.portPattern== null}">selected</c:if> >port</option>
+							                   <option value="2" <c:if test="${voipIp.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
+							                 </select>
+							            </div>
+							            <div for="voipIps[${status.index }].portPattern"></div>
+							        </div>
+							    </div>
+							    <div class="col-md-6">
+							        <div class="form-group ">
+							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+							            <div class="col-md-6">
+							                 <input class="form-control required portCheck" type="text" name="voipIps[${status.index }].srcPort" value="${voipIp.srcPort}">
+							            </div>
+							            <div for="voipIps[${status.index }].srcPort"></div>
+							        </div>
+							    </div>
+							</div>
+							<c:choose>
+								<c:when test="${voipIp.cfgId==null}">
+									<div class="row hidden destPort">
+								</c:when>
+								<c:otherwise>
+									<div class="row destPort">
+								</c:otherwise>
 							</c:choose>
 							    <div class="col-md-6">
 							        <div class="form-group">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
 							            <div class="col-md-6">
-							                   <input class="form-control required" type="text" name="voipIps[${status.index }].destIpAddress" value="${voipIp.destIpAddress}">
+							                   <input class="form-control required ipCheck" type="text" name="voipIps[${status.index }].destIpAddress" value="${voipIp.destIpAddress}">
 							            </div>
 							            <div for="voipIps[${status.index }].destIpAddress"></div>
 							        </div>
@@ -303,7 +310,7 @@ var delContent=function(contentClassName,addBtnClassName){
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 							            <div class="col-md-6">
-							                 <input class="form-control required" type="text" name="voipIps[${status.index }].destPort" value="${voipIp.destPort}">
+							                 <input class="form-control required portCheck" type="text" name="voipIps[${status.index }].destPort" value="${voipIp.destPort}">
 							            </div>
 							            <div for="voipIps[${status.index }].destPort"></div>
 							        </div>
@@ -339,8 +346,8 @@ var delContent=function(contentClassName,addBtnClassName){
 							            	<select name="voipIps[${status.index }].direction" class="selectpicker show-tick form-control required" >
 							                   <option value=""><spring:message code="select"/></option>
 							                   <option value="0" <c:if test="${voipIp.direction==0 || voipIp.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
-							                   <option value="1" <c:if test="${voipIp.direction==1 }">selected</c:if>>源<spring:message code="ingress"/></option>
-							                   <option value="2" <c:if test="${voipIp.direction==2 }">selected</c:if>>目的<spring:message code="degress"/></option>
+							                   <option value="1" <c:if test="${voipIp.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
+							                   <option value="2" <c:if test="${voipIp.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
 							                 </select>
 							            </div>
 							            <div for="voipIps[${status.index }].direction"></div>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 9ab23121d..817946c39 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -60,28 +60,16 @@ var switchIpInfo=function(obj,type){
 	var ipPattern="";
 	var portPattern="";
 	
-	var row=$(obj).parents('.row');
+	var row=$(obj).parents('.row').parents('.row');
 	
-	if(type=="ipType"){
-		ipType=$(obj).val();
-		ipPattern=row.siblings().find("select[name$='ipPattern']").val();
-		portPattern=row.siblings().find("select[name$='portPattern']").val();
-	}
-	if(type=="ipPattern"){
-		ipType=row.siblings().find("select[name$='ipType']").val();
-		ipPattern=$(obj).val();
-		portPattern=row.siblings().find("select[name$='portPattern']").val();
-	}
-	if(type=="portPattern"){
-		ipType=row.siblings().find("select[name$='ipType']").val();
-		ipPattern=row.siblings().find("select[name$='ipPattern']").val();
-		portPattern=$(obj).val();
-	}
+	ipType=row.find("select[name$='ipType']").val();
+	ipPattern=row.find("select[name$='ipPattern']").val();
+	portPattern=row.find("select[name$='portPattern']").val();
 	
-	var srcIp=row.siblings().find("input[name$='srcIpAddress']");
-	var destIp=row.siblings().find("input[name$='destIpAddress']");
-	var srcPort=row.siblings().find("input[name$='srcPort']");
-	var destPort=row.siblings().find("input[name$='destPort']");
+	var srcIp=row.find("input[name$='srcIpAddress']");
+	var destIp=row.find("input[name$='destIpAddress']");
+	var srcPort=row.find("input[name$='srcPort']");
+	var destPort=row.find("input[name$='destPort']");
 	
 	var ipV4Default=new Array();
 	ipV4Default[0]="0.0.0.0/8"; //subnet
@@ -244,6 +232,10 @@ var more=function(obj){
 		$(obj).data("click-times",clickTimes+1);
 	}
 	if(clickTimes==1){
+		$(".destPort").removeClass("hidden").removeClass("disabled");
+		$(obj).data("click-times",clickTimes+1);
+	}
+	if(clickTimes==2){
 		$(".protocol").removeClass("hidden").removeClass("disabled");
 		$(obj).data("click-times",clickTimes+1);
 	}