Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts: src/main/resources/sql/function_region_dict_add_colunm.sql 所有配置界面修改为使用region表动态属性值
This commit is contained in:
duandongmei
@@ -5,21 +5,21 @@
|
||||
<title><spring:message code="${cfgName}"></spring:message></title>
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
if ($("input[name='action']:checked").val() == 0x20
|
||||
/* if ($("input[name='action']:checked").val() == 0x20
|
||||
|| $("input[name='action']:checked").val() == 0x60) {
|
||||
$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());
|
||||
$("#cfgType").val($("#cfgTypeCallback").val());
|
||||
} else {
|
||||
$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
|
||||
$("#cfgType").val($("#cfgTypeMaat").val());
|
||||
}
|
||||
} */
|
||||
$("#cancel").on("click", function() {
|
||||
window.history.back();
|
||||
});
|
||||
$(".action").on("change", function() {
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
$("#protocolId").val($(this).attr("protocolId"));
|
||||
if ($(this).val() == 0x20 || $(this).val() == 0x60) {
|
||||
/* if ($(this).val() == 0x20 || $(this).val() == 0x60) {
|
||||
$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());
|
||||
$("#cfgType").val($("#cfgTypeCallback").val());
|
||||
$("input[name='isAreaEffective']").each(function() {
|
||||
@@ -30,7 +30,7 @@
|
||||
} else {
|
||||
$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
|
||||
$("#cfgType").val($("#cfgTypeMaat").val());
|
||||
}
|
||||
} */
|
||||
|
||||
});
|
||||
if ('${fn:length(serviceList)}' > 1) {
|
||||
@@ -96,15 +96,6 @@
|
||||
<input type="hidden" id="serviceId" name="serviceId"
|
||||
value="${_cfg.serviceId}">
|
||||
</c:if>
|
||||
<!-- 配置域类型 -->
|
||||
<c:forEach items="${regionList}" var="region">
|
||||
<c:if test="${_cfg.functionId eq region.functionId}">
|
||||
<input type="hidden" name="cfgType"
|
||||
value="${region.configRegionValue}">
|
||||
<input type="hidden" name="cfgRegionCode"
|
||||
value="${region.configRegionCode}">
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<div class="form-body">
|
||||
<h3 class="form-section">
|
||||
<spring:message code="block_config" />
|
||||
@@ -150,127 +141,24 @@
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<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="domain_name"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required domainCheck" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
||||
</div>
|
||||
<div for="cfgKeywords"></div>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
|
||||
<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>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline hidden">
|
||||
<input type="radio" name="exprType" value="1" class="required"
|
||||
<c:if test="${_cfg.exprType==1}">checked</c:if>
|
||||
><spring:message code="and_expression"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="0" class="required"
|
||||
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
|
||||
><spring:message code="null_expression"/>
|
||||
</label>
|
||||
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit }">
|
||||
</div>
|
||||
<div for="exprType"></div>
|
||||
<div for="ratelimit"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<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="match_method"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="matchMethod" class="selectpicker select2 form-control required" >
|
||||
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
|
||||
<c:if test="${matchMethodC.itemCode eq 1}">
|
||||
<option value="${matchMethodC.itemCode}" selected >
|
||||
<spring:message code="${matchMethodC.itemValue}"/>
|
||||
</option>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
<div for="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="is_hex"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isHex" value="1" class="required"
|
||||
<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
|
||||
><spring:message code="hex"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isHex" value="0" class="required"
|
||||
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
|
||||
><spring:message code="not_hex"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="isHex"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<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="is_case_insenstive"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isCaseSenstive" value="1" class="required"
|
||||
<c:if test="${_cfg.isHexbin==1}">checked</c:if>
|
||||
><spring:message code="case_senstive"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isCaseSenstive" value="0" class="required"
|
||||
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
|
||||
><spring:message code="case_insenstive"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="isCaseInsenstive"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row hidden">
|
||||
|
||||
<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">
|
||||
<select name="isHexbin" class="selectpicker select2 form-control required" >
|
||||
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
|
||||
<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
<div for="isHexbin"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
|
||||
<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="ratelimit"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit">
|
||||
</div>
|
||||
<div for="ratelimit"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
<c:forEach items="${regionList}" var="region">
|
||||
<c:if test="${_cfg.functionId eq region.functionId}">
|
||||
<%@include file="/WEB-INF/include/form/complexInfo.jsp" %>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
|
||||
<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user