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/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
This commit is contained in:
duandongmei
2018-08-19 15:55:27 +08:00
parent 8c7e1d088d 8db613d464
commit 45556b7e05
27 changed files with 1118 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
$(function(){
$("input[name$='isHex']").on("change",function(){
setIsHexBin(this);
});
$("input[name$='isCaseSenstive']").on("change",function(){
$("select[name$='isHexbin']").each(function(){
setIsHexBin(this);
});
$("input[name$='isHex']:checked").each(function(){
$("input[name$='isHex']").on("change",function(){
setIsHexBin(this);
});
$("input[name$='isCaseSenstive']").on("change",function(){
setIsHexBin(this);
});
$("a[name=viewLogInfo]>i").on("click",function(){
@@ -449,8 +449,27 @@ var setIsHexBin=function(obj){
if($(obj).attr("name").indexOf(".") > -1){
profix=$(obj).attr("name").substring(0,$(obj).attr("name").indexOf(".")+1);
}
console.log($(obj).attr("name"));
console.log(profix);
if($(obj).attr("name").indexOf("isHexbin") > -1){
var isHexbin=$(obj).val();
if(isHexbin == 0){
$("input[name='"+profix+"isHex'][value=0]").prop("checked",true);
$("input[name='"+profix+"isHex'][value=1]").prop("checked",false);
$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",true);
$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",false);
}else if(isHexbin == 1){
$("input[name='"+profix+"isHex'][value=1]").prop("checked",true);
$("input[name='"+profix+"isHex'][value=0]").prop("checked",false);
$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",true);
$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",false);
$("input[name='"+profix+"isCaseSenstive'][value=1]").parent().addClass("hidden");
}else if(isHexbin == 2){
$("input[name='"+profix+"isHex'][value=0]").prop("checked",true);
$("input[name='"+profix+"isHex'][value=1]").prop("checked",false);
$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",true);
$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",false);
}
return;
}
var isHex=$("input[name='"+profix+"isHex']:checked").val();
//如果选择十六进制，则必须发小写不敏感
if(isHex == 1){