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

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

Browse Source
This commit is contained in:
chenjinsong
2018-04-09 16:24:28 +08:00
parent fdf20225aa 33382d4712
commit de3d730cd4
10 changed files with 35 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@
<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 required">
<option value=""><spring:message code="select"/></option>
<option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
</select>

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

@@ -34,14 +34,12 @@
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<select name="ipCfg[${mainTable}].ipType" class="ipType selectpicker show-tick form-control required">
<option value="" ><spring:message code="select"/></option>
<option value="4" <c:if test="${_cfg.ipCfg[mainTable].ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_cfg.ipCfg[mainTable].ipType==6}">selected</c:if>>V6</option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<select name="ipCfg[${otherTable.tableName}].ipType" class="ipType selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="" ><spring:message code="select"/></option>
<select name="ipCfg[${otherTable.tableName}].ipType" class="ipType selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="4" <c:if test="${_cfg.ipCfg[otherTable.tableName].ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_cfg.ipCfg[otherTable.tableName].ipType==6}">selected</c:if>>V6</option>
</select>

53
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -6,6 +6,7 @@
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script type="text/javascript">
$(function(){
switchIpType($("select[name$='ipType']"));
if($("input[name='isAreaEffective']:checked").val()==1){
$(".areaType").removeClass("hidden");
if($("input[name='areaEffectiveIds']").val()){
@@ -72,58 +73,6 @@ $(function(){
errorContainer: "#messageBox",
});
});
var switchIpType=function(obj){
var type=$(obj).val();
var row=$(obj).parents('.row');
var srcIpMask=row.siblings().find("input[name$='srcIpMask']");
var dstIpMask=row.siblings().find("input[name$='dstIpMask']");
var srcIp=row.siblings().find("input[name$='srcIp']");
var dstIp=row.siblings().find("input[name$='dstIp']");
if(4==type){
if(!$(srcIpMask).val()){
$(srcIpMask).val("255.255.255.255");
}else if($(srcIpMask).val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$(srcIpMask).val("255.255.255.255");
}
if(!$(dstIpMask).val()){
$(dstIpMask).val("255.255.255.255");
}else if($(dstIpMask).val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$(dstIpMask).val("255.255.255.255");
}
if(!$(srcIp).val()){
$(srcIp).val("0.0.0.0");
}else if($(srcIp).val()=="::"){
$(srcIp).val("0.0.0.0");
}
if(!$(dstIp).val()){
$(dstIp).val("0.0.0.0");
}else if($(dstIp).val()=="::"){
$(dstIp).val("0.0.0.0");
}
}
if(6==type){
if(!$(srcIpMask).val()){
$(srcIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($(srcIpMask).val()=="255.255.255.255"){
$(srcIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$(dstIpMask).val()){
$(dstIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($(dstIpMask).val()=="255.255.255.255"){
$(dstIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$(srcIp).val()){
$(srcIp).val("::");
}else if($(srcIp).val()=="0.0.0.0"){
$(srcIp).val("::");
}
if(!$(dstIp).val()){
$(dstIp).val("::");
}else if($(dstIp).val()=="0.0.0.0"){
$(dstIp).val("::");
}
}
}
</script>
</head>
<body>

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

@@ -13,30 +13,7 @@ $(function(){
$(".bootstrap-select button").removeClass("disabled");
$(".collapse").addClass("in");
}
//$("[name^='stringCfg']").attr("disabled",true);
//$("[name^='complexCfg']").attr("disabled",true);
//$("[name^='numCfg']").attr("disabled",true);
/* $(".glyphicon").on("click",function(){
var className=$(this).attr("data-target");
if($(this).hasClass("glyphicon-chevron-down")){
$(this).removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-up");
}else if($(this).hasClass("glyphicon-chevron-up")){
$(this).removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down");
}else if($(this).hasClass("glyphicon-plus")){
var targetName=className.substring(1,className.length);
$(this).attr("title","remove");
$(this).removeClass("glyphicon-plus").addClass("glyphicon-remove");
$("[name^='"+targetName+"']").removeAttr("disabled");
//解决select插件disbale后无法恢复
$(".bootstrap-select").removeClass("disabled");
$(".bootstrap-select button").removeClass("disabled");
}else if($(this).hasClass("glyphicon-remove")){
var targetName=className.substring(1,className.length);
$(this).attr("title","add");
$(this).removeClass("glyphicon-remove").addClass("glyphicon-plus");
$("[name^='"+targetName+"']").attr("disabled",true);
}
}); */
$("#cfgFrom").validate({
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
@@ -46,7 +23,6 @@ $(function(){
},
errorContainer: "#messageBox"
});
$("#ipSelect").change(function(){
if($(this).prop("checked")){
$("[name^='ipCfg']").removeProp("disabled");
@@ -91,51 +67,7 @@ $(function(){
});
$(".ipType").on("change",function(){
var tableName=$(this).attr("name").replace(".ipType","");
var type=$(this).val();
if(4==type){
if(!$("input[name='"+tableName+".srcIpMask']").val()){
$("input[name='"+tableName+".srcIpMask']").val("255.255.255.255");
}else if($("input[name='"+tableName+".srcIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$("input[name='"+tableName+".srcIpMask']").val("255.255.255.255");
}
if(!$("input[name='"+tableName+".dstIpMask']").val()){
$("input[name='"+tableName+".dstIpMask']").val("255.255.255.255");
}else if($("input[name='"+tableName+".dstIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$("input[name='"+tableName+".dstIpMask']").val("255.255.255.255");
}
if(!$("input[name='"+tableName+".srcIp']").val()){
$("input[name='"+tableName+".srcIp']").val("0.0.0.0");
}else if($("input[name='"+tableName+".srcIp']").val()=="::"){
$("input[name='"+tableName+".srcIp']").val("0.0.0.0");
}
if(!$("input[name='"+tableName+".dstIp']").val()){
$("input[name='"+tableName+".dstIp']").val("0.0.0.0");
}else if($("input[name='"+tableName+".dstIp']").val()=="::"){
$("input[name='"+tableName+".dstIp']").val("0.0.0.0");
}
}
if(6==type){
if(!$("input[name='"+tableName+".srcIpMask']").val()){
$("input[name='"+tableName+".srcIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($("input[name='"+tableName+".srcIpMask']").val()=="255.255.255.255"){
$("input[name='"+tableName+".srcIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$("input[name='"+tableName+".dstIpMask']").val()){
$("input[name='"+tableName+".dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($("input[name='"+tableName+".dstIpMask']").val()=="255.255.255.255"){
$("input[name='"+tableName+".dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$("input[name='"+tableName+".srcIp']").val()){
$("input[name='"+tableName+".srcIp']").val("::");
}else if($("input[name='"+tableName+".srcIp']").val()=="0.0.0.0"){
$("input[name='"+tableName+".srcIp']").val("::");
}
if(!$("input[name='"+tableName+".dstIp']").val()){
$("input[name='"+tableName+".dstIp']").val("::");
}else if($("input[name='"+tableName+".dstIp']").val()=="0.0.0.0"){
$("input[name='"+tableName+".dstIp']").val("::");
}
}
switchIpType($(".ipType"));
});
$("#cancel").on("click",function(){
window.history.back();