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

校验简化

Browse Source
This commit is contained in:
chenjinsong
2018-04-08 18:47:53 +08:00
parent f0a4104d6b
commit a65e7753c4
7 changed files with 17 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
View File

@@ -69,10 +69,10 @@
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].srcIp" value="${_cfg.ipCfg[mainTable].srcIp}">
<input class="form-control required ipCheck" type="text" name="ipCfg[${mainTable}].srcIp" value="${_cfg.ipCfg[mainTable].srcIp}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].srcIp" value="${_cfg.ipCfg[otherTable.tableName].srcIp}">
<input class="form-control required ipCheck" type="text" name="ipCfg[${otherTable.tableName}].srcIp" value="${_cfg.ipCfg[otherTable.tableName].srcIp}">
</c:when>
</c:choose>
</div>
@@ -166,10 +166,10 @@
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstIp" value="${_cfg.ipCfg[mainTable].dstIp}">
<input class="form-control required ipCheck" type="text" name="ipCfg[${mainTable}].dstIp" value="${_cfg.ipCfg[mainTable].dstIp}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstIp" value="${_cfg.ipCfg[otherTable.tableName].dstIp}">
<input class="form-control required ipCheck" type="text" name="ipCfg[${otherTable.tableName}].dstIp" value="${_cfg.ipCfg[otherTable.tableName].dstIp}">
</c:when>
</c:choose>
</div>

90
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
View File

