更新值规则逻辑

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

@@ -329,19 +329,27 @@ import schema from 'async-validator';
             return falg;
         }
         rule[name].forEach((item:any) => {
+            if(!falg.isPast){
+                return falg;
+            }
             // 常规规则
             if(item.type == 'SIMPLE'){
                 falg.isPast = this.$verify.checkFieldSimpleRule(this.data[this.service.getItemNameByDeName(item.deName)],item.condOP,item.paramValue,item.ruleInfo,item.paramType,{},item.isKeyCond);
                 falg.infoMessage = item.ruleInfo;
             }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                falg.isPast = !this.$verify.checkFieldValueRangeRule(this.data[this.service.getItemNameByDeName(item.deName)],item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond);
+                falg.infoMessage = item.ruleInfo;
+            }
             // 正则式
-            if(item.type == 'REGEX' && (item.isNotMode? item.RegExCode.test(this.data[name]) : !item.RegExCode.test(this.data[name]))){
-                falg.isPast = false;
+            if (item.type == "REGEX") {
+                falg.isPast = !this.$verify.checkFieldRegExRule(this.data[this.service.getItemNameByDeName(item.deName)],item.RegExCode,item.ruleInfo,item.isKeyCond);
                 falg.infoMessage = item.ruleInfo;
             }
             // 长度
             if (item.type == "STRINGLENGTH") {
-                falg.isPast = !this.$verify.checkFieldStringLengthRule(this.data[this.service.getItemNameByDeName(item.deName)],item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeManValue,item.ruleInfo,item.isKeyCond);
+                falg.isPast = !this.$verify.checkFieldStringLengthRule(this.data[this.service.getItemNameByDeName(item.deName)],item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond);
                 falg.infoMessage = item.ruleInfo;
             }
             // 系统值规则