IP类配置的区域GK加入非空验证

This commit is contained in:
wangxin
2018-04-08 19:07:58 +08:00
parent a65e7753c4
commit f67c0dc72a

View File

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