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:
chiguangxu
2018-04-13 18:16:03 +08:00
parent b386978b45 f4d7128ef5
commit da99177036
39 changed files with 1266 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -163,6 +163,7 @@ function delAreaIsp(obj){
<div class="container-fluid hidden">
<div class="row">
<input type="hidden" id="_areaCfg.isAreaEffective" value="${_areaCfg.isAreaEffective}">
<input id="_areaCfg.cfgId" type="hidden" value="${_areaCfg.cfgId}">
<div class="pull-right">
<span class="glyphicon glyphicon-remove" title="remove" onClick="delAreaIp(this);"/>
</div>
@@ -306,6 +307,7 @@ function delAreaIsp(obj){
<div class="container-fluid">
<div class="row">
<input type="hidden" name="areaCfg[${status.index}].isAreaEffective" value="${areaCfg.isAreaEffective}">
<input name="areaCfg[${status.index}].cfgId" type="hidden" value="${areaCfg.cfgId}">
<div class="pull-right">
<span class="glyphicon glyphicon-remove" title="remove" onClick="delAreaIp(this);"/>
</div>

16
src/main/webapp/WEB-INF/include/form/basicInfo.jsp
View File

@@ -99,19 +99,3 @@
</div>
</div>
</div>
<!-- <div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">生效范围</label>
<div class="col-md-6">
<select class="form-control">
<option>Country 1</option>
<option>Country 2</option>
</select>
</div>
</div>
</div>
</div> -->

12
src/main/webapp/WEB-INF/include/form/complexInfo.jsp
View File

@@ -11,16 +11,6 @@
<div for="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="match_area"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="district" value="${_cfg.district}">
</div>
<div for="district"></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="key_word"/></label>
@@ -108,7 +98,7 @@
<div class="row">
<div class="hidden areaType col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>

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

@@ -202,7 +202,7 @@
</div>
<div class="hidden areaType col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>

47
src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
View File

@@ -1,35 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section"><spring:message code="basic_config"/></h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
class="required"><spring:message code="yes"/>
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0"
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
class="required"><spring:message code="no"/>
</label>
</div>
<div for="isAreaEffective"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="area_effect_id"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.ipCfg.areaEffectiveIds}">
</div>
<div for="areaEffectiveIds"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
@@ -125,20 +96,4 @@
</div>
</div>
</div>
</div>
<!-- <div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">生效范围</label>
<div class="col-md-6">
<select class="form-control">
<option>Country 1</option>
<option>Country 2</option>
</select>
</div>
</div>
</div>
</div> -->
</div>

213
src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
View File

@@ -13,30 +13,17 @@ $(function(){
}
})
</script>
<h3 class="form-section">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<spring:message code="${mainTableDesc}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<spring:message code="${otherTable.tableDesc}"/>
</c:when>
<c:otherwise>增强字符串<spring:message code="block_config"/></c:otherwise>
</c:choose>
<!-- <small><span class="glyphicon glyphicon-chevron-down" data-toggle="collapse" data-target=".complexCfg" title="add"></span></small> --></h3>
<div class="row complexCfg">
<h3 class="form-section"><spring:message code="${tableInfo.tableDesc}"/>
<small><span style="margin-left:10px"><input type="checkbox" name="cfgSelect" value="complexCfg"
<c:if test="${_cfg.complexCfg[tableInfo.tableName]!= null and _cfg.complexCfg[tableInfo.tableName].cfgId != null}">checked</c:if>
/> <spring:message code="optional"/></span></small>
</h3>
<div class="row complexCfg collapse">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<input name="complexCfg[${mainTable}].cfgDesc" type="text" class="form-control" value="${_cfg.complexCfg[mainTable].cfgDesc}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<input name="complexCfg[${otherTable.tableName}].cfgDesc" type="text" class="form-control" value="${_cfg.complexCfg[otherTable.tableName].cfgDesc}"/>
</c:when>
</c:choose>
<input name="complexCfg[${tableInfo.tableName}].cfgDesc" type="text" class="form-control" value="${_cfg.complexCfg[tableInfo.tableName].cfgDesc}"/>
</div>
</div>
</div>
@@ -44,183 +31,79 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<select name="complexCfg[${mainTable}].district" class="district selectpicker select2 form-control required">
<option value=""><spring:message code='select'/></option>
<c:forEach items="${fns:getFeaturesDictData(mainTable)}" var="district">
<option value="${district.itemValue}"
<c:if test="${_cfg.complexCfg[mainTable].district eq district.itemValue}">selected</c:if>
>${district.itemValue}</option>
</c:forEach>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<select name="complexCfg[${otherTable.tableName}].district" class="district selectpicker select2 form-control required">
<option value=""><spring:message code='select'/></option>
<c:forEach items="${fns:getFeaturesDictData(otherTable.tableName)}" var="district">
<option value="${district.itemValue}"
<c:if test="${_cfg.complexCfg[otherTable.tableName].district eq district.itemValue}">selected</c:if>
>${district.itemValue}</option>
</c:forEach>
</select>
</c:when>
</c:choose>
<input type="hidden" name="" placeholder="请输入自定义域" class="otherValue form-control" value="${_cfg.complexCfg[mainTable].district}"/>
<select name="complexCfg[${tableInfo.tableName}].district" class="district selectpicker select2 form-control required">
<option value=""><spring:message code='select'/></option>
<c:forEach items="${fns:getFeaturesDictData(tableInfo.tableName)}" var="district">
<option value="${district.itemValue}"
<c:if test="${_cfg.complexCfg[tableInfo.tableName].district eq district.itemValue}">selected</c:if>
>${district.itemValue}</option>
</c:forEach>
</select>
<input type="hidden" name="" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.complexCfg[tableInfo.tableName].district}"/>
</div>
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<div for="complexCfg[${mainTable}].district"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<div for="complexCfg[${otherTable.tableName}].district"></div>
</c:when>
</c:choose>
<div for="complexCfg[${tableInfo.tableName}].district"></div>
</div>
</div>
</div>
<div class="row complexCfg">
<div class="row complexCfg collapse">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<input name="complexCfg[${mainTable}].keywords" type="text" class="form-control required" value="${_cfg.complexCfg[mainTable].keywords}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<input name="complexCfg[${otherTable.tableName}].keywords" type="text" class="form-control required" value="${_cfg.complexCfg[otherTable.tableName].keywords}"/>
</c:when>
</c:choose>
<input name="complexCfg[${tableInfo.tableName}].keywords" type="text" class="form-control required" value="${_cfg.complexCfg[tableInfo.tableName].keywords}"/>
</div>
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<div for="complexCfg[${mainTable}].keywords"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<div for="complexCfg[${otherTable.tableName}].keywords"></div>
</c:when>
</c:choose>
<div for="complexCfg[${tableInfo.tableName}].keywords"></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="expression_type"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<label class="radio-inline">
<input type="radio" name="complexCfg[${mainTable}].exprType" value="1"
<c:if test="${_cfg.complexCfg[mainTable].exprType==1}">checked</c:if>
class="required"/><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="complexCfg[${mainTable}].exprType" value="0"
<c:if test="${_cfg.complexCfg[mainTable].exprType==0}">checked</c:if>
class="required"/><spring:message code="null"/>
</label>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<label class="radio-inline">
<input type="radio" name="complexCfg[${otherTable.tableName}].exprType" value="1"
<c:if test="${_cfg.complexCfg[otherTable.tableName].exprType==1}">checked</c:if>
class="required"/><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="complexCfg[${otherTable.tableName}].exprType" value="0"
<c:if test="${_cfg.complexCfg[otherTable.tableName].exprType==0}">checked</c:if>
class="required"/><spring:message code="null"/>
</label>
</c:when>
</c:choose>
<label class="radio-inline">
<input type="radio" name="complexCfg[${tableInfo.tableName}].exprType" value="1"
<c:if test="${_cfg.complexCfg[tableInfo.tableName].exprType==1}">checked</c:if>
class="required"/><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="complexCfg[${tableInfo.tableName}].exprType" value="0"
<c:if test="${_cfg.complexCfg[tableInfo.tableName].exprType==0}">checked</c:if>
class="required"/><spring:message code="null"/>
</label>
</div>
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<div for="complexCfg[${mainTable}].exprType"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<div for="complexCfg[${otherTable.tableName}].exprType"></div>
</c:when>
</c:choose>
<div for="complexCfg[${tableInfo.tableName}].exprType"></div>
</div>
</div>
</div>
<div class="row complexCfg">
<div class="row complexCfg collapse">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<select name="complexCfg[${mainTable}].matchMethod" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.complexCfg[mainTable].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexCfg[mainTable].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexCfg[mainTable].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.complexCfg[mainTable].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<select name="complexCfg[${otherTable.tableName}].matchMethod" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.complexCfg[otherTable.tableName].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexCfg[otherTable.tableName].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexCfg[otherTable.tableName].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.complexCfg[otherTable.tableName].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</c:when>
</c:choose>
<select name="complexCfg[${tableInfo.tableName}].matchMethod" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.complexCfg[tableInfo.tableName].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexCfg[tableInfo.tableName].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexCfg[tableInfo.tableName].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.complexCfg[tableInfo.tableName].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</div>
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<div for="complexCfg[${mainTable}].matchMethod"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<div for="complexCfg[${otherTable.tableName}].matchMethod"></div>
</c:when>
</c:choose>
<div for="complexCfg[${tableInfo.tableName}].matchMethod"></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="whether_hexbinary"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<select name="complexCfg[${mainTable}].isHexbin" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.complexCfg[mainTable].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexCfg[mainTable].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexCfg[mainTable].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<select name="complexCfg[${otherTable.tableName}].isHexbin" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.complexCfg[otherTable.tableName].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexCfg[otherTable.tableName].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexCfg[otherTable.tableName].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</c:when>
</c:choose>
<select name="complexCfg[${tableInfo.tableName}].isHexbin" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.complexCfg[tableInfo.tableName].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexCfg[tableInfo.tableName].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexCfg[tableInfo.tableName].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<div for="complexCfg[${mainTable}].isHexbin"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<div for="complexCfg[${otherTable.tableName}].isHexbin"></div>
</c:when>
</c:choose>
<div for="complexCfg[${tableInfo.tableName}].isHexbin"></div>
</div>
</div>
<c:choose>
<c:when test="${mainTableType eq '4' and otherTable==null}">
<input name="complexCfg[${mainTable}].cfgId" type="hidden" value="${_cfg.complexCfg[mainTable].cfgId}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<input name="complexCfg[${otherTable.tableName}].cfgId" type="hidden" value="${_cfg.complexCfg[otherTable.tableName].cfgId}"/>
</c:when>
</c:choose>
<input name="complexCfg[${tableInfo.tableName}].cfgId" type="hidden" value="${_cfg.complexCfg[tableInfo.tableName].cfgId}"/>
</div>
<!--/row-->

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

