1、关键字字段特殊字符不转译;2、关键字字段内容可输入多个关键字,根据输入关键字个数,自动判断触发是否表达式是否选中。

This commit is contained in:
zhangwei
2018-06-01 16:55:49 +08:00
parent d718d4b722
commit ce6387219b
9 changed files with 477 additions and 51 deletions

View File

@@ -28,7 +28,7 @@
<link href="${pageContext.request.contextPath}/static/layouts/layout/css/custom.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/css/page.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/css/jquery.tagsinput.css" rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>
@@ -86,3 +86,5 @@
</c:otherwise>
</c:choose>
<script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>

View File

@@ -54,7 +54,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="keywords" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
<input class="form-control required tags" type="text" id="tags_${tabName}"
name="${cfgName}.cfgKeywords"
value="${complexCfg.cfgKeywords}">
</div>

View File

@@ -31,7 +31,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="keywords" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
<input class="form-control required tags" type="text" id="tags_${tabName}"
name="${cfgName}.cfgKeywords"
value="${strCfg.cfgKeywords}">
</div>

View File

@@ -64,7 +64,7 @@
$(".disabled").each(function(){
$(this).remove();
});
$("input[name$='exprType']").attr("disabled",false);
form.submit();
},
errorContainer : "#messageBox",
@@ -179,33 +179,7 @@
</div>
</div>
</div>
<!--ip info-->
<div class="httpReqCfg">
<c:set var="tabName" value="httpIpTab"></c:set>
<h4 class="form-section" >
<spring:message code="http_ip_title" />
<small> <span
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:forEach items="${_cfg.ipPortList}" var="ipPort"
varStatus="status">
<c:set var="cfgName" value="ipPortList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index}" >
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/ipCfgForm.jsp" flush="true">
<jsp:param value="ipCfg" name="cfgName"/>
<jsp:param value="ipCfg${status.index }" name="cfgNameIndex"/>
<jsp:param value="ipPortList[${status.index }]" name="propertiesName"/>
</jsp:include> --%>
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
</div>
<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>
</c:forEach>
</div>
<!--/ip info-->
<!--url info-->
<div class="httpReqCfg">
<c:set var="tabName" value="httpUrlTab"></c:set>
@@ -339,6 +313,33 @@
</div>
</c:forEach>
</div>
<!--ip info-->
<div class="httpReqCfg">
<c:set var="tabName" value="httpIpTab"></c:set>
<h4 class="form-section" >
<spring:message code="http_ip_title" />
<small> <span
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:forEach items="${_cfg.ipPortList}" var="ipPort"
varStatus="status">
<c:set var="cfgName" value="ipPortList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index}" >
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/ipCfgForm.jsp" flush="true">
<jsp:param value="ipCfg" name="cfgName"/>
<jsp:param value="ipCfg${status.index }" name="cfgNameIndex"/>
<jsp:param value="ipPortList[${status.index }]" name="propertiesName"/>
</jsp:include> --%>
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
</div>
<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>
</c:forEach>
</div>
<!--/ip info-->
<br>
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<br>

View File

@@ -22,22 +22,6 @@
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
$(".httpResCfg").addClass("hidden").addClass("disabled");
$(".httpReqCfg").removeClass("hidden").removeClass(
"disabled");
$("li").on("click", function() {
var region = ($(this).find("a").attr("for"));
if(region=="httpReqCfg"){
$(".httpResCfg").addClass("hidden").addClass("disabled");
$(".httpReqCfg").removeClass("hidden").removeClass(
"disabled");
}else{
$(".httpReqCfg").addClass("hidden").addClass("disabled");
$(".httpResCfg").removeClass("hidden").removeClass(
"disabled");
}
});
$("#cfgFrom").validate(
{
errorPlacement : function(error, element) {
@@ -64,7 +48,7 @@
$(".disabled").each(function(){
$(this).remove();
});
$("input[name$='exprType']").attr("disabled",false);
form.submit();
},
errorContainer : "#messageBox",
@@ -186,7 +170,7 @@
</c:forEach>
</c:when>
<c:otherwise>
<div class="row boxSolid ${tabName}${status.index}">
<div class="row boxSolid ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
</div>
<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
@@ -219,14 +203,14 @@
</c:choose>
</c:forEach>
<c:if test="${!isBreak}">
<div class="row boxSolid ${tabName}${status.index}">
<div class="row boxSolid ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
</div>
<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
</c:if>
</c:when>
<c:otherwise>
<div class="row boxSolid ${tabName}${status.index}">
<div class="row boxSolid ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
</div>
<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>