From 689b4eb4604902144846fb431d4b6376e6ac4c70 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 9 Apr 2018 10:24:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=9F=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6IP=E9=85=8D=E7=BD=AE=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E4=B8=BA=E7=A9=BA=E9=BB=98=E8=AE=A4=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/multiple/ipInfo.jsp | 13 +++++--------
 .../webapp/WEB-INF/views/cfg/multipleCfgForm.jsp    |  7 +++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
index 1ba595455..94b005c6b 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
@@ -1,8 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<style>
-
-</style>
 <h3 class="form-section">
 <c:choose>
     <c:when test="${mainTableType eq '1' and otherTable==null}">
@@ -13,7 +10,7 @@
     </c:when>
     <c:otherwise>IP<spring:message code="block_config"/></c:otherwise>
 </c:choose>
-<small><span style="margin-left:10px"><input type="checkbox" id="ipSelect"/> 可选</span><!-- <span class="glyphicon glyphicon-plus" data-toggle="collapse" data-target=".ipCfg" title="add"></span> --></small></h3>
+<small><span style="margin-left:10px"><input type="checkbox" id="ipSelect" <c:if test="${_cfg.ipCfg[mainTable]!= null and _cfg.ipCfg[mainTable].cfgId != null}">checked</c:if> <c:if test="${_cfg.ipCfg[otherTable.tableName]!= null and _cfg.ipCfg[otherTable.tableName].cfgId != null}">checked</c:if>/> 可选</span><!-- <span class="glyphicon glyphicon-plus" data-toggle="collapse" data-target=".ipCfg" title="add"></span> --></small></h3>
 <div class="row ipCfg collapse">
     <div class="col-md-6">
         <div class="form-group">
@@ -264,15 +261,15 @@
             		<c:when test="${mainTableType eq '1' and otherTable==null}">
             		<select name="ipCfg[${mainTable}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
 	                   <option value="" ><spring:message code="select"/></option>
-	                   <option value="0" <c:if test="${_cfg.ipCfg[mainTable].direction==0}">selected</c:if>>0</option>
-	                   <option value="1" <c:if test="${_cfg.ipCfg[mainTable].direction==1}">selected</c:if>>1</option>
+	                   <option value="0" <c:if test="${_cfg.ipCfg[mainTable].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+	                   <option value="1" <c:if test="${_cfg.ipCfg[mainTable].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
 	                 </select>
             		</c:when>
             		<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
             		<select name="ipCfg[${otherTable.tableName}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
 	                   <option value="" ><spring:message code="select"/></option>
-	                   <option value="0" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==0}">selected</c:if>>0</option>
-	                   <option value="1" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==1}">selected</c:if>>1</option>
+	                   <option value="0" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+	                   <option value="1" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
 	                 </select>
             		</c:when>
             	</c:choose>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index 59eb92700..0de09e29e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -6,6 +6,13 @@
 <script type="text/javascript">
 $(function(){
 	$("[name^='ipCfg']").attr("disabled",true);
+	if($("#ipSelect").is(":checked")){
+		$("[name^='ipCfg']").removeProp("disabled");
+		//解决select插件disbale后无法恢复
+		$(".bootstrap-select").removeClass("disabled");
+		$(".bootstrap-select button").removeClass("disabled");
+		$(".collapse").addClass("in");
+	}
 	//$("[name^='stringCfg']").attr("disabled",true);
 	//$("[name^='complexCfg']").attr("disabled",true);
 	//$("[name^='numCfg']").attr("disabled",true);

From e6e9c8167267dd4ec912164e2b5e4ce28a318d1c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 9 Apr 2018 11:03:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E5=85=A5common.js,=E5=85=B1?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84js=E6=96=B9=E6=B3=95=E5=86=99=E5=9C=A8?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/ipInfo.jsp    |  8 +--
 .../WEB-INF/include/form/multiple/ipInfo.jsp  | 16 +++---
 src/main/webapp/WEB-INF/include/header.jsp    |  1 +
 .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp    | 10 ----
 .../webapp/static/global/scripts/common.js    | 52 +++++++++++++++++++
 5 files changed, 65 insertions(+), 22 deletions(-)
 create mode 100644 src/main/webapp/static/global/scripts/common.js

diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 8657269ed..25aae737f 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -51,7 +51,7 @@
         <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="${_cfg.srcPort}">
+                <input class="form-control required" type="text" name="srcPort" range="[0,65535]" value="${_cfg.srcPort}">
             </div>
             <div for="srcPort"></div>
         </div>
@@ -60,7 +60,7 @@
         <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="${_cfg.srcPortMask}">
+                 <input class="form-control required" type="text" name="srcPortMask" range="[0,65535]" value="${_cfg.srcPortMask}">
             </div>
             <div for="srcPortMask"></div>
         </div>
@@ -91,7 +91,7 @@
         <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="${_cfg.dstPort}">
+                <input class="form-control required" type="text" name="dstPort" range="[0,65535]" value="${_cfg.dstPort}">
             </div>
             <div for="dstPort"></div>
         </div>
@@ -100,7 +100,7 @@
         <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="${_cfg.dstPortMask}">
+                 <input class="form-control required" type="text" name="dstPortMask" range="[0,65535]" value="${_cfg.dstPortMask}">
             </div>
             <div for="dstPortMask"></div>
         </div>
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
index 94b005c6b..86e65237b 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
@@ -115,10 +115,10 @@
             <div class="col-md-6">
                 <c:choose>
             		<c:when test="${mainTableType eq '1' and otherTable==null}">
-            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].srcPort" value="${_cfg.ipCfg[mainTable].srcPort}">
+            		<input class="form-control required" range="[0,65535]" type="text" name="ipCfg[${mainTable}].srcPort" value="${_cfg.ipCfg[mainTable].srcPort}">
             		</c:when>
             		<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
-            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].srcPort" value="${_cfg.ipCfg[otherTable.tableName].srcPort}">
+            		<input class="form-control required" range="[0,65535]" type="text" name="ipCfg[${otherTable.tableName}].srcPort" value="${_cfg.ipCfg[otherTable.tableName].srcPort}">
             		</c:when>
             	</c:choose>
             </div>
