提交 92f12d80 编写于 作者: tony001's avatar tony001

修复表格行编辑值规则异常

上级 19d639ee
...@@ -2424,16 +2424,16 @@ ${gridColumn.getName()} ...@@ -2424,16 +2424,16 @@ ${gridColumn.getName()}
let startOp = (val:boolean)=>{ let startOp = (val:boolean)=>{
if(falg.isPast){ if(falg.isPast){
if(opValue){ if(opValue){
falg.isPast = falg && val; falg.isPast = falg.isPast && val;
}else{ }else{
falg.isPast = falg || val; falg.isPast = falg.isPast || val;
} }
}else{ }else{
falg.isPast = val; falg.isPast = val;
} }
} }
rule[name].forEach((item:any) => { rule[name].forEach((item:any) => {
if(value === null || value === undefined || value === ""){ if((value === null || value === undefined || value === "") && (item.type != 'GROUP')){
startOp(true); startOp(true);
return falg; return falg;
} }
...@@ -2459,7 +2459,7 @@ ${gridColumn.getName()} ...@@ -2459,7 +2459,7 @@ ${gridColumn.getName()}
} }
// 分组 // 分组
if(item.type == 'GROUP'){ if(item.type == 'GROUP'){
falg = this.verifyDeRules('group',item,"AND",value) falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND",value)
if(item.isNotMode){ if(item.isNotMode){
falg.isPast = !falg.isPast; falg.isPast = !falg.isPast;
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册