提交 1a2abba3 编写于 作者: KK's avatar KK

Revert "格式"

This reverts commit e0d32255.
上级 e0d32255
...@@ -305,14 +305,14 @@ import schema from 'async-validator'; ...@@ -305,14 +305,14 @@ import schema from 'async-validator';
<#assign deRule = fideValueRule.getPSDEFValueRule()/> <#assign deRule = fideValueRule.getPSDEFValueRule()/>
<#if fideValueRule.getPSDEFormItemName?? && fideValueRule.getPSDEFormItemName()??> <#if fideValueRule.getPSDEFormItemName?? && fideValueRule.getPSDEFormItemName()??>
${fideValueRule.getPSDEFormItemName()}:{ ${fideValueRule.getPSDEFormItemName()}:{
ruleInfo:"<#if deRule.getRuleInfo?? && deRule.getRuleInfo()??>${deRule.getRuleInfo()}</#if>", ruleInfo:"<#if deRule.getRuleInfo?? && deRule.getRuleInfo()??>${deRule.getRuleInfo()}</#if>"
condition:[ condition:[
<#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??> <#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
<#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem> <#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem>
<@getDeRule condItem /> <@getDeRule condItem />
</#list> </#list>
</#if> </#if>
]}, ]}
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -332,17 +332,14 @@ import schema from 'async-validator'; ...@@ -332,17 +332,14 @@ import schema from 'async-validator';
return falg; return falg;
} }
rule[name].forEach((item:any) => { rule[name].forEach((item:any) => {
//常规规则
if(item.type == 'SIMPLE' && this.data[this.service.getItemNameByDeName(item.deName)] != item.paramValue){ if(item.type == 'SIMPLE' && this.data[this.service.getItemNameByDeName(item.deName)] != item.paramValue){
falg.isPast = false; falg.isPast = false;
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
} }
//正则式
if(item.type == 'REGEX' && (item.isNotMode? item.RegExCode.test(this.data[name]) : !item.RegExCode.test(this.data[name]))){ if(item.type == 'REGEX' && (item.isNotMode? item.RegExCode.test(this.data[name]) : !item.RegExCode.test(this.data[name]))){
falg.isPast = false; falg.isPast = false;
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
} }
//字符长度
if(item.type == 'STRINGLENGTH' ){ if(item.type == 'STRINGLENGTH' ){
let valueLength :number = this.data[name]?this.data[name].length:0; let valueLength :number = this.data[name]?this.data[name].length:0;
if(item.isNotMode? valueLength > item.minValue && valueLength < item.maxValue : !(valueLength > item.minValue && valueLength < item.maxValue)){ if(item.isNotMode? valueLength > item.minValue && valueLength < item.maxValue : !(valueLength > item.minValue && valueLength < item.maxValue)){
...@@ -350,7 +347,6 @@ import schema from 'async-validator'; ...@@ -350,7 +347,6 @@ import schema from 'async-validator';
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
} }
} }
//规则组
if(item.type == 'GROUP'){ if(item.type == 'GROUP'){
falg = this.verifyDeRules('group',item) falg = this.verifyDeRules('group',item)
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册