Revert "Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev"

This reverts commit 097a44be, reversing
changes made to 06dac507.

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

@@ -309,8 +309,7 @@ import schema from 'async-validator';
                 <#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem>
                     <@getDeRule condItem />
                 </#list>
-                </#if>
-        ],
+                </#if>],
                 </#if>
             </#if>
         </#list>
@@ -330,17 +329,14 @@ import schema from 'async-validator';
             return falg;
         }
         rule[name].forEach((item:any) => {
-            // 常规规则
             if(item.type == 'SIMPLE' && this.data[this.service.getItemNameByDeName(item.deName)] != item.paramValue){
                 falg.isPast = false;
                 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;
                 falg.infoMessage = item.ruleInfo;
             }
-            // 长度
             if(item.type == 'STRINGLENGTH' ){
                 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)){
@@ -348,7 +344,6 @@ import schema from 'async-validator';
                     falg.infoMessage = item.ruleInfo;
                 }
             }
-            // 分组
             if(item.type == 'GROUP'){
                 falg = this.verifyDeRules('group',item)
             }