修复表单值规则

@CONTROL/表单/CONTROL-BASE.vue.ftl

@@ -424,9 +424,9 @@ import { Environment } from '@/environments/environment';
         let startOp = (val:boolean)=>{
             if(falg.isPast){
                 if(opValue){
-                    falg.isPast = falg && val;
+                    falg.isPast = falg.isPast && val;
                 }else{
-                    falg.isPast = falg || val;
+                    falg.isPast = falg.isPast || val;
                 }
             }else{
                 falg.isPast = val;
@@ -436,7 +436,7 @@ import { Environment } from '@/environments/environment';
             let item:any = rule[name][i];
             let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
             item.ruleInfo = item.ruleInfo ? item.ruleInfo : this.$t('app.formpage.valuecheckex');
-            if(dataValue === null || dataValue === undefined || dataValue === ""){
+            if((dataValue === null || dataValue === undefined || dataValue === "") && (item.type != 'GROUP')){
                 startOp(true);
                 return falg;
             }
@@ -472,7 +472,7 @@ import { Environment } from '@/environments/environment';
             }
             // 分组
             if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item)
+                falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND");
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }