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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
	
	修改是否十六进制选项选中值
This commit is contained in:
duandongmei
2018-08-24 19:47:32 +08:00
parent 7374c16da7 919c649e4e
commit 846985886f
24 changed files with 275 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ $(function(){
$("input[name$='isCaseSenstive']").on("change",function(){
setIsHexBin(this);
});
setHexCaseSenstive();
$("a[name=viewLogInfo]>i").on("click",function(){
var html = "<div class='logInfo'>";
$(this).parents("tr").find("td").each(function(index,element){
@@ -606,7 +607,6 @@ var addHexCheck=function(obj,isHexbin){
//与表达式时，只允许为子串匹配
var setDefaultMatchMethod=function (obj){
var exprType = $(obj).val();
console.log($(obj).parents(".row").parent(".row"));
if(exprType == 1){
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option").removeAttr("selected");
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option[value=0]").attr("selected","selected");
@@ -1291,6 +1291,31 @@ var validateInvisibleCharTag=function(){
}
return true;
}
var setHexCaseSenstive=function(){
$("input[name$='configHex']").each(function(){
var configHex=$(this).val();
var configNamePrefix=$(this).attr("name").split("configHex")[0]; ;
if(configHex != ''){
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=1]").parent().addClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=0]").parent().addClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=0]").parent().addClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=1]").parent().addClass("hidden");
if(configHex.indexOf("0")>-1){//非十六进制大小写不敏感
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=0]").parent().removeClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=0]").parent().removeClass("hidden");
}
if(configHex.indexOf("1")>-1){//十六进制大小写不敏感
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=1]").parent().removeClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=0]").parent().removeClass("hidden");
}
if(configHex.indexOf("2")>-1){//非十六进制大小写敏感
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=0]").parent().removeClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=1]").parent().removeClass("hidden");
}
}
});
}
/**
* ip默认选项处理
*/