@@ -1,29 +1,16 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<spring:message code="${mainTableDesc}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<spring:message code="${otherTable.tableDesc}"/>
</c:when>
<c:otherwise>IP<spring:message code="block_config"/></c:otherwise>
</c:choose>
<small><span style="margin-left:10px"><input type="checkbox" id="ipSelect" <c:if test="${_cfg.ipCfg[mainTable]!= null and _cfg.ipCfg[mainTable].cfgId != null}">checked</c:if> <c:if test="${_cfg.ipCfg[otherTable.tableName]!= null and _cfg.ipCfg[otherTable.tableName].cfgId != null}">checked</c:if>/> 可选</span><!-- <span class="glyphicon glyphicon-plus" data-toggle="collapse" data-target=".ipCfg" title="add"></span> --></small></h3>
<spring:message code="${tableInfo.tableDesc}"/>
<small><span style="margin-left:10px"><input type="checkbox" id="ipSelect" value="ipCfg"
<c:if test="${_cfg.ipCfg[tableInfo.tableName]!= null and _cfg.ipCfg[tableInfo.tableName].cfgId != null}">checked</c:if>
/> <spring:message code="optional"/></span></small></h3>
<div class="row ipCfg collapse">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control" type="text" name="ipCfg[${mainTable}].cfgDesc" value="${_cfg.ipCfg[mainTable].cfgDesc}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control" type="text" name="ipCfg[${otherTable.tableName}].cfgDesc" value="${_cfg.ipCfg[otherTable.tableName].cfgDesc}">
</c:when>
</c:choose>
<input class="form-control" type="text" name="ipCfg[${tableInfo.tableName}].cfgDesc" value="${_cfg.ipCfg[tableInfo.tableName].cfgDesc}">
</div>
</div>
</div>
@@ -31,29 +18,12 @@
<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">
<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="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="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>
</c:when>
</c:choose>
<select name="ipCfg[${tableInfo.tableName}].ipType" class="ipType selectpicker show-tick form-control required">
<option value="4" <c:if test="${_cfg.ipCfg[tableInfo.tableName].ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_cfg.ipCfg[tableInfo.tableName].ipType==6}">selected</c:if>>V6</option>
</select>
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].ipType"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].ipType"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].ipType"></div>
</div>
</div>
</div>
@@ -62,46 +32,18 @@
<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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<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 ipCheck" type="text" name="ipCfg[${otherTable.tableName}].srcIp" value="${_cfg.ipCfg[otherTable.tableName].srcIp}">
</c:when>
</c:choose>
<input class="form-control required ipCheck" type="text" name="ipCfg[${tableInfo.tableName}].srcIp" value="${_cfg.ipCfg[tableInfo.tableName].srcIp}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].srcIp"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].srcIp"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].srcIpMask" value="${_cfg.ipCfg[mainTable].srcIpMask}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].srcIpMask" value="${_cfg.ipCfg[otherTable.tableName].srcIpMask}">
</c:when>
</c:choose>
<input class="form-control required" type="text" name="ipCfg[${tableInfo.tableName}].srcIpMask" value="${_cfg.ipCfg[tableInfo.tableName].srcIpMask}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].srcIpMask"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].srcIpMask"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].srcIpMask"></div>
<div for="srcIpMask"></div>
</div>
</div>
@@ -111,46 +53,18 @@
<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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" range="[0,65535]" type="text" name="ipCfg[${mainTable}].srcPort" value="${_cfg.ipCfg[mainTable].srcPort}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" range="[0,65535]" type="text" name="ipCfg[${otherTable.tableName}].srcPort" value="${_cfg.ipCfg[otherTable.tableName].srcPort}">
</c:when>
</c:choose>
<input class="form-control required" range="[0,65535]" type="text" name="ipCfg[${tableInfo.tableName}].srcPort" value="${_cfg.ipCfg[tableInfo.tableName].srcPort}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].srcPort"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].srcPort"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].srcPortMask" range="[0,65535]" value="${_cfg.ipCfg[mainTable].srcPortMask}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].srcPortMask" range="[0,65535]" value="${_cfg.ipCfg[otherTable.tableName].srcPortMask}">
</c:when>
</c:choose>
<input class="form-control required" type="text" name="ipCfg[${tableInfo.tableName}].srcPortMask" range="[0,65535]" value="${_cfg.ipCfg[tableInfo.tableName].srcPortMask}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].srcPortMask"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].srcPortMask"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].srcPortMask"></div>
</div>
</div>
</div>
@@ -159,46 +73,18 @@
<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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<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 ipCheck" type="text" name="ipCfg[${otherTable.tableName}].dstIp" value="${_cfg.ipCfg[otherTable.tableName].dstIp}">
</c:when>
</c:choose>
<input class="form-control required ipCheck" type="text" name="ipCfg[${tableInfo.tableName}].dstIp" value="${_cfg.ipCfg[tableInfo.tableName].dstIp}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].dstIp"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].dstIp"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstIpMask" value="${_cfg.ipCfg[mainTable].dstIpMask}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstIpMask" value="${_cfg.ipCfg[otherTable.tableName].dstIpMask}">
</c:when>
</c:choose>
<input class="form-control required" type="text" name="ipCfg[${tableInfo.tableName}].dstIpMask" value="${_cfg.ipCfg[tableInfo.tableName].dstIpMask}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].dstIpMask"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].dstIpMask"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].dstIpMask"></div>
</div>
</div>
</div>
@@ -207,46 +93,18 @@
<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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstPort" value="${_cfg.ipCfg[mainTable].dstPort}" range="[0,65535]">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstPort" value="${_cfg.ipCfg[otherTable.tableName].dstPort}" range="[0,65535]">
</c:when>
</c:choose>
<input class="form-control required" type="text" name="ipCfg[${tableInfo.tableName}].dstPort" value="${_cfg.ipCfg[tableInfo.tableName].dstPort}" range="[0,65535]">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].dstPort"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].dstPort"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input class="form-control required" type="text" name="ipCfg[${mainTable}].dstPortMask" range="[0,65535]" value="${_cfg.ipCfg[mainTable].dstPortMask}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input class="form-control required" type="text" name="ipCfg[${otherTable.tableName}].dstPortMask" range="[0,65535]" value="${_cfg.ipCfg[otherTable.tableName].dstPortMask}">
</c:when>
</c:choose>
<input class="form-control required" type="text" name="ipCfg[${tableInfo.tableName}].dstPortMask" range="[0,65535]" value="${_cfg.ipCfg[tableInfo.tableName].dstPortMask}">
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].dstPortMask"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].dstPortMask"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].dstPortMask"></div>
</div>
</div>
</div>
@@ -255,75 +113,30 @@
<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">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<select name="ipCfg[${mainTable}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.ipCfg[mainTable].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_cfg.ipCfg[mainTable].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<select name="ipCfg[${otherTable.tableName}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
</select>
</c:when>
</c:choose>
<select name="ipCfg[${tableInfo.tableName}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.ipCfg[tableInfo.tableName].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_cfg.ipCfg[tableInfo.tableName].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
</select>
<%-- <input class="form-control" type="text" name="direction" value="${_cfg.ipCfg.direction}"> --%>
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].direction"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].direction"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].direction"></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="protocol"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<select name="ipCfg[${mainTable}].protocol" class="selectpicker show-tick form-control" required title=<spring:message code="select"/>>
<option value=""><spring:message code="select"/></option>
<option value="6" <c:if test="${_cfg.ipCfg[mainTable].protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_cfg.ipCfg[mainTable].protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${_cfg.ipCfg[mainTable].protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<select name="ipCfg[${otherTable.tableName}].protocol" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
<option value="" ><spring:message code="select"/></option>
<option value="6" <c:if test="${_cfg.ipCfg[otherTable.tableName].protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_cfg.ipCfg[otherTable.tableName].protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${_cfg.ipCfg[otherTable.tableName].protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
</select>
</c:when>
</c:choose>
<select name="ipCfg[${tableInfo.tableName}].protocol" class="selectpicker show-tick form-control" required title=<spring:message code="select"/>>
<option value=""><spring:message code="select"/></option>
<option value="6" <c:if test="${_cfg.ipCfg[tableInfo.tableName].protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_cfg.ipCfg[tableInfo.tableName].protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${_cfg.ipCfg[tableInfo.tableName].protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
</select>
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<div for="ipCfg[${mainTable}].protocol"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<div for="ipCfg[${otherTable.tableName}].protocol"></div>
</c:when>
</c:choose>
<div for="ipCfg[${tableInfo.tableName}].protocol"></div>
</div>
</div>
<c:choose>
<c:when test="${mainTableType eq '1' and otherTable==null}">
<input type="hidden" name="ipCfg[${mainTable}].protocolId" value="${_cfg.ipCfg[mainTable].protocolId}">
<input name="ipCfg[${mainTable}].cfgId" type="hidden" value="${_cfg.ipCfg[mainTable].cfgId}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
<input type="hidden" name="ipCfg[${otherTable.tableName}].protocolId" value="${_cfg.ipCfg[otherTable.tableName].protocolId}">
<input name="ipCfg[${otherTable.tableName}].cfgId" type="hidden" value="${_cfg.ipCfg[otherTable.tableName].cfgId}"/>
</c:when>
</c:choose>
<input type="hidden" name="ipCfg[${tableInfo.tableName}].protocolId" value="${_cfg.ipCfg[tableInfo.tableName].protocolId}">
<input name="ipCfg[${tableInfo.tableName}].cfgId" type="hidden" value="${_cfg.ipCfg[tableInfo.tableName].cfgId}"/>
</div>

