gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化业务字典、系统字典、特定服务、协议ip校验处理方式，融合代码

Browse Source
This commit is contained in:
zhangshilin
2018-04-08 17:41:55 +08:00
parent b2ae24021a
commit fb19efed18
9 changed files with 108 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -72,7 +72,7 @@ label.errorShow {
}
});
return flagTypeSame;
},"请选择正确的数据类型");
},"<spring:message code='typeSame'/>");
//与下级是否一致
jQuery.validator.addMethod("childrenType",function(value,element){
var flagChildTypeSame=false;
@@ -87,7 +87,7 @@ label.errorShow {
}
});
return flagChildTypeSame;
},"该配置包含下级配置，数据类型更改后与子类不一致");
},"<spring:message code='typeChild'/>");
//校验叶子节点有下级不得更改为叶子节点
jQuery.validator.addMethod("leafChange",function(value,element){
@@ -102,54 +102,19 @@ label.errorShow {
}
});
return flagLeafChange;
},"该配置包含下级配置，不得改为叶子节点");
},"<spring:message code='leafChange'/>");
$("#name").focus();
validateForm=$("#inputForm").validate({
rules: {
'itemCode':{
required:true,
remote:'${ctx}/basics/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}',
maxlength:64
},
'itemValue':{
required:true,
maxlength:64
},
'itemType':{
childrenType:true,
//remote:'${ctx}/basics/serviceDictInfo/ajaxChildrenType?parent=${serviceDictInfo.serviceDictId}',
typeSame:true
},
'isLeaf':{
leafChange:true
},
'itemDesc':{
maxlength:128
}
},
messages: {
'itemCode':{
required:'<spring:message code="required"/>',
remote:'<spring:message code="repeat"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemValue':{
required:'<spring:message code="required"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemType':{
childrenType:'<spring:message code="typeChild"/>',
//remote:'<spring:message code="typeChild"/>',
typeSame:'<spring:message code="typeSame"/>'
},
'isLeaf':{
leafChange:'<spring:message code="leafChange"/>'
},
'itemDesc':{
maxlength:'<spring:message code="maxlength_128"/>'
}
}
},
submitHandler: function(form){
@@ -227,7 +192,7 @@ label.errorShow {
<div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4">
<select id="itemTypeCheckChild" name="itemType" class="form-control">
<select id="itemTypeCheckChild" name="itemType" class="form-control childrenType typeSame">
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}">
@@ -241,19 +206,19 @@ label.errorShow {
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="60" class="form-control"/>
<form:input path="itemCode" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
<form:input path="itemValue" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<form:select path="isLeaf" class="form-control">
<form:select path="isLeaf" class="form-control leafChange">
<c:forEach items="${fns:getDictList('INT_YES_NO')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
@@ -263,7 +228,7 @@ label.errorShow {
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
<form:textarea path="itemDesc" htmlEscape="false" maxlength="128" class="form-control"/>
</div>
</div>
<div class="form-actions">

50
src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -40,7 +40,7 @@
}
});
return flag;
},"请选择正确的数据类型");
},"<spring:message code='typeSame'/>");
//校验叶子节点,有下级不得更改为叶子节点
jQuery.validator.addMethod("leafChange",function(value,element){
@@ -55,52 +55,26 @@
}
});
return flag;
},"该配置包含下级配置，不得改为叶子节点");
},"<spring:message code='leafChange'/>");
$("#name").focus();
validateForm = $("#inputForm").validate({
rules: {
'itemCode':{
required:true,
remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}',
maxlength:64
},
'itemValue':{
required:true,
maxlength:64
remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}'
},
'itemType':{
remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}',
typeSame:true
},
'isLeaf':{
leafChange:true
},
'itemDesc':{
maxlength:128
remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}'
}
},
messages: {
'itemCode':{
required:'<spring:message code="required"/>',
remote:'<spring:message code="repeat"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemValue':{
required:'<spring:message code="required"/>',
maxlength:'<spring:message code="maxlength_64"/>'
remote:'<spring:message code="repeat"/>'
},
'itemType':{
remote:'<spring:message code="typeChild"/>',
typeSame:'<spring:message code="typeSame"/>'
},
'isLeaf':{
leafChange:'<spring:message code="leafChange"/>'
},
'itemDesc':{
maxlength:'<spring:message code="maxlength_128"/>'
}
remote:'<spring:message code="typeChild"/>'
}
},
@@ -176,7 +150,7 @@
<div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4">
<select id="itemType" name="itemType" class="form-control">
<select id="itemType" name="itemType" class="form-control typeSame">
<c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}">
@@ -190,13 +164,13 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
<form:input path="itemCode" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
<form:input path="itemValue" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
</div>
</div>
<c:if test="${specType != null and specType==3 }">
@@ -206,7 +180,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<form:select path="isLeaf" class="form-control">
<form:select path="isLeaf" class="form-control leafChange">
<c:forEach items="${fns:getDictList('INT_YES_NO')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
@@ -217,7 +191,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
<form:textarea path="itemDesc" htmlEscape="false" maxlength="128" class="form-control"/>
</div>
</div>
<div class="form-actions">

4
src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -44,7 +44,7 @@
if(isinit){
confirmx("<spring:message code='confirm_message'/>", url+"&mulitId="+mulitId);
}else{
top.$.jBox.tip("<spring:message code='has_initianlize'/>", "<spring:message code='info'/>");
top.$.jBox.tip("<spring:message code='initial_data_is_not_allowed_to_delete'/>", "<spring:message code='info'/>");
}
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
@@ -68,7 +68,7 @@
if(${fns:getUser().loginId=='admin'}){
confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
}else{
top.$.jBox.tip("<spring:message code='hasnopower_toedit_initianlize.'/>", "<spring:message code='info'/>");
top.$.jBox.tip("<spring:message code='initial_data_is_not_allowed_to_edit.'/>", "<spring:message code='info'/>");
}
}