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 @@
- +
@@ -60,7 +60,7 @@
- +
@@ -91,7 +91,7 @@
- +
@@ -100,7 +100,7 @@
- +
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 @@
- + - +
@@ -138,10 +138,10 @@
- + - +
@@ -211,10 +211,10 @@
- + - +
@@ -234,10 +234,10 @@
- + - +
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 @@ + 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