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

This commit is contained in:
zhangshilin
2018-04-09 08:41:49 +08:00
6 changed files with 72 additions and 142 deletions

View File

@@ -10,6 +10,7 @@ $(function(){
var name=$(this).attr("id").replace("_areaCfg.","");
$(this).removeAttr("id");
$(this).attr("name","areaCfg["+len+"]."+name);
$(this).parents(".form-group").find("div[for^='_areaCfg']").attr("for","areaCfg["+len+"]."+name);
$(this).selectpicker("refresh");
});
obj.removeClass("hidden");
@@ -23,6 +24,7 @@ $(function(){
}else if($(this).parent().parent().parent().attr("id")=="areaIsp"){
obj.find("[name^='areaCode']").each(function(){
$(this).attr("name","areaIsp["+len+"].area");
$(this).parents(".form-group").find("div[for^='areaCode']").attr("for","areaIsp["+len+"].area");
$(this).selectpicker("refresh");
});
obj.find("[name^='ispCode']").each(function(){
@@ -49,6 +51,7 @@ function delAreaIp(obj){
var name=$(this).attr("name");
name=name.substring(name.lastIndexOf(".")+1,name.length);
$(this).attr("name","areaCfg["+len+"]."+name);
$(this).parents(".form-group").find("div[for^='areaCfg']").attr("for","areaCfg["+len+"]."+name);
});
len--;
});
@@ -58,6 +61,18 @@ function delAreaIsp(obj){
var thisObj=$(obj);
thisObj.parents(".container").remove();
var len=$("#areaIsp").find(".container:visible").size();
if(len>0){
len--;
$("#areaIsp").find(".container:visible").each(function(){
$(this).find("[name^='areaIsp']").each(function(){
var name=$(this).attr("name");
name=name.substring(name.lastIndexOf(".")+1,name.length);
$(this).attr("name","areaIsp["+len+"]."+name);
$(this).parents(".form-group").find("div[for^='areaIsp']").attr("for","areaIsp["+len+"]."+name);
});
len--;
});
}
}
</script>
<div class="hidden" id="areaIsp">
@@ -73,13 +88,14 @@ function delAreaIsp(obj){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area"/></label>
<div class="col-md-6">
<select name="areaCode" class="form-control" data-live-search="true" data-live-search-placeholder="search" >
<select name="areaCode" class="form-control required" data-live-search="true" data-live-search-placeholder="search" >
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${areas}" var="area">
<option value="${area.itemCode}">${area.itemValue}</option>
</c:forEach>
</select>
</div>
<div for="areaCode"></div>
</div>
</div>
<div class="col-md-6">
@@ -107,9 +123,9 @@ function delAreaIsp(obj){
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="area"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area"/></label>
<div class="col-md-6">
<select name="areaIsp[${status.index}].area" class="form-control" data-live-search="true" data-live-search-placeholder="search" >
<select name="areaIsp[${status.index}].area" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search" >
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${areas}" var="area">
<option value="${area.itemCode}"
@@ -118,13 +134,14 @@ function delAreaIsp(obj){
</c:forEach>
</select>
</div>
<div for="areaIsp[${status.index}].area"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="isp"/></label>
<div class="col-md-6">
<select name="areaIsp[${status.index}].isp" class="form-control" data-live-search="true" data-live-search-placeholder="search" >
<select name="areaIsp[${status.index}].isp" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search" >
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${isps}" var="isp">
<option value="${isp.itemCode}"
@@ -163,7 +180,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.ipType" class="show-tick form-control">
<select id="_areaCfg.ipType" class="show-tick form-control required">
<option><spring:message code="select"/></option>
<option value="4">V4</option>
<option value="6">V6</option>
@@ -178,7 +195,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.srcIp" class="form-control" type="text" value="${_areaCfg.srcIp}">
<input id="_areaCfg.srcIp" class="form-control required ipCheck" type="text" value="${_areaCfg.srcIp}">
</div>
<div for="_areaCfg.srcIp"></div>
</div>
@@ -187,7 +204,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.srcIpMask" class="form-control" type="text" value="${_areaCfg.srcIpMask}">
<input id="_areaCfg.srcIpMask" class="form-control required ipMask" type="text" value="${_areaCfg.srcIpMask}">
</div>
<div for="_areaCfg.srcIpMask"></div>
</div>
@@ -198,7 +215,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.srcPort" class="form-control" type="text" value="${_areaCfg.srcPort}">
<input id="_areaCfg.srcPort" class="form-control required" type="text" value="${_areaCfg.srcPort}">
</div>
<div for="_areaCfg.srcPort"></div>
</div>
@@ -207,7 +224,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.srcPortMask" class="form-control" type="text" value="${_areaCfg.srcPortMask}">
<input id="_areaCfg.srcPortMask" class="form-control required" type="text" value="${_areaCfg.srcPortMask}">
</div>
<div for="_areaCfg.srcPortMask"></div>
</div>
@@ -218,7 +235,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.dstIp" class="form-control" type="text" value="${_areaCfg.dstIp}">
<input id="_areaCfg.dstIp" class="form-control required ipCheck" type="text" value="${_areaCfg.dstIp}">
</div>
<div for="_areaCfg.dstIp"></div>
</div>
@@ -227,7 +244,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.dstIpMask" class="form-control" type="text" value="${_areaCfg.dstIpMask}">
<input id="_areaCfg.dstIpMask" class="form-control required ipMask" type="text" value="${_areaCfg.dstIpMask}">
</div>
<div for="_areaCfg.dstIpMask"></div>
</div>
@@ -238,7 +255,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.dstPort" class="form-control" type="text" value="${_areaCfg.dstPort}">
<input id="_areaCfg.dstPort" class="form-control required" type="text" value="${_areaCfg.dstPort}">
</div>
<div for="_areaCfg.dstPort"></div>
</div>
@@ -247,7 +264,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.dstPortMask" class="form-control" type="text" value="${_areaCfg.dstPortMask}">
<input id="_areaCfg.dstPortMask" class="form-control required" type="text" value="${_areaCfg.dstPortMask}">
</div>
<div for="_areaCfg.dstPortMask"></div>
</div>
@@ -258,7 +275,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.protocol" class="show-tick form-control">
<select id="_areaCfg.protocol" class="show-tick form-control required">
<option><spring:message code="select"/></option>
<option value="6" <c:if test="${_areaCfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_areaCfg.protocol==17}">selected</c:if> >UDP</option>
@@ -273,7 +290,7 @@ function delAreaIsp(obj){
<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 id="_areaCfg.direction" class="show-tick form-control" >
<select id="_areaCfg.direction" class="show-tick form-control required" >
<option><spring:message code="select"/></option>
<option value="0" <c:if test="${_areaCfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_areaCfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
@@ -300,20 +317,20 @@ function delAreaIsp(obj){
<div class="col-md-6">
<input name="areaCfg[${status.index}].cfgDesc" class="form-control" type="text" value="${areaCfg.cfgDesc}">
</div>
<div for="areaCfg.cfgDesc"></div>
<div for="areaCfg[${status.index}].cfgDesc"></div>
</div>
</div>
<div class="col-md-6">
<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="areaCfg[${status.index}].ipType" class="selectpicker show-tick form-control">
<select name="areaCfg[${status.index}].ipType" class="selectpicker show-tick form-control required">
<option><spring:message code="select"/></option>
<option value="4" <c:if test="${areaCfg.ipType==4}">selected</c:if>>V4</option>
<option value="6" <c:if test="${areaCfg.ipType==6}">selected</c:if>>V6</option>
</select>
</div>
<div for="areaCfg.ipType"></div>
<div for="areaCfg[${status.index}].ipType"></div>
</div>
</div>
</div>
@@ -322,18 +339,18 @@ function delAreaIsp(obj){
<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 name="areaCfg[${status.index}].srcIp" class="form-control" type="text" value="${areaCfg.srcIp}">
<input name="areaCfg[${status.index}].srcIp" class="form-control required ipCheck" type="text" value="${areaCfg.srcIp}">
</div>
<div for="areaCfg.srcIp"></div>
<div for="areaCfg[${status.index}].srcIp"></div>
</div>
</div>
<div class="col-md-6">
<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 name="areaCfg[${status.index}].srcIpMask" class="form-control" type="text" value="${areaCfg.srcIpMask}">
<input name="areaCfg[${status.index}].srcIpMask" class="form-control required ipMask" type="text" value="${areaCfg.srcIpMask}">
</div>
<div for="areaCfg.srcIpMask"></div>
<div for="areaCfg[${status.index}].srcIpMask"></div>
</div>
</div>
</div>
@@ -342,18 +359,18 @@ function delAreaIsp(obj){
<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 name="areaCfg[${status.index}].srcPort" class="form-control" type="text" value="${areaCfg.srcPort}">
<input name="areaCfg[${status.index}].srcPort" class="form-control required" type="text" value="${areaCfg.srcPort}">
</div>
<div for="areaCfg.srcPort"></div>
<div for="areaCfg[${status.index}].srcPort"></div>
</div>
</div>
<div class="col-md-6">
<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 name="areaCfg[${status.index}].srcPortMask" class="form-control" type="text" value="${areaCfg.srcPortMask}">
<input name="areaCfg[${status.index}].srcPortMask" class="form-control required" type="text" value="${areaCfg.srcPortMask}">
</div>
<div for="areaCfg.srcPortMask"></div>
<div for="areaCfg[${status.index}].srcPortMask"></div>
</div>
</div>
</div>
@@ -362,18 +379,18 @@ function delAreaIsp(obj){
<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 name="areaCfg[${status.index}].dstIp" class="form-control" type="text" value="${areaCfg.dstIp}">
<input name="areaCfg[${status.index}].dstIp" class="form-control required ipCheck" type="text" value="${areaCfg.dstIp}">
</div>
<div for="areaCfg.dstIp"></div>
<div for="areaCfg[${status.index}].dstIp"></div>
</div>
</div>
<div class="col-md-6">
<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 name="areaCfg[${status.index}].dstIpMask" class="form-control" type="text" value="${areaCfg.dstIpMask}">
<input name="areaCfg[${status.index}].dstIpMask" class="form-control required ipMask" type="text" value="${areaCfg.dstIpMask}">
</div>
<div for="areaCfg.dstIpMask"></div>
<div for="areaCfg[${status.index}].dstIpMask"></div>
</div>
</div>
</div>
@@ -382,18 +399,18 @@ function delAreaIsp(obj){
<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 name="areaCfg[${status.index}].dstPort" class="form-control" type="text" value="${areaCfg.dstPort}">
<input name="areaCfg[${status.index}].dstPort" class="form-control required" type="text" value="${areaCfg.dstPort}">
</div>
<div for="areaCfg.dstPort"></div>
<div for="areaCfg[${status.index}].dstPort"></div>
</div>
</div>
<div class="col-md-6">
<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 name="areaCfg[${status.index}].dstPortMask" class="form-control" type="text" value="${areaCfg.dstPortMask}">
<input name="areaCfg[${status.index}].dstPortMask" class="form-control required" type="text" value="${areaCfg.dstPortMask}">
</div>
<div for="areaCfg.dstPortMask"></div>
<div for="areaCfg[${status.index}].dstPortMask"></div>
</div>
</div>
</div>
@@ -402,7 +419,7 @@ function delAreaIsp(obj){
<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="areaCfg[${status.index}].protocol" class="selectpicker show-tick form-control">
<select name="areaCfg[${status.index}].protocol" class="selectpicker show-tick form-control required">
<option><spring:message code="select"/></option>
<option value="6" <c:if test="${areaCfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${areaCfg.protocol==17}">selected</c:if> >UDP</option>
@@ -410,20 +427,20 @@ function delAreaIsp(obj){
</select>
<input type="hidden" name="areaCfg[${status.index}].protocolId" value="${areaCfg.protocolId}">
</div>
<div for="areaCfg.protocol"></div>
<div for="areaCfg[${status.index}].protocol"></div>
</div>
</div>
<div class="col-md-6">
<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="areaCfg[${status.index}].direction" class="selectpicker show-tick form-control" >
<select name="areaCfg[${status.index}].direction" class="selectpicker show-tick form-control required" >
<option><spring:message code="select"/></option>
<option value="0" <c:if test="${areaCfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${areaCfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
</select>
</div>
<div for="areaCfg.direction"></div>
<div for="areaCfg[${status.index}].direction"></div>
</div>
</div>
</div>

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>

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>

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");

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",

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));