update

@CONTROL/表单/CONTROL.tsx.ftl

@@ -118,23 +118,6 @@ export default class ${srfclassname(ctrl.codeName)} extends PureComponent<${srfc
 
     }
 
-    /**
-    *   表单值规则
-    *
-    */
-    formRules:{
-    <#if ctrl.getPSDEFormItemVRs()??>
-        <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
-        <#if fideValueRule.getPSSysValueRule()??>
-        "${fideValueRule.getPSDEFormItemName()}":{
-            <#assign  valueRule = fideValueRule.getPSSysValueRule()/>
-            <#if valueRule.getRegExCode?? && valueRule.getRegExCode()>'getRegExCode':${valueRule.getRegExCode()},</#if><#if valueRule.getRuleType?? && valueRule.getRuleType()??>'getRuleType()':${valueRule.getRuleType()},</#if><#if valueRule.getRuleInfo?? &&  valueRule.getRuleInfo()??>'getRuleInfo()':${valueRule.getRuleInfo()},</#if><#if valueRule.getTypeDetail?? && valueRule.getTypeDetail()??>'getTypeDetail()':${valueRule.getTypeDetail()}</#if>
-            }
-        </#if>
-        </#list>
-    </#if>
-    },
-
     /**
      * 属性值规则
      *
@@ -148,6 +131,18 @@ export default class ${srfclassname(ctrl.codeName)} extends PureComponent<${srfc
             { type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double'>number<#else>string</#if>', message: '${formdetail.getCaption()} 值必须为<#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double'>数值<#else>字符串</#if>类型', trigger: 'change' },
             { required: <#if formdetail.isAllowEmpty()>false<#else>true</#if>, type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double'>number<#else>string</#if>', message: '${formdetail.getCaption()} 值不能为空', trigger: 'change' },
             { required: <#if formdetail.isAllowEmpty()>false<#else>true</#if>, type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double'>number<#else>string</#if>', message: '${formdetail.getCaption()} 值不能为空', trigger: 'blur' },
+            <#if ctrl.getPSDEFormItemVRs()??>
+            <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
+            <#if fideValueRule.getPSDEFormItemName() == formdetail.getName()>
+              <#if fideValueRule.getPSSysValueRule()??>
+                <#assign  valueRule = fideValueRule.getPSSysValueRule()/>
+                <#if valueRule.getRuleType?? && valueRule.getRuleType()?? && valueRule.getRuleType() == "REG">
+            { <#if valueRule.getRegExCode?? && valueRule.getRegExCode()??>pattern: /^${valueRule.getRegExCode()}$/</#if><#if valueRule.getRuleInfo?? &&  valueRule.getRuleInfo()??>, message: '${valueRule.getRuleInfo()}'</#if>, trigger: 'change' },
+                </#if>
+              </#if>
+            </#if>            
+            </#list>
+            </#if>
         ],
         </#if>
         </#list>