From 03c1d559dfbaff7d3d3a9156663302bf6f4db333 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 17 Aug 2018 10:48:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BBNtcSubscribeIdCfg.java=202.?= =?UTF-8?q?=E9=9F=B3=E8=A7=86=E9=A2=91=E6=A0=B7=E4=BE=8B=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=8B=E5=8A=A0=E4=B8=80=E6=9D=A1=E6=A8=AA?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/configuration/CfgIndexInfo.java | 9 +++++++++ src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp | 1 + src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp | 1 + 3 files changed, 11 insertions(+) diff --git a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java index 38b48622f..d5bdecbc4 100644 --- a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java +++ b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java @@ -51,10 +51,19 @@ public class CfgIndexInfo extends BaseCfg { private List complexList; private List stringList; private List digestList; + private List ntcSubscribeIdCfgList;//新增SUBSCRIBE_ID + private NtcSubscribeIdCfg ntcSubscribeIdCfg; private Long dnsStrategyId; private String dnsStrategyName; + + public NtcSubscribeIdCfg getNtcSubscribeIdCfg() { + return ntcSubscribeIdCfg; + } + public void setNtcSubscribeIdCfg(NtcSubscribeIdCfg ntcSubscribeIdCfg) { + this.ntcSubscribeIdCfg = ntcSubscribeIdCfg; + } public Long getDnsStrategyId() { return dnsStrategyId; } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index d9e1c93a7..8ddeef599 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -62,6 +62,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index 3a38cac0c..1fb9b2e32 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -67,6 +67,7 @@ +
From 5852483b885493517265640a27eb51859041d5d1 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 17 Aug 2018 10:48:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/domain/configuration/NtcSubscribeIdCfg.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java diff --git a/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java b/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java new file mode 100644 index 000000000..c5e8c8f1b --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java @@ -0,0 +1,11 @@ +package com.nis.domain.configuration; + +public class NtcSubscribeIdCfg extends BaseStringCfg { + + /** + * + */ + private static final long serialVersionUID = 9137401459733286997L; + + +} From 437680a5691b7bdbbf733dcd3b7060b0d437134e Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 17 Aug 2018 12:30:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E7=B1=BB=E5=87=8F=E5=B0=91=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/NtcSubscribeIdCfg.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java b/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java index c5e8c8f1b..f112f482e 100644 --- a/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java +++ b/src/main/java/com/nis/domain/configuration/NtcSubscribeIdCfg.java @@ -1,11 +1,30 @@ package com.nis.domain.configuration; -public class NtcSubscribeIdCfg extends BaseStringCfg { +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +import com.nis.util.excel.ExcelField; + +public class NtcSubscribeIdCfg extends BaseCfg { /** * */ private static final long serialVersionUID = 9137401459733286997L; + /** + * 配置关键字 + */ + @Expose + @SerializedName("keywords") + @ExcelField(title="key_word") + protected String cfgKeywords; + + + public String getCfgKeywords() { + return cfgKeywords; + } + public void setCfgKeywords(String cfgKeywords) { + this.cfgKeywords = cfgKeywords; + } } From 18678f14b5e781291180ededc9ac0c649246bbd6 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 17 Aug 2018 14:19:41 +0800 Subject: [PATCH 4/6] =?UTF-8?q?Maat=20=E4=B8=8B=E5=8F=91IP=20all=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/BaseService.java | 114 +++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 1a324ef20..4df642004 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -7,6 +7,10 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.management.RuntimeErrorException; import org.apache.commons.lang3.StringEscapeUtils; import org.slf4j.Logger; @@ -388,7 +392,7 @@ public abstract class BaseService { * @return */ public static IpCfg ipConvert(IpCfg dstIp,BaseIpCfg srcIp){ - if(srcIp.getSrcIpAddress()!=null){ + if(srcIp.getSrcIpAddress()!=null){ if(srcIp.getSrcIpAddress().indexOf("/")!=-1){ if(srcIp.getIpType()==4 || srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); @@ -403,6 +407,26 @@ public abstract class BaseService { IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); + }else { + Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); + Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); + Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); + Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress()); + if(matchernV4Subnet.matches()) { + Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); + if(srcMaskNum==0){ + dstIp.setSrcIpMask("0.0.0.0"); + }else{ + dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); + } + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + }else if(matcherV6Subnet.matches()){ + IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); + }else { + throw new RuntimeException("Invalid IP/subnet mask format"); + } } }else if(srcIp.getSrcIpAddress().indexOf("-")!=-1){ @@ -415,6 +439,23 @@ public abstract class BaseService { IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); dstIp.setSrcIp(address1.toString()); dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); + }else { + Pattern patternV4Range=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP); + Pattern patternV6Range=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP); + Matcher matcherV4Range=patternV4Range.matcher(srcIp.getSrcIpAddress()); + Matcher matcherV6Range=patternV6Range.matcher(srcIp.getSrcIpAddress()); + if(matcherV4Range.matches()) { + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("-")[0]); + dstIp.setSrcIpMask(IpUtil.getMask(srcIp.getSrcIpAddress().split("-")[0], srcIp.getSrcIpAddress().split("-")[1])); + }else if(matcherV6Range.matches()) { + IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); + IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); + IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + dstIp.setSrcIp(address1.toString()); + dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); + }else { + throw new RuntimeException("Invalid IP range format"); + } } }else{ @@ -424,6 +465,20 @@ public abstract class BaseService { }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + }else {//all + Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); + Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); + Matcher matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); + Matcher matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); + if(matcherV4.matches()) { + dstIp.setSrcIp(srcIp.getSrcIpAddress()); + dstIp.setSrcIpMask("255.255.255.255"); + }else if(matcherV6.matches()) { + dstIp.setSrcIp(srcIp.getSrcIpAddress()); + dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + }else { + throw new RuntimeException("Invalid IP format"); + } } } @@ -434,6 +489,9 @@ public abstract class BaseService { }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + }else {//all + dstIp.setSrcIp(srcIp.getSrcIpAddress()); + dstIp.setSrcIpMask("255.255.255.255"); } } if(srcIp.getDestIpAddress()!=null){ @@ -450,6 +508,26 @@ public abstract class BaseService { IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); + }else { + Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); + Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); + Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); + Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress()); + if(matchernV4Subnet.matches()) { + Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); + if(dstMaskNum==0){ + dstIp.setDstIpMask("0.0.0.0"); + }else{ + dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; + } + dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + }else if(matcherV6Subnet.matches()){ + IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); + dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); + }else { + throw new RuntimeException("Invalid IP/subnet mask format"); + } } }else if(srcIp.getDestIpAddress().indexOf("-")!=-1){ @@ -462,6 +540,23 @@ public abstract class BaseService { IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); dstIp.setDstIp(address1.toString()); dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); + }else { + Pattern patternV4Range=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP); + Pattern patternV6Range=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP); + Matcher matcherV4Range=patternV4Range.matcher(srcIp.getDestIpAddress()); + Matcher matcherV6Range=patternV6Range.matcher(srcIp.getDestIpAddress()); + if(matcherV4Range.matches()) { + dstIp.setDstIp(srcIp.getDestIpAddress().split("-")[0]); + dstIp.setDstIpMask(IpUtil.getMask(srcIp.getDestIpAddress().split("-")[0], srcIp.getDestIpAddress().split("-")[1])); + }else if(matcherV6Range.matches()) { + IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); + IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); + IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + dstIp.setDstIp(address1.toString()); + dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); + }else { + throw new RuntimeException("Invalid IP range format"); + } } }else{ @@ -471,6 +566,20 @@ public abstract class BaseService { }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + }else {//all + Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); + Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); + Matcher matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); + Matcher matcherV6=patternV6.matcher(srcIp.getDestIpAddress()); + if(matcherV4.matches()) { + dstIp.setDstIp(srcIp.getDestIpAddress()); + dstIp.setDstIpMask("255.255.255.255"); + }else if(matcherV6.matches()) { + dstIp.setDstIp(srcIp.getDestIpAddress()); + dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + }else { + throw new RuntimeException("invalid ip format"); + } } } @@ -481,6 +590,9 @@ public abstract class BaseService { }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + }else {//all + dstIp.setDstIp(srcIp.getDestIpAddress()); + dstIp.setDstIpMask("255.255.255.255"); } } if(srcIp.getSrcPort()!=null){ From 05fca7be1b9fd5608c6aadead2f82ec49e97a0db Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 17 Aug 2018 15:10:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?http=20tags=E8=BE=93=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=81=9A=E4=B8=8D=E5=8F=AF=E8=A7=81=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/cfg/website/httpForm.jsp | 16 ++++++++++++++++ .../1.11.0/localization/messages_en.js | 4 +++- .../1.11.0/localization/messages_zh.js | 4 +++- .../webapp/static/global/scripts/common.js | 19 +++++++++++++------ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 910b722c3..83c7f4dba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -115,12 +115,28 @@ } } }); + var hasInvisibleCharTags=[]; + var reg = new RegExp(/\t|\r|\n/); + console.log($(".tagsinput").find(".tag").length); + $(".tagsinput").find(".tag").each(function(){ + var text=$(this).children("span").text(); + if (text.match(reg)) { + hasInvisibleCharTags.push("'"+text+"'"); + flag = false; + } + }); + if(hasInvisibleCharTags.length==1){ + $(".tagsinput").parents(".col-md-6").next("div").html(""); + }else if(hasInvisibleCharTags.length>=1){ + $(".tagsinput").parents(".col-md-6").next("div").html(""); + } if(flag){ //将disable属性的元素删除 $(".disabled").each(function(){ $(this).remove(); }); $("input[name$='exprType']").attr("disabled",false); + console.log(7777); loading('onloading...'); form.submit(); }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 2034936b6..5cf046daf 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 @@ -62,6 +62,8 @@ specServiceCodeCheck:"Protocol No is repeat.", compareDate:"The end time should not be earlier than the start time.", hexCheck:"Please enter the HEX format character", - invisibleChar:"Please enter the visible character" + invisibleChar:"Please enter the visible character", + hasInvisibleChar:"The tag {0} has invisible character", + haveInvisibleChar:"The tags {0} have invisible character" }); }(jQuery)); 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 175cb8bf0..5bfc41c8a 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 @@ -62,6 +62,8 @@ specServiceCodeCheck:"协议号重复", compareDate:"结束时间不能早于开始时间", hexCheck:"请输入十六进制字符", - invisibleChar:"请输入可见字符" + invisibleChar:"请输入可见字符", + hasInvisibleChar:"标签{0}包含不可见字符", + haveInvisibleChar:"标签{0}包含不可见字符" }); }(jQuery)); diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 3e556904a..86837b7ad 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -261,15 +261,22 @@ $(function(){ 'delimiter':'***and***',//特殊字符串分隔与表达式的多关键词 maxCount:4, onAddTag:function(tag,size){ - //var keywordValue = ""; - var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; - /*$("span[class='tag']").each(function(){ - keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); - }); - $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ + var reg = new RegExp(/\t|\r|\n/); + if (tag.match(reg)) { + $(this).parents(".col-md-6").next("div").html(""); + }else{ + $(this).parents(".col-md-6").next("div").html(""); + } + //var keywordValue = ""; + var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; + /*$("span[class='tag']").each(function(){ + keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); + }); + $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ exprTypeChecked(objNamePrefix,size); }, onRemoveTag:function(tag,size){ + $(this).parents(".col-md-6").next("div").html(""); //var keywordValue = ""; var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; /*$("span[class='tag']").each(function(){ From cc5617034659e7cf4361f1292d92b002579e835e Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 17 Aug 2018 15:28:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?tagsInput=E7=9A=84=E9=9D=9E=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=E5=AD=97=E7=AC=A6=E9=AA=8C=E8=AF=81=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E5=88=B0common.js=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/cfg/website/httpForm.jsp | 18 +++-------------- .../webapp/static/global/scripts/common.js | 20 ++++++++++++++++++- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 83c7f4dba..2688174e7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -115,20 +115,9 @@ } } }); - var hasInvisibleCharTags=[]; - var reg = new RegExp(/\t|\r|\n/); - console.log($(".tagsinput").find(".tag").length); - $(".tagsinput").find(".tag").each(function(){ - var text=$(this).children("span").text(); - if (text.match(reg)) { - hasInvisibleCharTags.push("'"+text+"'"); - flag = false; - } - }); - if(hasInvisibleCharTags.length==1){ - $(".tagsinput").parents(".col-md-6").next("div").html(""); - }else if(hasInvisibleCharTags.length>=1){ - $(".tagsinput").parents(".col-md-6").next("div").html(""); + var flag1=validateInvisibleCharTag(); + if(flag){ + flag=flag1; } if(flag){ //将disable属性的元素删除 @@ -136,7 +125,6 @@ $(this).remove(); }); $("input[name$='exprType']").attr("disabled",false); - console.log(7777); loading('onloading...'); form.submit(); }else{ diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 86837b7ad..0d1078abf 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1101,4 +1101,22 @@ var importCfg=function(){ } $("#import_modal").modal('hide');//导入文件隐藏 $("#importForm1").submit(); -} \ No newline at end of file +} +var validateInvisibleCharTag=function(){ + var hasInvisibleCharTags=[]; + var reg = new RegExp(/\t|\r|\n/); + $(".tagsinput").find(".tag").each(function(){ + var text=$(this).children("span").text(); + if (text.match(reg)) { + hasInvisibleCharTags.push("'"+text.trim()+"'"); + } + }); + if(hasInvisibleCharTags.length==1){ + $(".tagsinput").parents(".col-md-6").next("div").html(""); + return false; + }else if(hasInvisibleCharTags.length>=1){ + $(".tagsinput").parents(".col-md-6").next("div").html(""); + return false; + } + return true; +} \ No newline at end of file