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:
zhanghongqing
2018-07-24 10:59:14 +08:00
parent 95d780f1de 56e7dd6751
commit dd7a478d88
12 changed files with 83 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
View File

@@ -41,6 +41,9 @@
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:byte:config">
<button type="button" class="btn btn-primary"
@@ -87,7 +90,7 @@
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">

5
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
View File

@@ -41,6 +41,9 @@
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:domain:config">
<button type="button" class="btn btn-primary"
@@ -87,7 +90,7 @@
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">

5
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
View File

@@ -41,6 +41,9 @@
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:http:config">
<button type="button" class="btn btn-primary"
@@ -87,7 +90,7 @@
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">

5
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
View File

@@ -44,6 +44,9 @@
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:ip:config">
<button type="button" class="btn btn-primary"
@@ -90,7 +93,7 @@
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">

14
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -57,7 +57,7 @@ $(function(){
},
errorContainer: "#messageBox",
});
if('${_cfg.userRegion1}'){
if('${_cfg.behavCode}'){
ajaxBehaviour($("#specServiceIdId").val());
}
$("#specServiceIdId").on("change",function(){
@@ -75,11 +75,11 @@ var ajaxBehaviour=function(val){
success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){
if(data.length>0){
var html='<select name="userRegion1" data-live-search="true" class="selectpicker form-control">'
var html='<select name="behavCode" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option>';
for(i=0;i<data.length;i++){
html+='<option value="'+data[i].code+'"';
if('${_cfg.userRegion1}'==data[i].code){
if('${_cfg.behavCode}'==data[i].code){
html+=" selected";
}
html+='>'+data[i].name+'</option>';
@@ -87,8 +87,8 @@ var ajaxBehaviour=function(val){
html+='</select>';
$("#behaviour").prev("label").removeClass("hidden");
$("#behaviour").html(html);
$("[name='userRegion1']").selectpicker("refresh");
$("[name='userRegion1']").selectpicker("render");
$("[name='behavCode']").selectpicker("refresh");
$("[name='behavCode']").selectpicker("render");
}else{
if($("#behaviour").prev("label").is(":visible")){
$("#behaviour").prev("label").addClass("hidden");
@@ -150,9 +150,9 @@ var delContent = function(contentClassName, addBtnClassName) {
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<%-- <input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}"> --%>
<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
<%-- <input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}"> --%>
<input type="hidden" id="exprType" name="exprType" value="0">
<input type="hidden" id="matchMethod" name="matchMethod" value="3">
<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 -->

7
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -84,6 +84,9 @@
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:policy:config">
<button type="button" class="btn btn-primary"
@@ -130,7 +133,7 @@
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">
@@ -338,7 +341,7 @@
</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.appName }</td>
<td>${cfg.userRegion1 }</td>
<td>${cfg.behavName }</td>
<td>${cfg.ratelimit }</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">