1.解决部分日志页面验证错误也可查询问题

2.标题首字母css控制大写
3.增加日志查询IPv4与IPv6验证及格式提示
This commit is contained in:
zhanghongqing
2018-08-07 11:56:46 +08:00
parent 10dd90c974
commit 3e97803d9e
28 changed files with 68 additions and 217 deletions

View File

@@ -28,6 +28,11 @@ jQuery.validator.addMethod("ip", function(value, element) {
return this.optional(element) || (/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256));
}, "请输入合法的IP地址");
//IPv4 IPv6
jQuery.validator.addMethod("ipv4v6", function(value, element) {
return this.optional(element) || (/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256))||/^\s*((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}(:|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4}){0,4}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:)|((:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\s*$/.test(value);
}, "请输入合法的IP地址如IPv4 0.0.0.0或IPv6 ::");
jQuery.validator.addMethod("abc",function(value, element) {
return this.optional(element) || /^[a-zA-Z0-9_]*$/.test(value);
},"请输入字母数字或下划线");

View File

@@ -51,6 +51,7 @@
ipv6: "ipv6",
over6: "4over6",
over4: "6over4",
ipv4v6:"Please enter a correct IPv4(0.0.0.0) or IPv6(::)",
all: "all",
ip_subnet: "Subnet",
ip_range: "ip Range",

View File

@@ -45,10 +45,11 @@
isp: "isp",
close_info: "close",
client_ip: "client ip",
ipv4: "ipv4",
ipv6: "ipv6",
ipv4: "IPv4",
ipv6: "IPv6",
over6: "4over6",
over4: "6over4",
ipv4v6:"IPv4(0.0.0.0) or IPv6(::)",
all: "all",
ip_subnet: "Subnet",
ip_range: "ip Range",

View File

@@ -52,6 +52,7 @@
ipv6: "ipv6",
over6: "4over6",
over4: "6over4",
ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)",
all: "全部",
ip_subnet: "Subnet",
ip_subnet: "Subnet",