133
src/main/webapp/WEB-INF/include/form/multiple/numInfo.jsp
View File

@@ -1,29 +1,14 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<spring:message code="${mainTableDesc}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<spring:message code="${otherTable.tableDesc}"/>
</c:when>
<c:otherwise>数值<spring:message code="block_config"/></c:otherwise>
</c:choose>
<spring:message code="${tableInfo.tableDesc}"/>
<small><span class="glyphicon glyphicon-chevron-down" data-toggle="collapse" data-target=".numCfg" title="add"></span></small></h3>
<div class="row numCfg collapse">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<input name="numCfg[${mainTable}].cfgDesc" type="text" class="form-control" value="${_cfg.numCfg[mainTable].cfgDesc}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<input name="numCfg[${otherTable.tableName}].cfgDesc" type="text" class="form-control" value="${_cfg.numCfg[otherTable.tableName].cfgDesc}"/>
</c:when>
</c:choose>
<input name="numCfg[${tableInfo.tableName}].cfgDesc" type="text" class="form-control" value="${_cfg.numCfg[tableInfo.tableName].cfgDesc}"/>
</div>
<div for="cfgDesc"></div>
</div>
@@ -32,14 +17,7 @@
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<input type="text" name="numCfg[${mainTable}].lowBounadry" value="${_cfg.numCfg[mainTable].lowBounadry}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<input type="text" name="numCfg[${otherTable.tableName}].lowBounadry" value="${_cfg.numCfg[otherTable.tableName].lowBounadry}">
</c:when>
</c:choose>
<input type="text" name="numCfg[${tableInfo.tableName}].lowBounadry" value="${_cfg.numCfg[tableInfo.tableName].lowBounadry}">
</div>
<div for="district"></div>
</div>
@@ -50,14 +28,7 @@
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<input type="text" name="numCfg[${mainTable}].upBounadry" value="${_cfg.numCfg[mainTable].upBounadry}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<input type="text" name="numCfg[${otherTable.tableName}].upBounadry" value="${_cfg.numCfg[otherTable.tableName].upBounadry}">
</c:when>
</c:choose>
<input type="text" name="numCfg[${tableInfo.tableName}].upBounadry" value="${_cfg.numCfg[tableInfo.tableName].upBounadry}">
</div>
<div for="keywords"></div>
</div>
@@ -66,32 +37,16 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<label class="radio-inline">
<input type="radio" name="numCfg[${mainTable}].exprType" value="1"
<c:if test="${_cfg.numCfg[mainTable].exprType==1}">checked</c:if>
><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="numCfg[${mainTable}].exprType" value="0"
<c:if test="${_cfg.numCfg[mainTable].exprType==0}">checked</c:if>
><spring:message code="null"/>
</label>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<label class="radio-inline">
<input type="radio" name="numCfg[${otherTable.tableName}].exprType" value="1"
<c:if test="${_cfg.numCfg[otherTable.tableName].exprType==1}">checked</c:if>
><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="numCfg[${otherTable.tableName}].exprType" value="0"
<c:if test="${_cfg.numCfg[otherTable.tableName].exprType==0}">checked</c:if>
><spring:message code="null"/>
</label>
</c:when>
</c:choose>
<label class="radio-inline">
<input type="radio" name="numCfg[${tableInfo.tableName}].exprType" value="1"
<c:if test="${_cfg.numCfg[tableInfo.tableName].exprType==1}">checked</c:if>
><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="numCfg[${tableInfo.tableName}].exprType" value="0"
<c:if test="${_cfg.numCfg[tableInfo.tableName].exprType==0}">checked</c:if>
><spring:message code="null"/>
</label>
</div>
<div for="isAreaEffective"></div>
</div>
@@ -102,26 +57,13 @@
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<select name="numCfg[${mainTable}].matchMethod" class="selectpicker select2 form-control" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.numCfg[mainTable].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.numCfg[mainTable].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.numCfg[mainTable].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.numCfg[mainTable].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<select name="numCfg[${otherTable.tableName}].matchMethod" class="selectpicker select2 form-control" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.numCfg[otherTable.tableName].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.numCfg[otherTable.tableName].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.numCfg[otherTable.tableName].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.numCfg[otherTable.tableName].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</c:when>
</c:choose>
<select name="numCfg[${tableInfo.tableName}].matchMethod" class="selectpicker select2 form-control" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.numCfg[tableInfo.tableName].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.numCfg[tableInfo.tableName].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.numCfg[tableInfo.tableName].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.numCfg[tableInfo.tableName].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</div>
<div for="matchMethod"></div>
</div>
@@ -130,34 +72,15 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<select name="numCfg[${mainTable}].isHexbin" class="selectpicker select2 form-control" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.numCfg[mainTable].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.numCfg[mainTable].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.numCfg[mainTable].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<select name="numCfg[${otherTable.tableName}].isHexbin" class="selectpicker select2 form-control" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.numCfg[otherTable.tableName].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.numCfg[otherTable.tableName].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.numCfg[otherTable.tableName].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</c:when>
</c:choose>
<select name="numCfg[${tableInfo.tableName}].isHexbin" class="selectpicker select2 form-control" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.numCfg[tableInfo.tableName].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.numCfg[tableInfo.tableName].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.numCfg[tableInfo.tableName].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
</div>
</div>
<c:choose>
<c:when test="${mainTableType eq '3' and otherTable==null}">
<input name="numCfg[${mainTable}].cfgId" type="hidden" value="${_cfg.numCfg[mainTable].cfgId}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '3'}">
<input name="numCfg[${otherTable.tableName}].cfgId" type="hidden" value="${_cfg.numCfg[otherTable.tableName].cfgId}"/>
</c:when>
</c:choose>
<input name="numCfg[${tableInfo.tableName}].cfgId" type="hidden" value="${_cfg.numCfg[tableInfo.tableName].cfgId}"/>
</div>
<!--/row-->

