(1)Obj-list-group sub页面增加定时任务展示
(2)修复form表单当默认monitor动作时Intercept无法展示的bug (3)调整拦截动作下发userregion
This commit is contained in:
wangxin
@@ -850,9 +850,9 @@ public class ConfigConvertUtil {
|
||||
//ssl_ver
|
||||
map=new HashMap<>();
|
||||
map.put("mirror_client", 0);
|
||||
map.put("allow_http2", 0);
|
||||
map.put("min", "ssl3");
|
||||
map.put("max", "tls13");
|
||||
map.put("allow_http2", 1);
|
||||
map.put("min", "SSLv3");
|
||||
map.put("max", "TLSv1.3");
|
||||
userRegionMap.put("ssl_ver", map);
|
||||
//decrypt_mirror
|
||||
map=new HashMap<>();
|
||||
|
||||
@@ -602,4 +602,13 @@ public class ObjectGroupController extends BaseController {
|
||||
logger.warn("配置批量生效/失效耗时："+(end-start));
|
||||
return tip.toString();
|
||||
}
|
||||
@RequestMapping(value = { "ajaxSubList"})
|
||||
public String ajaxSubList(Model model, Long cfgId, Integer index, Integer compileId) {
|
||||
CfgIndexInfo cfg = objectGroupService.getObjectGroupCfg(cfgId, null);
|
||||
List<String[]> tabList = new ArrayList();
|
||||
model.addAttribute("_cfg", cfg);
|
||||
model.addAttribute("index", index);
|
||||
model.addAttribute("tabList", tabList);
|
||||
return "/cfg/objgroup/subList";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
</style>
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
if('${_cfg.action}'!=1){
|
||||
if('${_cfg.action}'!=1 && '${_cfg.action}'!=""){
|
||||
$("[name='userRegion1'] option[value=intercept]").addClass("hidden").addClass("disabled");
|
||||
$(".domainGroup").addClass("hidden").addClass("disabled");
|
||||
//处理do_log
|
||||
|
||||
@@ -124,6 +124,45 @@
|
||||
}
|
||||
|
||||
}
|
||||
//异步获取相关信息
|
||||
$("span[id^=open]").click(function(){
|
||||
var openId=$(this).attr("id");
|
||||
var closeId=$(this).attr("id").replace("open","close");
|
||||
var index=$(this).attr("id").replace("open","");
|
||||
$("#"+openId).hide();
|
||||
$("#"+closeId).show();
|
||||
//var compileId=$(this).attr("compileId");
|
||||
var cfgId=$(this).attr("cfgId");
|
||||
if($("#"+openId).parent().parent().next("tr").hasClass("child")){
|
||||
$("#"+openId).parent().parent().next("tr").show();
|
||||
}else{
|
||||
$.ajax({
|
||||
type:'post',
|
||||
async:false,
|
||||
url:'${ctx}/objgroup/ajaxSubList',
|
||||
data:{"cfgId":cfgId,"index":index},
|
||||
dataType:"html",
|
||||
success:function(data){
|
||||
//console.log(data);
|
||||
var subTab="<tr class='child'>"+
|
||||
"<td style='border-right: 1px solid #FFFFFF;'>"+
|
||||
"<input type='checkbox' hidden='hidden'/>"+
|
||||
"</td>"+
|
||||
"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"' class='commonGroup'>";
|
||||
var html="";
|
||||
html+="<div class='row'>";
|
||||
html = html+data;
|
||||
subTab=subTab+html;
|
||||
subTab+="</td>";
|
||||
subTab+="</tr>";
|
||||
//console.log(subTab);
|
||||
$("#"+openId).parent().parent().after(subTab);
|
||||
//$("div[name='scheduleTitle"+index+"']").get(0).click();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -431,7 +470,7 @@
|
||||
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
|
||||
<tr>
|
||||
<td>
|
||||
<%--<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>--%>
|
||||
<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
|
||||
<input type="checkbox" class="i-checks child-checks" id="${cfg.cfgId}" value="${cfg.isAudit}">
|
||||
</td>
|
||||
<td>${cfg.compileId }</td>
|
||||
|
||||
42
src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp
Normal file
42
src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp
Normal file
@@ -0,0 +1,42 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<html>
|
||||
<head>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
//$("div[name='tabTitle"+index+"']").get(0).click();
|
||||
})
|
||||
</script>
|
||||
<style type="text/css">
|
||||
</style>
|
||||
</head>
|
||||
<c:if test="${fn:length(tabList)==0 and empty _cfg.schedule}">
|
||||
<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
|
||||
class="col-md-1 tabInfo" name="tabTitle${index }">
|
||||
<spring:message code='schedule' />
|
||||
<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div id="scheduleTitle${index}" class="content" name="subCfg${index}">
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<div class="form-group">
|
||||
<spring:message code='no_data' />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<!-- 显示 定时任务信息 -->
|
||||
<c:if test="${not empty _cfg.schedule }">
|
||||
<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
|
||||
class="col-md-1 tabInfo" name="tabTitle${index }">
|
||||
<spring:message code='schedule' />
|
||||
<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div id="scheduleInfo${index}" class="content" name="subCfg${index}">
|
||||
<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
|
||||
</div>
|
||||
</c:if>
|
||||
</html>
|
||||
@@ -61,7 +61,7 @@ $(function(){
|
||||
$("form input[class~='domainCheck']").attr("maxlength","1024");
|
||||
$("form input[class~='domainCheck']").attr("minlength","4");
|
||||
//截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb
|
||||
$("#contentTable").find("td").not(":has(a)").not(".SysException").each(function(i,element){
|
||||
$("#contentTable").find("td").not(":has(a)").not(".SysException,.commonGroup").each(function(i,element){
|
||||
//获取td当前对象的文本,如果长度大于25;
|
||||
if(!$(element).find(".tooltips").length>0){
|
||||
var tdclass= $(this).attr("class");//no_substr 不进行截取
|
||||
|
||||
Reference in New Issue
Block a user