系统值规则校验逻辑

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

@@ -329,14 +329,17 @@ 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)){
@@ -344,6 +347,12 @@ import schema from 'async-validator';
                     falg.infoMessage = item.ruleInfo;
                 }
             }
+            // 系统值规则
+            if(item.type === "SYSVALUERULE" && (item.isNotMode ? item.sysRule.RegExCode.test(this.data[name]) : !item.sysRule.RegExCode.test(this.data[name]))) {
+                falg.isPast = false;
+                falg.infoMessage = item.sysRule.ruleInfo;
+            }
+            // 分组
             if(item.type == 'GROUP'){
                 falg = this.verifyDeRules('group',item)
             }

@MACRO/LANG_FUN.ftl

@@ -67,7 +67,7 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       sysRule:{
                         ruleType:"<#if valRule.getRuleType?? && valRule.getRuleType()??>${valRule.getRuleType()}</#if>", 
                         ruleInfo:"<#if valRule.getRuleInfo?? && valRule.getRuleInfo()??>${valRule.getRuleInfo()}</#if>",
-                        RegExCode:"<#if valRule.getRegExCode?? && valRule.getRegExCode()??>${valRule.getRegExCode()}</#if>",
+                        RegExCode:/<#if valRule.getRegExCode?? && valRule.getRegExCode()??>${valRule.getRegExCode()}</#if>/,
                       },
                       </#if>
                       <#if condItem.getCondType?? && condItem.getCondType()?? && condItem.getCondType() == 'GROUP'>
@@ -79,6 +79,5 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                         </#if>
                         ]
                       </#if>
-                      
                   },
 </#macro>
\ No newline at end of file