171
src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp
View File

@@ -1,29 +1,17 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<spring:message code="${mainTableDesc}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<spring:message code="${otherTable.tableDesc}"/>
</c:when>
<c:otherwise>字符串<spring:message code="block_config"/></c:otherwise>
</c:choose>
<!-- <small><span class="glyphicon glyphicon-chevron-down" data-toggle="collapse" data-target=".stringCfg" title="add"></span></small> --></h3>
<div class="row stringCfg">
<spring:message code="${tableInfo.tableDesc}"/>
<small><span style="margin-left:10px"><input type="checkbox" name="cfgSelect" value="stringCfg"
<c:if test="${_cfg.stringCfg[tableInfo.tableName]!= null and _cfg.stringCfg[tableInfo.tableName].cfgId != null}">checked</c:if>
/> <spring:message code="optional"/></span></small>
</h3>
<div class="row stringCfg collapse">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<input class="form-control" type="text" name="stringCfg[${mainTable}].cfgDesc" value="${_cfg.stringCfg[mainTable].cfgDesc}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<input class="form-control" type="text" name="stringCfg[${otherTable.tableName}].cfgDesc" value="${_cfg.stringCfg[otherTable.tableName].cfgDesc}">
</c:when>
</c:choose>
<input class="form-control" type="text" name="stringCfg[${tableInfo.tableName}].cfgDesc" value="${_cfg.stringCfg[tableInfo.tableName].cfgDesc}">
</div>
</div>
</div>
@@ -31,145 +19,62 @@
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<input class="form-control required" type="text" name="stringCfg[${mainTable}].cfgKeywords" value="${_cfg.stringCfg[mainTable].cfgKeywords}">
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<input class="form-control required" type="text" name="stringCfg[${otherTable.tableName}].cfgKeywords" value="${_cfg.stringCfg[otherTable.tableName].cfgKeywords}">
</c:when>
</c:choose>
<input class="form-control required" type="text" name="stringCfg[${tableInfo.tableName}].cfgKeywords" value="${_cfg.stringCfg[tableInfo.tableName].cfgKeywords}">
</div>
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<div for="stringCfg[${mainTable}].cfgKeywords"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<div for="stringCfg[${otherTable.tableName}].cfgKeywords"></div>
</c:when>
</c:choose>
<div for="stringCfg[${tableInfo.tableName}].cfgKeywords"></div>
</div>
</div>
</div>
<div class="row stringCfg">
<div class="row stringCfg collapse">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<label class="radio-inline">
<input type="radio" name="stringCfg[${mainTable}].exprType" value="1"
<c:if test="${_cfg.stringCfg[mainTable].exprType==1}">checked</c:if>
class="required"><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="stringCfg[${mainTable}].exprType" value="0"
<c:if test="${_cfg.stringCfg[mainTable].exprType==0}">checked</c:if>
class="required"><spring:message code="null"/>
</label>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<label class="radio-inline">
<input type="radio" name="stringCfg[${otherTable.tableName}].exprType" value="1"
<c:if test="${_cfg.stringCfg[otherTable.tableName].exprType==1}">checked</c:if>
class="required"><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="stringCfg[${otherTable.tableName}].exprType" value="0"
<c:if test="${_cfg.stringCfg[otherTable.tableName].exprType==0}">checked</c:if>
class="required"><spring:message code="null"/>
</label>
</c:when>
</c:choose>
<label class="radio-inline">
<input type="radio" name="stringCfg[${tableInfo.tableName}].exprType" value="1"
<c:if test="${_cfg.stringCfg[tableInfo.tableName].exprType==1}">checked</c:if>
class="required"><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="stringCfg[${tableInfo.tableName}].exprType" value="0"
<c:if test="${_cfg.stringCfg[tableInfo.tableName].exprType==0}">checked</c:if>
class="required"><spring:message code="null"/>
</label>
</div>
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<div for="stringCfg[${mainTable}].exprType"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<div for="stringCfg[${otherTable.tableName}].exprType"></div>
</c:when>
</c:choose>
<div for="stringCfg[${tableInfo.tableName}].exprType"></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="match_method"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<select name="stringCfg[${mainTable}].matchMethod" class="selectpicker select2 form-control required">
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.stringCfg[mainTable].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.stringCfg[mainTable].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.stringCfg[mainTable].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.stringCfg[mainTable].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<select name="stringCfg[${otherTable.tableName}].matchMethod" class="selectpicker select2 form-control required">
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.stringCfg[otherTable.tableName].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.stringCfg[otherTable.tableName].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.stringCfg[otherTable.tableName].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.stringCfg[otherTable.tableName].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</c:when>
</c:choose>
<select name="stringCfg[${tableInfo.tableName}].matchMethod" class="selectpicker select2 form-control required">
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.stringCfg[tableInfo.tableName].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.stringCfg[tableInfo.tableName].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.stringCfg[tableInfo.tableName].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.stringCfg[tableInfo.tableName].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</div>
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<div for="stringCfg[${mainTable}].matchMethod"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<div for="stringCfg[${otherTable.tableName}].matchMethod"></div>
</c:when>
</c:choose>
<div for="stringCfg[${tableInfo.tableName}].matchMethod"></div>
</div>
</div>
</div>
<div class="row stringCfg">
<div class="row stringCfg collapse">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
<div class="col-md-6">
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<select name="stringCfg[${mainTable}].isHexbin" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.stringCfg[mainTable].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.stringCfg[mainTable].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.stringCfg[mainTable].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<select name="stringCfg[${otherTable.tableName}].isHexbin" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.stringCfg[otherTable.tableName].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.stringCfg[otherTable.tableName].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.stringCfg[otherTable.tableName].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</c:when>
</c:choose>
<select name="stringCfg[${tableInfo.tableName}].isHexbin" class="selectpicker select2 form-control required" >
<option value="" ><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.stringCfg[tableInfo.tableName].isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.stringCfg[tableInfo.tableName].isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.stringCfg[tableInfo.tableName].isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<div for="stringCfg[${mainTable}].isHexbin"></div>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<div for="stringCfg[${otherTable.tableName}].isHexbin"></div>
</c:when>
</c:choose>
<div for="stringCfg[${tableInfo.tableName}].isHexbin"></div>
</div>
</div>
<c:choose>
<c:when test="${mainTableType eq '2' and otherTable==null}">
<input name="stringCfg[${mainTable}].cfgId" type="hidden" value="${_cfg.stringCfg[mainTable].cfgId}"/>
</c:when>
<c:when test="${otherTable!=null and otherTable.tableType eq '2'}">
<input name="stringCfg[${otherTable.tableName}].cfgId" type="hidden" value="${_cfg.stringCfg[otherTable.tableName].cfgId}"/>
</c:when>
</c:choose>
<input name="stringCfg[${tableInfo.tableName}].cfgId" type="hidden" value="${_cfg.stringCfg[tableInfo.tableName].cfgId}"/>
</div>
<!--/row-->

