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

This commit is contained in:
duandongmei
2018-09-28 11:28:08 +08:00
103 changed files with 741 additions and 573 deletions

View File

@@ -6,6 +6,8 @@ $(function(){
});
</script>
<p class="border-top border-top-blue-sharp"></p>
<h3 class="form-section"><spring:message code="effect_range"/></h3>
<div class="row areaInfo">
<div class="col-md-6">
<div class="form-group">

View File

@@ -1,6 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%><h3 class="form-section"><spring:message code="basic_config"/></h3>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<p class="border-top border-top-blue-sharp"></p>
<h3 class="form-section"><spring:message code="basic_config"/></h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">

View File

@@ -8,6 +8,10 @@
border-color: #eed3d7;
color: #b94a48;
}
.alert{
margin-top: 20px;
margin-bottom: 0px;
}
</style>
<script type="text/javascript">top.$.jBox.closeTip();</script>
<c:if test="${not empty content}">

View File

@@ -218,8 +218,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -208,8 +208,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -270,9 +270,9 @@
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -294,9 +294,9 @@
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -153,9 +153,9 @@
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -240,8 +240,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -97,9 +97,9 @@ $(function(){
},
errorContainer: "#messageBox",
});
if('${_cfg.behavCode}'){
//if('${_cfg.behavCode}'){
ajaxBehaviour($("#specServiceIdId").val());
}
//}
$("#specServiceIdId").on("change",function(){
ajaxBehaviour($(this).val());
});
@@ -187,6 +187,9 @@ var delContent = function(contentClassName, addBtnClassName) {
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="exprType" name="exprType" value="0">
<input type="hidden" id="matchMethod" name="matchMethod" value="0">
<input type="hidden" id="isHexbin" name="isHexbin" value="0">
<div class="form-body">
<!-- desc and action -->

View File

@@ -135,7 +135,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -141,7 +141,7 @@
</c:if>
<c:if test="${region.regionType eq 2 }">
<c:forEach items="${region.strList}" var="cfg">
<div id="${region.regionValue}_${regionStatus.index}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region.regionValue}_${regionStatus.index}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -248,7 +248,7 @@
<c:if test="${region.regionType eq 3 }">
<c:forEach items="${region.complexList}" var="cfg">
<div id="${region.regionValue}_${regionStatus.index}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region.regionValue}_${regionStatus.index}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">

View File

@@ -330,8 +330,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -327,8 +327,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -276,8 +276,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<div class="table-responsive">
<sys:message content="${message}" />
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -330,8 +330,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -328,8 +328,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -285,8 +285,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<div class="table-responsive">
<sys:message content="${message}" />
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -117,7 +117,7 @@
</c:if>
<c:if test="${region[0] eq 2 }">
<c:if test="${region[1] eq _cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -222,7 +222,7 @@
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -107,7 +107,7 @@
if(data.subscribe.length > 0){
html+="<div id='subscribeInfo"+index+"' class='content content2'>";
$.each(data.subscribe,function(index,item){
console.log(item.cfgKeywords);
//console.log(item.cfgKeywords);
html+="<div class='row'>";
html+="<div class='col-md-8'>";
html+="<div class='form-group'>";
@@ -637,8 +637,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -651,8 +651,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -134,7 +134,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -94,10 +94,10 @@ $(function(){
$(".disabled").each(function(){
$(this).remove();
});
$("input[name$='exprType']").attr("disabled",false);
if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
$("input[name$='exprType']").val(1);
}
$("input[name='exprType']").attr("disabled",false);
//if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
// $("input[name='exprType']").val(1);
//}
if($("input[name='ratelimit']").is(":hidden")){
$("input[name='ratelimit']").val("");
}

View File

@@ -267,8 +267,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -282,8 +282,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -135,7 +135,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -85,9 +85,9 @@ $(function(){
},
errorContainer: "#messageBox",
});
if('${_cfg.behavCode}'){
//if('${_cfg.behavCode}'){
ajaxBehaviour($("#specServiceIdId").val());
}
//}
$("#specServiceIdId").on("change",function(){
ajaxBehaviour($(this).val());
});

View File

@@ -313,8 +313,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -36,7 +36,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -115,7 +115,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.stringList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -230,7 +230,7 @@
<!-- subscribe_id-->
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -338,7 +338,7 @@
<%-- <c:if test="${region[0] eq 5 }">
<c:forEach items="${_cfg.digestList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">

View File

@@ -125,7 +125,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.p2pHashList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -242,7 +242,7 @@
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -348,7 +348,7 @@
<c:forEach items="${_cfg.p2pKeywordList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -115,7 +115,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.interceptPktBinList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -221,7 +221,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpUrlList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -262,8 +262,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -115,7 +115,7 @@
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -116,7 +116,7 @@
<c:if test="${region[0] eq 3 }">
<c:forEach items="${_cfg.complexList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content3" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
@@ -231,7 +231,7 @@
<c:if test="${region[0] eq 5 }">
<c:forEach items="${_cfg.digestList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content5" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
@@ -278,7 +278,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -267,8 +267,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -318,7 +318,6 @@
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -115,7 +115,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcBgpAsCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -222,7 +222,7 @@
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -116,7 +116,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -223,7 +223,7 @@
<c:if test="${region[0] eq 3 }">
<c:forEach items="${_cfg.domainList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content3" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">

View File

@@ -151,7 +151,7 @@
</div>
</c:forEach>
<c:forEach items="${_cfg.httpUrlList}" var="cfg">
<div id="urlInfo${index}" class="content content2" name="subCfg${index}">
<div id="urlInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -254,7 +254,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpReqHdrList}" var="cfg">
<div id="reqHdrInfo${index}" class="content content2" name="subCfg${index}">
<div id="reqHdrInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -363,7 +363,7 @@
</div>
</c:forEach>
<c:forEach items="${_cfg.httpReqBodyList}" var="cfg">
<div id="reqBodyInfo${index}" class="content content2" name="subCfg${index}">
<div id="reqBodyInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -466,7 +466,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpResHdrList}" var="cfg">
<div id="resHdrInfo${index}" class="content content2" name="subCfg${index}">
<div id="resHdrInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -576,7 +576,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpResBodyList}" var="cfg">
<div id="resBodyInfo${index}" class="content content2" name="subCfg${index}">
<div id="resBodyInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -679,7 +679,7 @@
</c:forEach>
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<div id="subscribeIdInfo${index}" class="content content2" name="subCfg${index}">
<div id="subscribeIdInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -262,8 +262,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -263,8 +263,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -165,13 +165,9 @@
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -117,7 +117,7 @@
<c:if test="${region[0] eq 3 }">
<c:forEach items="${_cfg.domainList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content3" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
@@ -232,7 +232,7 @@
<c:if test="${region[0] eq 2 }">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -72,8 +72,8 @@
var flag = true;
//代表所有业务都隐藏了,提示必须增加一种业务数据
if(!$(".httpReqCfg").hasClass("hidden")){
console.log($(".httpReqCfg").find(".boxSolid").length);
console.log($(".httpReqCfg").find(".boxSolid.hidden").length);
//console.log($(".httpReqCfg").find(".boxSolid").length);
//console.log($(".httpReqCfg").find(".boxSolid.hidden").length);
if($(".httpReqCfg").find(".boxSolid").length==$(".httpReqCfg").find(".boxSolid.hidden").length){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;

View File

@@ -150,7 +150,7 @@
</div>
</c:forEach>
<c:forEach items="${_cfg.httpUrlList}" var="cfg">
<div id="urlInfo${index}" class="content content2" name="subCfg${index}">
<div id="urlInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -254,7 +254,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpReqHdrList}" var="cfg">
<div id="reqHdrInfo${index}" class="content content2" name="subCfg${index}">
<div id="reqHdrInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
@@ -363,7 +363,7 @@
</div>
</c:forEach>
<c:forEach items="${_cfg.httpReqBodyList}" var="cfg">
<div id="reqBodyInfo${index}" class="content content2" name="subCfg${index}">
<div id="reqBodyInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -466,7 +466,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpResHdrList}" var="cfg">
<div id="resHdrInfo${index}" class="content content2" name="subCfg${index}">
<div id="resHdrInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
@@ -577,7 +577,7 @@
</c:forEach>
<c:forEach items="${_cfg.httpResBodyList}" var="cfg">
<div id="resBodyInfo${index}" class="content content2" name="subCfg${index}">
<div id="resBodyInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -680,7 +680,7 @@
</c:forEach>
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<div id="subscribeIdInfo${index}" class="content content2" name="subCfg${index}">
<div id="subscribeIdInfo${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -35,14 +35,14 @@
//loading('onloading...');
var flag = true;
var subscribeId=0;
console.log("boxSolid:"+$(".boxSolid.hidden").length);
console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId"));
//console.log("boxSolid:"+$(".boxSolid.hidden").length);
//console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId"));
//存在隐藏的subscribeId不算进域配置
if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1;
}
console.log("boxSolid not sub:"+($(".boxSolid").length-1));
console.log("hidden not sub:"+($(".boxSolid.hidden").length-subscribeId));
//console.log("boxSolid not sub:"+($(".boxSolid").length-1));
//console.log("hidden not sub:"+($(".boxSolid.hidden").length-subscribeId));
//代表所有业务都隐藏了,提示必须增加一种业务数据
if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");

View File

@@ -115,7 +115,7 @@
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.sslList) >0)}">
<c:forEach items="${_cfg.sslList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -221,7 +221,7 @@
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -115,7 +115,7 @@
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.httpUrlList) >0)}">
<c:forEach items="${_cfg.httpUrlList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -167,7 +167,7 @@
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-10">
<div class="form-group">