@@ -138,10 +138,10 @@
             <div class="col-md-6">
                  <c:choose>
             		<c:when test="${mainTableType eq '1' and otherTable==null}">
-            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].srcPortMask" value="${_cfg.ipCfg[mainTable].srcPortMask}">
+            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].srcPortMask" range="[0,65535]" value="${_cfg.ipCfg[mainTable].srcPortMask}">
             		</c:when>
             		<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
-            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].srcPortMask" value="${_cfg.ipCfg[otherTable.tableName].srcPortMask}">
+            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].srcPortMask" range="[0,65535]" value="${_cfg.ipCfg[otherTable.tableName].srcPortMask}">
             		</c:when>
             	</c:choose>
             </div>
@@ -211,10 +211,10 @@
             <div class="col-md-6">
                 <c:choose>
             		<c:when test="${mainTableType eq '1' and otherTable==null}">
-            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstPort" value="${_cfg.ipCfg[mainTable].dstPort}">
+            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstPort" value="${_cfg.ipCfg[mainTable].dstPort}" range="[0,65535]">
             		</c:when>
             		<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
-            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstPort" value="${_cfg.ipCfg[otherTable.tableName].dstPort}">
+            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstPort" value="${_cfg.ipCfg[otherTable.tableName].dstPort}" range="[0,65535]">
             		</c:when>
             	</c:choose>
             </div>
@@ -234,10 +234,10 @@
             <div class="col-md-6">
                  <c:choose>
             		<c:when test="${mainTableType eq '1' and otherTable==null}">
-            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstPortMask" value="${_cfg.ipCfg[mainTable].dstPortMask}">
+            		<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstPortMask" range="[0,65535]" value="${_cfg.ipCfg[mainTable].dstPortMask}">
             		</c:when>
             		<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
-            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstPortMask" value="${_cfg.ipCfg[otherTable.tableName].dstPortMask}">
+            		<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstPortMask" range="[0,65535]" value="${_cfg.ipCfg[otherTable.tableName].dstPortMask}">
             		</c:when>
             	</c:choose>
             </div>
diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp
index 2288b37e0..b22dadc96 100644
--- a/src/main/webapp/WEB-INF/include/header.jsp
+++ b/src/main/webapp/WEB-INF/include/header.jsp
@@ -85,3 +85,4 @@
 	<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js"></script>
 	</c:otherwise>
 </c:choose>
+<script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 61d9bc427..261504e34 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -62,16 +62,6 @@ $(function(){
 	}); 
 	
 	$("#ipCfgFrom").validate({
-		rules: {
-			srcPort: {
-				max: 65535,
-				min: 0
-			},
-			dstPort: {
-				max: 65535,
-				min: 0
-			}
-		},
 		errorPlacement: function(error,element){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 		},
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
new file mode 100644
index 000000000..91b5673fc
--- /dev/null
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -0,0 +1,52 @@
+var switchIpType=function(obj){
+	var type=$(obj).val();
+	var row=$(obj).parents('.row');
+	var srcIpMask=row.siblings().find("input[name$='srcIpMask']");
+	var dstIpMask=row.siblings().find("input[name$='dstIpMask']");
+	var srcIp=row.siblings().find("input[name$='srcIp']");
+	var dstIp=row.siblings().find("input[name$='dstIp']");
+	if(4==type){
+		if(!$(srcIpMask).val()){
+			$(srcIpMask).val("255.255.255.255");
+		}else if($(srcIpMask).val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
+			$(srcIpMask).val("255.255.255.255");
+		}
+		if(!$(dstIpMask).val()){
+			$(dstIpMask).val("255.255.255.255");
+		}else if($(dstIpMask).val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
+			$(dstIpMask).val("255.255.255.255");
+		}
+		if(!$(srcIp).val()){
+			$(srcIp).val("0.0.0.0");
+		}else if($(srcIp).val()=="::"){
+			$(srcIp).val("0.0.0.0");
+		}
+		if(!$(dstIp).val()){
+			$(dstIp).val("0.0.0.0");
+		}else if($(dstIp).val()=="::"){
+			$(dstIp).val("0.0.0.0");
+		}
+	}
+	if(6==type){
+		if(!$(srcIpMask).val()){
+			$(srcIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+		}else if($(srcIpMask).val()=="255.255.255.255"){
+			$(srcIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+		}
+		if(!$(dstIpMask).val()){
+			$(dstIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+		}else if($(dstIpMask).val()=="255.255.255.255"){
+			$(dstIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+		}
+		if(!$(srcIp).val()){
+			$(srcIp).val("::");
+		}else if($(srcIp).val()=="0.0.0.0"){
+			$(srcIp).val("::");
+		}
+		if(!$(dstIp).val()){
+			$(dstIp).val("::");
+		}else if($(dstIp).val()=="0.0.0.0"){
+			$(dstIp).val("::");
+		}
+	}
+}
\ No newline at end of file

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 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E7=B1=BB=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC=20=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=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()){