2
src/main/webapp/WEB-INF/include/form/stringInfo.jsp
View File

@@ -115,7 +115,7 @@
</div> --%>
<div class="hidden areaType col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>

2
src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
View File

@@ -249,7 +249,7 @@ $(function(){
</option>
</c:if>
</select>
<input type="hidden" name="" placeholder="请输入自定义域" class="otherValue form-control" value="${_cfg.complexFeaturesList[index2].district}"/>
<input type="hidden" name="" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.complexFeaturesList[index2].district}"/>
<%-- <input class="required form-control" type="text" name="complexFeaturesList[${index2}].district" value="${_cfg.complexFeaturesList[index2].district }"> --%>
</div>
<div for="cfgDesc"></div>

2
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -116,7 +116,7 @@
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<c:if test="${audit==0}">

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

@@ -305,7 +305,7 @@ $(function(){
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<shiro:hasPermission name="ip:cfg:edit">
<shiro:hasPermission name="cfg:dnsip:edit">
<input id="submitBtn" type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>>
</shiro:hasPermission>
<button id="cancel" type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>

16
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
View File

@@ -52,9 +52,9 @@
function edit() {
var checkboxes = $(".child-checks:checked");
if (checkboxes.length == 0) {
alertx("请选择一条配置");
alertx("<spring:message code='one_more'/>");
} else if (checkboxes.length > 1) {
alertx("只能选择一条配置");
alertx("<spring:message code='check_one'/>");
} else {
window.location.href = "${ctx}/cfg/dnsIp/form?cfgId=" + checkboxes.attr("id");
}
@@ -63,7 +63,7 @@
function delCfg() {
var checkboxes = $(".child-checks:checked");
if (checkboxes.length == 0) {
alertx("请选择一条配置");
alertx("<spring:message code='one_more'/>");
} else {
var ids = "";
checkboxes.each(function(){
@@ -83,7 +83,7 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="cfg:ip:edit">
<shiro:hasPermission name="cfg:dnsip:edit">
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/cfg/dnsIp/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
@@ -131,7 +131,7 @@
<%-- <button type="button" class="btn btn-default" onclick="edit()">
<i class="fa fa-edit"></i> <spring:message code="edit"/>
</button> --%>
<shiro:hasPermission name="cfg:ip:edit">
<shiro:hasPermission name="cfg:dnsip:edit">
<button class="btn btn-default" onclick="delCfg()" data-toggle="tooltip" data-placement="top">
<i class="fa fa-trash"> <spring:message code="delete"/></i>
</button>
@@ -149,7 +149,7 @@
</div> --%>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
data-container="body" data-placement="top" data-original-title="<spring:message code='custom_columns'/>" href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
@@ -246,7 +246,7 @@
<table class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<shiro:hasPermission name="cfg:ip:edit">
<shiro:hasPermission name="cfg:dnsip:edit">
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
</shiro:hasPermission>
<th><spring:message code="config_describe"/></th>
@@ -276,7 +276,7 @@
</thead>
<tbody>
<c:forEach items="${page.list }" var="dnsIpCfg" varStatus="status" step="1">
<shiro:hasPermission name="cfg:ip:edit">
<shiro:hasPermission name="cfg:dnsip:edit">
<td><input type="checkbox" class="i-checks child-checks" id="${dnsIpCfg.fakeId}" value="${dnsIpCfg.isAudit}"></td>
</shiro:hasPermission>
<td>${dnsIpCfg.cfgDesc }</td>

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

@@ -5,33 +5,136 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function(){
switchIpType($("select[name$='ipType']"));
areaControlInit();
$("[name^='ipCfg']").attr("disabled",true);
$("[name^='stringCfg']").attr("disabled",true);
$("[name^='numCfg']").attr("disabled",true);
$("[name^='complexCfg']").attr("disabled",true);
if($("#ipSelect").is(":checked")){
$("[name^='ipCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".bootstrap-select").removeClass("disabled");
$(".bootstrap-select button").removeClass("disabled");
$(".collapse").addClass("in");
$(".ipCfg").find(".bootstrap-select").removeClass("disabled");
$(".ipCfg").find(".bootstrap-select button").removeClass("disabled");
$(".ipCfg").addClass("in");
}
$("[name='cfgSelect']:checked").each(function(){
var row=$(this).parents(".form-section").next();
if(row.hasClass("complexCfg")){
$("[name^='complexCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".complexCfg").find(".bootstrap-select").removeClass("disabled");
$(".complexCfg").find(".bootstrap-select").removeClass("disabled");
$(".complexCfg").find(".bootstrap-select button").removeClass("disabled");
$(".complexCfg").addClass("in");
}else if(row.hasClass("stringCfg")){
$("[name^='stringCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".stringCfg").find(".bootstrap-select").removeClass("disabled");
$(".stringCfg").find(".bootstrap-select").removeClass("disabled");
$(".stringCfg").find(".bootstrap-select button").removeClass("disabled");
$(".stringCfg").addClass("in");
}else if(row.hasClass("ipCfg")){
$("[name^='ipCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".ipCfg").find(".bootstrap-select").removeClass("disabled");
$(".ipCfg").find(".bootstrap-select").removeClass("disabled");
$(".ipCfg").find(".bootstrap-select button").removeClass("disabled");
$(".ipCfg").addClass("in");
}
});
$("input[name='isAreaEffective']").on('change',function(){
var val=$(this).val();
if(val==1){
$(".areaType").removeClass("hidden");
if($("input[name='areaType']:checked").val()==1){//areaISP
$("#areaIsp").removeClass("hidden");
}else if($("input[name='areaType']:checked").val()==0){//areaIp
$("#areaIp").removeClass("hidden");
}
}else{
$(".areaType").addClass("hidden");
$("#areaIp").addClass("hidden");
$("#areaIsp").addClass("hidden");
}
});
$("input[name='areaType']").on('change',function(){
var val=$(this).val();
if($(this).is(":visible")){
if(val==0){
$("#areaIp").removeClass("hidden");
$("#areaIsp").addClass("hidden");
}else{
$("#areaIsp").removeClass("hidden");
$("#areaIp").addClass("hidden");
}
}else{
$("#areaIsp").addClass("hidden");
$("#areaIp").addClass("hidden");
}
});
$("#cfgFrom").validate({
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
var len=$("[name='cfgSelect']:checked").length;
if(len==0){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
form.submit();
},
errorContainer: "#messageBox"
});
$("[name='cfgSelect']").change(function(){
var row=$(this).parents(".form-section").next();
if($(this).prop("checked")){
if(row.hasClass("complexCfg")){
$("[name^='complexCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".complexCfg").find(".bootstrap-select").removeClass("disabled");
$(".complexCfg").find(".bootstrap-select").removeClass("disabled");
$(".complexCfg").find(".bootstrap-select button").removeClass("disabled");
$(".complexCfg").addClass("in");
}else if(row.hasClass("stringCfg")){
$("[name^='stringCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".stringCfg").find(".bootstrap-select").removeClass("disabled");
$(".stringCfg").find(".bootstrap-select").removeClass("disabled");
$(".stringCfg").find(".bootstrap-select button").removeClass("disabled");
$(".stringCfg").addClass("in");
}else if(row.hasClass("ipCfg")){
$("[name^='ipCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".ipCfg").find(".bootstrap-select").removeClass("disabled");
$(".ipCfg").find(".bootstrap-select").removeClass("disabled");
$(".ipCfg").find(".bootstrap-select button").removeClass("disabled");
$(".ipCfg").addClass("in");
}
}else{
if(row.hasClass("complexCfg")){
$(".complexCfg").removeClass("in");
$("[name^='complexCfg']").attr("disabled",true);
}else if(row.hasClass("stringCfg")){
$(".stringCfg").removeClass("in");
$("[name^='stringCfg']").attr("disabled",true);
}else if(row.hasClass("ipCfg")){
$(".ipCfg").removeClass("in");
$("[name^='ipCfg']").attr("disabled",true);
}
}
});
$("#ipSelect").change(function(){
if($(this).prop("checked")){
$("[name^='ipCfg']").removeProp("disabled");
//解决select插件disbale后无法恢复
$(".bootstrap-select").removeClass("disabled");
$(".bootstrap-select button").removeClass("disabled");
$(".collapse").addClass("in");
$(".ipCfg").find(".bootstrap-select").removeClass("disabled");
$(".ipCfg").find(".bootstrap-select button").removeClass("disabled");
$(".ipCfg").addClass("in");
}else{
$(".collapse").removeClass("in");
$(".ipCfg").removeClass("in");
$("[name^='ipCfg']").attr("disabled",true);
}
});
@@ -105,40 +208,62 @@ $(function(){
<input type="hidden" name="action" value="${_cfg.action}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<div class="form-body">
<c:choose>
<c:when test="${_cfg.mainTableType eq '4'}">
<%@include file="/WEB-INF/include/form/multiple/complexInfo.jsp" %>
</c:when>
<c:when test="${_cfg.mainTableType eq '3'}">
<%@include file="/WEB-INF/include/form/multiple/numInfo.jsp" %>
</c:when>
<c:when test="${_cfg.mainTableType eq '2'}">
<%@include file="/WEB-INF/include/form/multiple/stringInfo.jsp" %>
</c:when>
<c:when test="${_cfg.mainTableType eq '1'}">
<%@include file="/WEB-INF/include/form/multiple/ipInfo.jsp" %>
</c:when>
</c:choose>
<c:forEach items="${_cfg.otherTables}" var="otherTable">
<c:forEach items="${tableInfos}" var="tableInfo">
<c:choose>
<c:when test="${otherTable.tableType eq '4'}">
<c:when test="${tableInfo.tableType eq '4'}">
<%@include file="/WEB-INF/include/form/multiple/complexInfo.jsp" %>
</c:when>
<c:when test="${otherTable.tableType eq '3'}">
<c:when test="${tableInfo.tableType eq '3'}">
<%@include file="/WEB-INF/include/form/multiple/numInfo.jsp" %>
</c:when>
<c:when test="${otherTable.tableType eq '2'}">
<c:when test="${tableInfo.tableType eq '2'}">
<%@include file="/WEB-INF/include/form/multiple/stringInfo.jsp" %>
</c:when>
</c:choose>
</c:forEach>
<c:forEach items="${_cfg.otherTables}" var="otherTable">
<c:forEach items="${tableInfos}" var="tableInfo">
<c:choose>
<c:when test="${otherTable.tableType eq '1'}">
<c:when test="${tableInfo.tableType eq '1'}">
<%@include file="/WEB-INF/include/form/multiple/ipInfo.jsp" %>
</c:when>
</c:choose>
</c:forEach>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
class="required"><spring:message code="yes"/>
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0"
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
class="required"><spring:message code="no"/>
</label>
</div>
<div for="isAreaEffective"></div>
</div>
</div>
<div class="hidden areaType col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
</label>
<label class="radio-inline">
<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
</label>
</div>
<div for="areaType"></div>
<input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>
</div>
</div>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/multiple/basicInfo.jsp" %>
</div>
<div class="form-actions">

181
src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
View File

@@ -30,14 +30,24 @@
//reset
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
$(this).find("option:first").attr("selected",true);
if($(this).prop("name")!="mainTable"){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
$(this).find("option:first").attr("selected",true);
}
});
$(".Wdate").attr("value",'');
$("#keywords").attr("value",'');
$("#searchForm")[0].reset();
});
$("select[name='mainTable']").on("change",function(){
var val=$(this).val();
var type=$(this).find("option:selected").data("type");
$("#mainTableType").val(type);
var desc=$(this).find("option:selected").data("desc");
$("#mainTableDesc").val(desc);
return page();
});
});
//查询
function page(n,s){
@@ -47,6 +57,19 @@
$("#searchForm").submit();
return false;
}
var edit=function(url){
var cked = $('tbody tr td input.i-checks:checkbox:checked');
if(cked.val()==1){
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
}
if(cked.length==1){
window.location = url+"&compileId="+cked.attr("id");
}else{
top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
return;
}
}
</script>
</head>
<body>
@@ -54,8 +77,10 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<c:if test="${audit==0}">
<shiro:hasPermission name="cfg:multiple:add">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/multiple/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&mainTable=${mainTable}'"><spring:message code="add"></spring:message></button>
</shiro:hasPermission>
</c:if>
</div>
@@ -70,7 +95,6 @@
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/multiple/list" method="post" class="form-search">
<input id="mainTable" name="mainTable" type="hidden" value="${mainTable}"/>
<input id="mainTableType" name="mainTableType" type="hidden" value="${mainTableType}"/>
<input id="mainTableDesc" name="mainTableDesc" type="hidden" value="${mainTableDesc}"/>
<input id="cfgType" name="cfgType" type="hidden" value="${cfgType}"/>
@@ -82,7 +106,6 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
@@ -95,10 +118,22 @@
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select>
</div>
<div class="pull-left">
<form:select path="mainTable" class="selectpicker select2 input-small" >
<c:forEach items="${tableInfos}" var="tableInfo">
<form:option value="${tableInfo.tableName}" data-type="${tableInfo.tableType}" data-desc="${tableInfo.tableDesc}"><spring:message code="${tableInfo.tableDesc}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<c:if test="${mainTableType eq '1'}">
<form:option value="ipCfg.cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="ipCfg.srcIp"><spring:message code="client_ip"></spring:message></form:option>
<form:option value="ipCfg.dstIp"><spring:message code="server_ip"></spring:message></form:option>
</c:if>
<c:if test="${mainTableType eq '2'}">
<form:option value="stringCfg.cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="stringCfg.cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
@@ -118,28 +153,40 @@
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<c:if test="${audit==0}">
<shiro:hasPermission name="cfg:string:edit">
<button type="button" class="btn btn-default" onClick="edit('${ctx}/cfg/multiple/updateForm?serviceId=${serviceId}&action=${action}&mainTable=${mainTable}&cfgName=${cfgName}')">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
</shiro:hasPermission>
<shiro:hasPermission name="cfg:multiple:delete">
<sys:delRow url="${ctx}/cfg/multiple/delete?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&mainTable=${mainTable}" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
</c:if>
<c:if test="${audit==1}">
<shiro:hasPermission name="cfg:multiple:audit">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><sys:delRow url="${ctx}/cfg/multiple/audit?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&mainTable=${mainTable}&isAudit=1" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/cfg/multiple/audit?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&mainTable=${mainTable}&isAudit=2" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/cfg/multiple/audit?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&mainTable=${mainTable}&isAudit=3" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</shiro:hasPermission>
</c:if>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button> --%>
<%-- <div class="pull-left">
<c:set var="sortI18n"><spring:message code="sort"/></c:set>
<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
<option value="${mainTable}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
<option value="${mainTable}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
<option value="${mainTable}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
<option value="${mainTable}.edit_time desc" <c:if test="${fn:contains(page.orderBy , 'edit_time desc') }">selected</c:if> ><spring:message code="editTime_desc"/></option>
<option value="${mainTable}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
<option value="${mainTable}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
</select>
</div> --%>
</div>
<!-- 搜索内容与操作按钮栏 -->
@@ -262,9 +309,10 @@
</form:form>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<%--遍历主表属性 --%>
<c:choose>
@@ -303,23 +351,23 @@
</c:choose>
<%--遍历主表属性 --%>
<%--遍历子表属性 --%>
<c:forEach items="${cfg.otherTables}" var="other" varStatus="status">
<c:if test="${other.tableType eq '4'}">
<th><spring:message code="${other.tableDesc}"/><spring:message code="config_describe"/></th>
<c:forEach items="${tableInfos}" var="tableInfo" varStatus="status">
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '4'}">
<th><spring:message code="${tableInfo.tableDesc}"/><spring:message code="config_describe"/></th>
<th><spring:message code="match_area"/></th>
<th><spring:message code="key_word"/></th>
</c:if>
<c:if test="${other.tableType eq '3'}">
<th><spring:message code="${other.tableDesc}"/><spring:message code="config_describe"/></th>
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '3'}">
<th><spring:message code="${tableInfo.tableDesc}"/><spring:message code="config_describe"/></th>
<th><spring:message code="数值下界"/></th>
<th><spring:message code="数值上界"/></th>
</c:if>
<c:if test="${other.tableType eq'2'}">
<th><spring:message code="${other.tableDesc}"/><spring:message code="config_describe"/></th>
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq'2'}">
<th><spring:message code="${tableInfo.tableDesc}"/><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th>
</c:if>
<c:if test="${other.tableType eq '1'}">
<th><spring:message code="${other.tableDesc}"/><spring:message code="config_describe"/></th>
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '1'}">
<th><spring:message code="${tableInfo.tableDesc}"/><spring:message code="config_describe"/></th>
<th>ip<spring:message code="type"/></th>
<th><spring:message code="client_ip"/></th>
<th><spring:message code="client_address_mask"/></th>
@@ -348,12 +396,13 @@
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
<%-- <th><spring:message code="operation"></spring:message></th> --%>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="bean" varStatus="status" step="1">
<c:forEach items="${page.list}" var="bean" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${bean.compileId}" value="${bean.isAudit}"></td>
<%-- <td>${status.index+1 }</td> --%>
<%--遍历主表值 --%>
<c:choose>
@@ -399,57 +448,57 @@
</c:choose>
<%--遍历主表值 --%>
<%--遍历子表值 --%>
<c:forEach items="${cfg.otherTables}" var="other" varStatus="status">
<c:if test="${other.tableType eq '4'}">
<c:forEach items="${tableInfos}" var="tableInfo" varStatus="status">
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '4'}">
<c:choose>
<c:when test="${bean.complexCfg[other.tableName]!=null}">
<td>${bean.complexCfg[other.tableName].cfgDesc }</td>
<td>${bean.complexCfg[other.tableName].district }</td>
<td>${bean.complexCfg[other.tableName].keywords }</td>
<c:when test="${bean.complexCfg[tableInfo.tableName]!=null}">
<td>${bean.complexCfg[tableInfo.tableName].cfgDesc }</td>
<td>${bean.complexCfg[tableInfo.tableName].district }</td>
<td>${bean.complexCfg[tableInfo.tableName].keywords }</td>
</c:when>
<c:otherwise><td></td><td></td><td></td></c:otherwise>
</c:choose>
</c:if>
<c:if test="${other.tableType eq '3'}">
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '3'}">
<c:choose>
<c:when test="${bean.numCfg[other.tableName]!=null}">
<td>${bean.numCfg[other.tableName].cfgDesc }</td>
<td>${bean.numCfg[other.tableName].lowBounadry}</td>
<td>${bean.numCfg[other.tableName].upBounadry }</td>
<c:when test="${bean.numCfg[tableInfo.tableName]!=null}">
<td>${bean.numCfg[tableInfo.tableName].cfgDesc }</td>
<td>${bean.numCfg[tableInfo.tableName].lowBounadry}</td>
<td>${bean.numCfg[tableInfo.tableName].upBounadry }</td>
</c:when>
<c:otherwise><td></td><td></td><td></td></c:otherwise>
</c:choose>
</c:if>
<c:if test="${other.tableType eq '2'}">
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '2'}">
<c:choose>
<c:when test="${bean.stringCfg[other.tableName]!=null}">
<td>${bean.stringCfg[other.tableName].cfgDesc }</td>
<td>${bean.stringCfg[other.tableName].cfgKeywords }</td>
<c:when test="${bean.stringCfg[tableInfo.tableName]!=null}">
<td>${bean.stringCfg[tableInfo.tableName].cfgDesc }</td>
<td>${bean.stringCfg[tableInfo.tableName].cfgKeywords }</td>
</c:when>
<c:otherwise><td></td><td></td></c:otherwise>
</c:choose>
</c:if>
<c:if test="${other.tableType eq '1'}">
<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '1'}">
<c:choose>
<c:when test="${bean.ipCfg[other.tableName]!=null}">
<td>${bean.ipCfg[other.tableName].cfgDesc }</td>
<td>V${bean.ipCfg[other.tableName].ipType }</td>
<td>${bean.ipCfg[other.tableName].srcIp }</td>
<td>${bean.ipCfg[other.tableName].srcIpMask }</td>
<td>${bean.ipCfg[other.tableName].srcPort }</td>
<td>${bean.ipCfg[other.tableName].srcPortMask }</td>
<td>${bean.ipCfg[other.tableName].dstIp }</td>
<td>${bean.ipCfg[other.tableName].dstIpMask }</td>
<td>${bean.ipCfg[other.tableName].dstPort }</td>
<td>${bean.ipCfg[other.tableName].dstPortMask }</td>
<c:when test="${bean.ipCfg[tableInfo.tableName]!=null}">
<td>${bean.ipCfg[tableInfo.tableName].cfgDesc }</td>
<td>V${bean.ipCfg[tableInfo.tableName].ipType }</td>
<td>${bean.ipCfg[tableInfo.tableName].srcIp }</td>
<td>${bean.ipCfg[tableInfo.tableName].srcIpMask }</td>
<td>${bean.ipCfg[tableInfo.tableName].srcPort }</td>
<td>${bean.ipCfg[tableInfo.tableName].srcPortMask }</td>
<td>${bean.ipCfg[tableInfo.tableName].dstIp }</td>
<td>${bean.ipCfg[tableInfo.tableName].dstIpMask }</td>
<td>${bean.ipCfg[tableInfo.tableName].dstPort }</td>
<td>${bean.ipCfg[tableInfo.tableName].dstPortMask }</td>
<td>
<c:if test="${bean.ipCfg[other.tableName].direction==0}"><spring:message code="twoway"/></c:if>
<c:if test="${bean.ipCfg[other.tableName].direction==1}"><spring:message code="oneway"/></c:if>
<c:if test="${bean.ipCfg[tableInfo.tableName].direction==0}"><spring:message code="twoway"/></c:if>
<c:if test="${bean.ipCfg[tableInfo.tableName].direction==1}"><spring:message code="oneway"/></c:if>
</td>
<td>
<c:if test="${bean.ipCfg[other.tableName].protocol==6}"><spring:message code="TCP"/></c:if>
<c:if test="${bean.ipCfg[other.tableName].protocol==17}"><spring:message code="UDP"/></c:if>
<c:if test="${bean.ipCfg[other.tableName].protocol==0}"><spring:message code="arbitrary"/></c:if>
<c:if test="${bean.ipCfg[tableInfo.tableName].protocol==6}"><spring:message code="TCP"/></c:if>
<c:if test="${bean.ipCfg[tableInfo.tableName].protocol==17}"><spring:message code="UDP"/></c:if>
<c:if test="${bean.ipCfg[tableInfo.tableName].protocol==0}"><spring:message code="arbitrary"/></c:if>
</td>
</c:when>
<c:otherwise>
@@ -518,7 +567,7 @@
<td><fmt:formatDate value="${bean.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${bean.auditorName }</td>
<td><fmt:formatDate value="${bean.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>
<%-- <td>
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
@@ -546,7 +595,7 @@
</c:if>
</ul>
</div>
</td>
</td> --%>
</tr>
</c:forEach>
</tbody>

2
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -115,7 +115,7 @@
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<c:if test="${audit==0}">