-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 995fdf619..d10240500 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -28,6 +28,62 @@ $(function(){
$("#cancel").on("click",function(){
window.history.back();
});
+ $("#cfgFrom").validate({
+ rules: {
+ 'cfgDesc':{
+ required:true
+ },
+ 'keywords':{
+ required:true
+ },
+ 'district':{
+ required:true
+ },
+ 'isAreaEffective':{
+ required:true
+ },
+ 'exprType':{
+ required:true
+ },
+ 'matchMethod':{
+ required:true
+ },
+ 'requestId': {
+ required: true,
+ }
+ },
+ messages: {
+ 'cfgDesc':{
+ required:'
'
+ },
+ 'keywords':{
+ required:'
'
+ },
+ 'district':{
+ required:'
'
+ },
+ 'isAreaEffective':{
+ required:'
'
+ },
+ 'exprType':{
+ required:'
'
+ },
+ 'matchMethod':{
+ required:'
'
+ },
+ 'requestId': {
+ required: '
'
+ }
+ },
+ errorPlacement: function(error,element){
+ $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+ },
+ submitHandler: function(form){
+ //loading('onloading...');
+ form.submit();
+ },
+ errorContainer: "#messageBox",
+ });
});
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index a968c56c9..6734475d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -85,12 +85,15 @@ $(function(){
},
srcIp: {
required: true,
+ checkIp: true
},
srcIpMask: {
required: true,
},
srcPort: {
required: true,
+ max: 65535,
+ min: 0
},
srcPortMask: {
required: true,
@@ -103,6 +106,8 @@ $(function(){
},
dstPort: {
required: true,
+ max: 65535,
+ min: 0
},
dstPortMask: {
required: true,
@@ -137,6 +142,8 @@ $(function(){
},
srcPort: {
required: '
',
+ max: '范围0-65535!',
+ min: '范围0-65535!'
},
srcPortMask: {
required: '
',
@@ -149,6 +156,8 @@ $(function(){
},
dstPort: {
required: '
',
+ max: '范围0-65535!',
+ min: '范围0-65535!'
},
dstPortMask: {
required: '
',
@@ -175,6 +184,23 @@ $(function(){
},
errorContainer: "#messageBox",
});
+
+ $.validator.addMethod(
+ "checkIp",
+ function(value, element, params) {
+ var checkIp;
+ if ($("[name=ipType]").val() == 4) {
+ //checkIp = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+ checkIp = /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/;
+ //} else if ($("[name=ipType]").val() == 6) {
+ // checkIp = /^\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}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/;
+ } else {
+ checkIp = /\S+/;
+ }
+ return this.optional(element) || (checkIp.test(value) && (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256));
+ },
+ "请输入正确的IP!"
+ );
});
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index e65234c7d..8b7fa64ce 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -21,6 +21,65 @@