@@ -77,89 +77,23 @@ $(function(){
});
$("#inputFrom").validate({
rules: {
ipType: {
required: true,
},
srcIp: {
required: true,
checkIp: true
},
srcIpMask: {
required: true,
},
srcPort: {
required: true,
max: 65535,
min: 0
},
srcPortMask: {
required: true,
},
dstIp: {
required: true,
checkIp: true
},
dstIpMask: {
required: true,
},
dstPort: {
required: true,
max: 65535,
min: 0
},
dstPortMask: {
required: true,
},
direction: {
required: true,
},
protocol: {
required: true,
},
'request.id': {
required: true,
}
},
messages: {
ipType: {
required: '<spring:message code="required"/>',
},
srcIp: {
required: '<spring:message code="required"/>',
},
srcIpMask: {
required: '<spring:message code="required"/>',
},
srcPort: {
required: '<spring:message code="required"/>',
max: '范围0-65535!',
min: '范围0-65535!'
},
srcPortMask: {
required: '<spring:message code="required"/>',
},
dstIp: {
required: '<spring:message code="required"/>',
},
dstIpMask: {
required: '<spring:message code="required"/>',
},
dstPort: {
required: '<spring:message code="required"/>',
max: '范围0-65535!',
min: '范围0-65535!'
},
dstPortMask: {
required: '<spring:message code="required"/>',
},
direction: {
required: '<spring:message code="required"/>',
},
protocol: {
required: '<spring:message code="required"/>',
},
'request.id': {
required: '<spring:message code="required"/>',
}
},
errorPlacement: function(error,element){
@@ -212,7 +146,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
<div class="col-md-6">
<select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
<select name="ipType" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="4" <c:if test="${dnsIpCfg.ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${dnsIpCfg.ipType==6}">selected</c:if>>V6</option>
</select>
@@ -226,7 +160,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcIp" value="${dnsIpCfg.srcIp}">
<input class="form-control required ipCheck" type="text" name="srcIp" value="${dnsIpCfg.srcIp}">
</div>
<div for="srcIp"></div>
</div>
@@ -235,7 +169,7 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_address_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcIpMask" value="${dnsIpCfg.srcIpMask}">
<input class="form-control required" type="text" name="srcIpMask" value="${dnsIpCfg.srcIpMask}">
</div>
<div for="srcIpMask"></div>
</div>
@@ -246,7 +180,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcPort" value="${dnsIpCfg.srcPort}">
<input class="form-control required" type="text" name="srcPort" value="${dnsIpCfg.srcPort}">
</div>
<div for="srcPort"></div>
</div>
@@ -255,7 +189,7 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcPortMask" value="${dnsIpCfg.srcPortMask}">
<input class="form-control required" type="text" name="srcPortMask" value="${dnsIpCfg.srcPortMask}">
</div>
<div for="srcPortMask"></div>
</div>
@@ -266,7 +200,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstIp" value="${dnsIpCfg.dstIp}">
<input class="form-control required ipCheck" type="text" name="dstIp" value="${dnsIpCfg.dstIp}">
</div>
<div for="dstIp"></div>
</div>
@@ -275,7 +209,7 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_address_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstIpMask" value="${dnsIpCfg.dstIpMask}">
<input class="form-control required" type="text" name="dstIpMask" value="${dnsIpCfg.dstIpMask}">
</div>
<div for="dstIpMask"></div>
</div>
@@ -286,7 +220,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstPort" value="${dnsIpCfg.dstPort}">
<input class="form-control required" type="text" name="dstPort" value="${dnsIpCfg.dstPort}">
</div>
<div for="dstPort"></div>
</div>
@@ -295,7 +229,7 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstPortMask" value="${dnsIpCfg.dstPortMask}">
<input class="form-control required" type="text" name="dstPortMask" value="${dnsIpCfg.dstPortMask}">
</div>
<div for="dstPortMask"></div>
</div>
@@ -306,7 +240,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
<div class="col-md-6">
<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
<select name="direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="0" <c:if test="${dnsIpCfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${dnsIpCfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
</select>
@@ -318,7 +252,7 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
<div class="col-md-6">
<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
<select name="protocol" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="6" <c:if test="${dnsIpCfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${dnsIpCfg.protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${dnsIpCfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
@@ -332,7 +266,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
<div class="col-md-6">
<select name="request.id" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
<select name="request.id" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<c:forEach items="${requestInfos}" var="requestInfo">
<option value="${requestInfo.id}"
<c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>

20
src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
View File

@@ -47,32 +47,12 @@ $(function(){
$(".bootstrap-select").removeClass("disabled");
$(".bootstrap-select button").removeClass("disabled");
$(".collapse").addClass("in");
myValidate(true);//开启ip校验
}else{
myValidate(false);//关闭ip校验
$(".collapse").removeClass("in");
$("[name^='ipCfg']").attr("disabled",true);
}
});
function myValidate(flag) {
if (flag) {
myValidate(false);
$("[name=ipCfg\\[http_ip_cfg\\]\\.srcIp]").each(function(){
$(this).rules("add", {
checkIp: true,
messages: {
required:'<spring:message code="required"/>'
}
});
});
} else {
}
}
$(".district").on("change",function(){
var text=$(this).find("option:selected").text().toLowerCase();
var other=$(this).parent("div").siblings(".otherValue");

13
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -28,19 +28,6 @@ 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地址");
jQuery.validator.addMethod(
"checkIp",
function(value, element, params) {
var checkIp;
if ($("[name$=ipType]").val() == 6) {
return this.optional(element) || (checkIp.test(value) && (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256));
} else {
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)))/;
return this.optional(element) || /^((([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}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
}
}
);
jQuery.validator.addMethod("abc",function(value, element) {
return this.optional(element) || /^[a-zA-Z0-9_]*$/.test(value);
},"请输入字母数字或下划线");

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

@@ -21,7 +21,6 @@
range: $.validator.format("Please enter a value between {0} and {1}."),
max: $.validator.format("Please enter a value less than or equal to {0}."),
min: $.validator.format("Please enter a value greater than or equal to {0}."),
checkIp: $.validator.format("Please enter a correct IP address."),
noBlankSpace:"can not be space",
ipCheck:"Please enter a correct IP address",
ipMask:"Please enter a correct IP mask",

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

@@ -21,6 +21,6 @@
range: $.validator.format("Пожалуйста, введите число от {0} до {1}."),
max: $.validator.format("Пожалуйста, введите число, меньшее или равное {0}."),
min: $.validator.format("Пожалуйста, введите число, большее или равное {0}."),
min: $.validator.format(" Пожалуйста, введите  правильный  IP - адрес.")
ipCheck: $.validator.format(" Пожалуйста, введите  правильный  IP - адрес.")
});
}(jQuery));

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

@@ -22,7 +22,6 @@
max: $.validator.format("请输入一个最大为 {0} 的值"),
min: $.validator.format("请输入一个最小为 {0} 的值"),
checkIp: $.validator.format("请输入一个合法的IP"),
noBlankSpace:"不能为空格",
ipCheck:"请填写正确的IP地址",
ipMask:"请填写正确的IP地址掩码",