View File

@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="${cfgName}"></spring:message></title>
<title><spring:message code="ip_whitelist"></spring:message></title>
<style type="text/css">
.boxSolid {
@@ -27,6 +27,8 @@
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
$("select[name$='protocol']").parents(".form-group").addClass("hidden");
$("select[name$='direction']").parents(".form-group").addClass("hidden");
$("#cfgFrom").validate(
{
errorPlacement : function(error, element) {
@@ -156,8 +158,8 @@
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="protocol" value="0">
<input type="hidden" name="direction" value="0">
<!-- <input type="hidden" name="protocol" value="0">
<input type="hidden" name="direction" value="0"> -->
<input type="hidden" name="doLog" value="0" >
<input type="hidden" name="isAreaEffective" value="0" >
<input type="hidden" id="serviceId" name="serviceId"
@@ -251,7 +253,7 @@
<c:forEach items="${_cfg.ipPortList}" var="ipPort">
<c:if test="${region.configRegionValue eq ipPort.cfgType }">
<div class="row boxSolid ${tabName}${status.index}">
<%@include file="/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp"%>
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
</div>
<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>
</c:if>
@@ -259,7 +261,7 @@
</c:when>
<c:otherwise>
<div class="row boxSolid ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp"%>
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
</div>
<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
</c:otherwise>

View File

@@ -115,7 +115,7 @@
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
<div class="form-group">

View File

@@ -173,9 +173,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -164,9 +164,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,8 +162,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -151,9 +151,9 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -170,8 +170,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -164,9 +164,9 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -169,8 +169,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,8 +162,9 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -150,9 +150,9 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -161,9 +161,9 @@
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,8 +162,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,9 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -159,9 +159,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -219,9 +219,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<div class="table-responsive">
<sys:message content="${message}" />
<table id="contentTable"
class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -161,9 +161,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -162,9 +162,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -164,9 +164,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -179,8 +179,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -161,9 +161,8 @@
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -164,9 +164,8 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -170,9 +170,8 @@
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -149,8 +149,8 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>

View File

@@ -310,14 +310,44 @@ function customColumnClick(){
setTimeout(function (){
var height=document.documentElement.clientHeight;
if($('.table-responsive')){
$('.table-responsive').css({'height':height-166+'px'});
$('.table-responsive').css({'height':height-186+'px'});
}
},510);
var reportBusinessType=$("#reportBusinessType").val()
var tableId="tagTable";
if(reportBusinessType=="label_report"){
tableId="tagTable";
}else if(reportBusinessType=="lwhh_report"){
tableId="lwhhTable";
}else if(reportBusinessType=="src_ip_report"){
tableId="contentTable1";
}else if(reportBusinessType=="attr_type_report"){
tableId="attrTypeTable";
}else if(reportBusinessType=="dest_ip_report"){
tableId="destIpTable";
}else if(reportBusinessType=="isp_report"){
tableId="entranceIdTable";
}
var tableCont = document.querySelector('.table-responsive');
function scrollHandle (e){
console.log(this);
var scrollTop = this.scrollTop;
$('th').css('transform','translateY(' + scrollTop + 'px)');
$('thead tr').css('z-index','2147482468');
$('thead tr').css('position','relative');
$('th').css('border','1px solid rgb(255, 255, 255)');
$('th').css('background-clip','padding-box');
}
tableCont.addEventListener('scroll',scrollHandle);
$('#'+tableId).attr("margin-top",'0px');
}
window.onresize=function (){
var height=document.documentElement.clientHeight;
if($('.table-responsive')){
$('.table-responsive').css({'height':height-166+'px'});
$('.table-responsive').css({'height':height-186+'px'});
}
}
</script>
@@ -513,5 +543,8 @@ function customColumnClick(){
</div>
</div>
</div>
<script type="text/javascript">
</script>
</body>
</html>

View File

@@ -276,9 +276,9 @@
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -372,9 +372,8 @@
<sys:message content="${message}"/>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -325,12 +325,18 @@ function filterActionInit() {
function tzheight(){
var hei=document.documentElement.clientHeight;
hei=hei-71;
hei=hei-91;
var rowheigth=0;
if($('.row')){
rowheigth=$('.row').height();
hei=hei-rowheigth;
}
if($("#messageBox")){
var messageH=$("#messageBox").height();
if(messageH > 0){
hei=hei-messageH-52;
}
}
if($('.table-responsive')){
$('.table-responsive').css({'height':hei+'px'});
}