From 71f2c2bc5cbf0abac9754b003c8f33fb5d315b06 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Mon, 16 Jul 2018 15:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE=E3=80=81?= =?UTF-8?q?=E6=80=A7=E8=B4=A8=E3=80=81=E7=B1=BB=E5=9E=8B=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BD=E9=99=85=E5=8C=96=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89APP=E5=8D=8F=E8=AE=AEIP=E7=95=8C=E9=9D=A2srcIp?= =?UTF-8?q?=E7=9A=84=20ipCheck=20=E4=BF=AE=E6=94=B9=E5=BD=93=E6=BA=90ip?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=B6=EF=BC=8C=E7=9B=AE=E7=9A=84ip?= =?UTF-8?q?=E9=9D=9E0.0.0.0=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/tags/sys/treeselect.tag | 2 +- .../webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp | 2 +- .../webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp | 2 +- .../1.11.0/jquery.validate.method.js | 14 ++++++++++---- .../1.11.0/localization/messages_en.js | 1 + .../1.11.0/localization/messages_ru.js | 1 + .../1.11.0/localization/messages_zh.js | 1 + 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 666a60476..e4c10942a 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -46,7 +46,7 @@ } // 正常打开 top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "", 320, 420, { - ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"ok":"ok", ${allowClear?"\"clear\":\"clear\", ":""}"close":true}, submit:function(v, h, f){ + ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"":"ok", "":"clear","":true}, submit:function(v, h, f){ if (v=="ok"){ var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents(); var ids = [], names = [], nodes = []; diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp index 4b7281f12..088670e10 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -127,7 +127,7 @@ $(function(){
- +
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 154cd6886..2bf459b3a 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 @@ -211,7 +211,7 @@ var delContent=function(contentClassName,addBtnClassName){
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 4e531aa9e..68681b24b 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 @@ -181,17 +181,23 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { var ipPattern=$(element).parents(".row").parent(".row").find("select[name$='ipPattern']").val(); var srcIpAddress=$(element).parents(".row").parent(".row").find("input[name$='srcIpAddress']").val(); var destIpAddress=$(element).parents(".row").parent(".row").find("input[name$='destIpAddress']").val(); + var srcIpIsHidden=$(element).parents(".row").parent(".row").find("input[name$='srcIpAddress']").is(":hidden"); var destIpIsHidden=$(element).parents(".row").parent(".row").find("input[name$='destIpAddress']").is(":hidden"); if(ipPattern==1){//ip/掩码格式 srcIpAddress=srcIpAddress.indexOf("/") >-1 ?srcIpAddress.split("/")[0] : srcIpAddress; - destIpAddress=destIpAddress.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 ?srcIpAddress.split("-")[0] : srcIpAddress; + destIpAddress=destIpAddress.indexOf("-") >-1 ?destIpAddress.split("-")[0] : destIpAddress; } - if(destIpIsHidden){ + if(srcIpIsHidden){ if((srcIpAddress == destIpAddress)){ - $.validator.messages.ipCheck=$.validator.messages.srcIpIsNotValue+destIpAddress; + $.validator.messages.ipCheck=$.validator.messages.destIpIsNotValue+destIpAddress; + return false; + } + }else if(destIpIsHidden){ + if((srcIpAddress == destIpAddress)){ + $.validator.messages.ipCheck=$.validator.messages.srcIpIsNotValue+srcIpAddress; return false; } }else{ diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index a77235439..0bdc04959 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -31,6 +31,7 @@ destIpNotEqDestIp:" and destination IP ", IpNotEqDestIp:" can't the same", srcIpIsNotValue:"Sourse IP can't be ", + destIpIsNotValue:"Destination IP can't be ", ipRange:"Wrong IP format or start IP and end IP in two subnet", ipRange1:"start IP should smaller than end IP", portCheck:"Please enter a correct port", diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index c43d39468..ba63d23c4 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -34,6 +34,7 @@ srcIpNotEqDestIp:"Sourse IP ", destIpNotEqDestIp:" and destination IP ", srcIpIsNotValue:"Sourse IP can't be ", + destIpIsNotValue:"Destination IP can't be ", IpNotEqDestIp:" can't the same", portMaskRange:"Port and mask must between 0 and 65535.The correct pattern is \"port/mask\".", chooseAreaOrIsp:"The region and the oprater must choose one", diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index 6f9bc8c28..987811a3c 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -34,6 +34,7 @@ ipRange1:"起始IP值应小于结束IP值", portRange:"端口应小于65536，非0数字不能以0开头", srcIpIsNotValue:"源IP不能为 ", + destIpIsNotValue:"目的IP不能为", srcIpNotEqDestIp:"源IP ", destIpNotEqDestIp:" 与目的IP ", IpNotEqDestIp:" 不能相同",