gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'demostration_08' into 'develop'

Browse Source 
Demostration 08

See merge request !33
This commit is contained in:
wangxin
2018-08-17 15:34:02 -04:00
parent 2601724cdb cc56170346
commit 6d46075f49
9 changed files with 196 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
View File

@@ -62,6 +62,7 @@
<spring:message code="${regionValue}"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">

1
src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
View File

@@ -67,6 +67,7 @@
<spring:message code="${regionValue}"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">

4
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -115,6 +115,10 @@
}
}
});
var flag1=validateInvisibleCharTag();
if(flag){
flag=flag1;
}
if(flag){
//将disable属性的元素删除
$(".disabled").each(function(){

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -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));

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -62,6 +62,8 @@
specServiceCodeCheck:"协议号重复",
compareDate:"结束时间不能早于开始时间",
hexCheck:"请输入十六进制字符",
invisibleChar:"请输入可见字符"
invisibleChar:"请输入可见字符",
hasInvisibleChar:"标签{0}包含不可见字符",
haveInvisibleChar:"标签{0}包含不可见字符"
});
}(jQuery));

39
src/main/webapp/static/global/scripts/common.js
View File

@@ -270,15 +270,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("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}","'"+tag+"'")+"</label>");
}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(){
@@ -1139,4 +1146,22 @@ var importCfg=function(){
}
$("#import_modal").modal('hide');//导入文件隐藏
$("#importForm1").submit();
}
}
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("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
return false;
}else if(hasInvisibleCharTags.length>=1){
$(".tagsinput").parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.haveInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
return false;
}
return true;
}