update

@CONTROL/表单/CONTROL.ts.ftl

@@ -84,8 +84,8 @@ export class ${srfclassname('${ctrl.name}')} implements OnInit {
     public rules: any = {
         <#list ctrl.getAllPSDEFormDetails() as formdetail>
         <#if formdetail.getDetailType?? && formdetail.getDetailType() == 'FORMITEM'>
-        ${formdetail.getName()}: [
-            { 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>类型' },
+        ${formdetail.getName()}: [<#content>
+            { 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>类型' },</#content>
             { 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()} 值不能为空' },
             <#if ctrl.getPSDEFormItemVRs()??>
             <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
@@ -93,7 +93,7 @@ export class ${srfclassname('${ctrl.name}')} implements OnInit {
               <#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 valueRule.getRegExCode?? && valueRule.getRegExCode()??>pattern: /^${valueRule.getRegExCode()}$/</#if><#if valueRule.getRuleInfo?? &&  valueRule.getRuleInfo()??>, message: '${valueRule.getRuleInfo()}'</#if>, trigger: 'change' }
                 </#if>
               </#if>
             </#if>            
@@ -178,18 +178,22 @@ export class ${srfclassname('${ctrl.name}')} implements OnInit {
 		if (!name) {
 			return;
 		}
-		const rule: any = this.rules[name];
+		const rule: any[] = this.rules[name];
 		let message = '';
-		let status = '';
-		if (!this.data[name] && rule[1].required) {
-			message = rule[1].message;
-			status = 'error';
-		} else if (this.data[name]) {
-			if ((Object.is(rule[0], 'number') && !(typeof this.data[name] === 'number')) || (Object.is(rule[0], 'string') && !(typeof this.data[name] === 'string'))) {
-				message = rule[0].message;
-				status = 'error';
-			}
-		}
+        let status = '';
+        const val: any = this.data[name];
+        rule.every((rule: any) => {
+            if (rule.required && (!val || Object.is(val, '')) ) {
+                message = rule.message;
+                status = 'error';
+                return false;
+            } else if (val && rule.pattern && !rule.pattern.test(val)) {
+                message = rule.message;
+                status = 'error';
+                return false;
+            }
+            return true;
+        });
 		this.detailsModel[name].error = message;
 		this.detailsModel[name].validateStatus = status;
 	}