diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index 4ba9e7039..e901cd654 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -237,6 +237,13 @@ jQuery.validator.addMethod("protocolPort",function(value, element) { var protocolElement=$("[name='"+name.replace("destPort","protocol")+"']"); protocolVal=protocolElement.val(); } + //端口/掩码格式 + if(srcPortVal&&srcPortVal.indexOf("/")>-1){ + srcPortVal=srcPortVal.split("/")[0]; + } + if(destPortVal&&destPortVal.indexOf("/")>-1){ + destPortVal=destPortVal.split("/")[0]; + } if(protocolVal==0){ return true; }else if((protocolVal!=tcp&&protocolVal!=udp&&srcPortVal>0)||(protocolVal!=tcp&&protocolVal!=udp&&destPortVal>0)){ @@ -276,13 +283,13 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { var srcIpIsHidden=srcIpAddressE.is(":hidden"); var destIpIsHidden=destIpAddressE.is(":hidden"); var IPv4RangeDefault="0.0.0.0-0.0.0.0"; - /*if(ipPattern==1){//ip/掩码格式 + if(ipPattern==1){//ip/掩码格式 srcIpAddress=srcIpAddress.indexOf("/") >-1 ?srcIpAddress.split("/")[0] : srcIpAddress; destIpAddress=destIpAddress.indexOf("/") >-1 ?destIpAddress.split("/")[0] : destIpAddress; }else if (ipPattern==2){ srcIpAddress=srcIpAddress.indexOf("-") >-1 ?srcIpAddress.split("-")[0] : srcIpAddress; destIpAddress=destIpAddress.indexOf("-") >-1 ?destIpAddress.split("-")[0] : destIpAddress; - }*/ + } if(srcIpIsHidden){ if((srcIpAddress == destIpAddress)){ $.validator.messages.ipCheck=$.validator.messages.destIpIsNotValue+destIpAddress;