From 116087c0684b8f926a8ac672de7b22ef58df2234 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Mon, 9 Apr 2018 11:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E7=B1=BB=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC=20=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E6=AC=BA=E9=AA=97ip=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp | 81 +++----------------
 .../webapp/static/global/scripts/common.js    | 16 ++++
 2 files changed, 25 insertions(+), 72 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 18d18b324..b98068673 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -21,6 +21,7 @@
 </c:choose>
 <script type="text/javascript">
 $(function(){
+	switchIpType($("select[name='ipType']"));
 	$("#submitBtn").on("click",function(){
 		$("#inputFrom").attr("action","${ctx}/cfg/dnsIp/save");
 		$("#inputFrom").submit();
@@ -29,73 +30,9 @@ $(function(){
 		window.history.back();
 	});
 	$("select[name='ipType']").on("change",function(){
-		var type=$(this).val();
-		if(4==type){
-			if(!$("input[name='srcIpMask']").val()){
-				$("input[name='srcIpMask']").val("255.255.255.255");
-			}else if($("input[name='srcIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
-				$("input[name='srcIpMask']").val("255.255.255.255");
-			}
-			if(!$("input[name='dstIpMask']").val()){
-				$("input[name='dstIpMask']").val("255.255.255.255");
-			}else if($("input[name='dstIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
-				$("input[name='dstIpMask']").val("255.255.255.255");
-			}
-			if(!$("input[name='srcIp']").val()){
-				$("input[name='srcIp']").val("0.0.0.0");
-			}else if($("input[name='srcIp']").val()=="::"){
-				$("input[name='srcIp']").val("0.0.0.0");
-			}
-			if(!$("input[name='dstIp']").val()){
-				$("input[name='dstIp']").val("0.0.0.0");
-			}else if($("input[name='dstIp']").val()=="::"){
-				$("input[name='dstIp']").val("0.0.0.0");
-			}
-		}
-		if(6==type){
-			if(!$("input[name='srcIpMask']").val()){
-				$("input[name='srcIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-			}else if($("input[name='srcIpMask']").val()=="255.255.255.255"){
-				$("input[name='srcIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-			}
-			if(!$("input[name='dstIpMask']").val()){
-				$("input[name='dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-			}else if($("input[name='dstIpMask']").val()=="255.255.255.255"){
-				$("input[name='dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-			}
-			if(!$("input[name='srcIp']").val()){
-				$("input[name='srcIp']").val("::");
-			}else if($("input[name='srcIp']").val()=="0.0.0.0"){
-				$("input[name='srcIp']").val("::");
-			}
-			if(!$("input[name='dstIp']").val()){
-				$("input[name='dstIp']").val("::");
-			}else if($("input[name='dstIp']").val()=="0.0.0.0"){
-				$("input[name='dstIp']").val("::");
-			}
-		}
+		switchIpType($(this));
 	}); 		
 	$("#inputFrom").validate({
-		rules: {
-			srcPort: {
-				max: 65535,
-				min: 0
-			},
-			dstPort: {
-				max: 65535,
-				min: 0
-			}
-		},
-		messages: {
-			srcPort: {
-				max: '范围0-65535!',
-				min: '范围0-65535!'
-			},
-			dstPort: {
-				max: '范围0-65535!',
-				min: '范围0-65535!'
-			}
-		},
 		errorPlacement: function(error,element){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 		},
@@ -146,7 +83,7 @@ $(function(){
 							        <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" title=<spring:message code="select"/>>
+							            	 <select name="ipType" class="selectpicker show-tick form-control required">
 							                   <option value="4" <c:if test="${dnsIpCfg.ipType==4}">selected</c:if> >V4</option>
 							                   <option value="6" <c:if test="${dnsIpCfg.ipType==6}">selected</c:if>>V6</option>
 							                 </select>
@@ -169,7 +106,7 @@ $(function(){
 							        <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" type="text" name="srcIpMask" value="${dnsIpCfg.srcIpMask}">
+							                 <input class="form-control required ipMask" type="text" name="srcIpMask" value="${dnsIpCfg.srcIpMask}">
 							            </div>
 							            <div for="srcIpMask"></div>
 							        </div>
@@ -180,7 +117,7 @@ $(function(){
 							        <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" value="${dnsIpCfg.srcPort}">
+							                <input class="form-control required" type="text" name="srcPort" value="${dnsIpCfg.srcPort}" range="[0,65535]">
 							            </div>
 							            <div for="srcPort"></div>
 							        </div>
@@ -189,7 +126,7 @@ $(function(){
 							        <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" value="${dnsIpCfg.srcPortMask}">
+							                 <input class="form-control required" type="text" name="srcPortMask" value="${dnsIpCfg.srcPortMask}" range="[0,65535]">
 							            </div>
 							            <div for="srcPortMask"></div>
 							        </div>
@@ -209,7 +146,7 @@ $(function(){
 							        <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" type="text" name="dstIpMask" value="${dnsIpCfg.dstIpMask}">
+							                 <input class="form-control required ipMask" type="text" name="dstIpMask" value="${dnsIpCfg.dstIpMask}">
 							            </div>
 							            <div for="dstIpMask"></div>
 							        </div>
@@ -220,7 +157,7 @@ $(function(){
 							        <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" value="${dnsIpCfg.dstPort}">
+							                <input class="form-control required" type="text" name="dstPort" value="${dnsIpCfg.dstPort}" range="[0,65535]">
 							            </div>
 							            <div for="dstPort"></div>
 							        </div>
@@ -229,7 +166,7 @@ $(function(){
 							        <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" value="${dnsIpCfg.dstPortMask}">
+							                 <input class="form-control required" type="text" name="dstPortMask" value="${dnsIpCfg.dstPortMask}" range="[0,65535]">
 							            </div>
 							            <div for="dstPortMask"></div>
 							        </div>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 91b5673fc..6d3679d5b 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -5,6 +5,10 @@ var switchIpType=function(obj){
 	var dstIpMask=row.siblings().find("input[name$='dstIpMask']");
 	var srcIp=row.siblings().find("input[name$='srcIp']");
 	var dstIp=row.siblings().find("input[name$='dstIp']");
+	var srcPort=row.siblings().find("input[name$='srcPort']");
+	var srcPortMask=row.siblings().find("input[name$='srcPortMask']");
+	var dstPort=row.siblings().find("input[name$='dstPort']");
+	var dstPortMask=row.siblings().find("input[name$='dstPortMask']");
 	if(4==type){
 		if(!$(srcIpMask).val()){
 			$(srcIpMask).val("255.255.255.255");
@@ -26,6 +30,18 @@ var switchIpType=function(obj){
 		}else if($(dstIp).val()=="::"){
 			$(dstIp).val("0.0.0.0");
 		}
+		if(!$(srcPort).val()){
+			$(srcPort).val("0");
+		}
+		if(!$(dstPort).val()){
+			$(dstPort).val("0");
+		}
+		if(!$(srcPortMask).val()){
+			$(srcPortMask).val("65535");
+		}
+		if(!$(dstPortMask).val()){
+			$(dstPortMask).val("65535");
+		}
 	}
 	if(6==type){
 		if(!$(srcIpMask).val()){