属性值规则

@CONTROL/@MACRO/SERVICE/FORM.ts.ftl

@@ -58,6 +58,27 @@
         }
     }
 
+    /**
+     * 通过属性名称获取表单项名称
+     * 
+     * @param name 实体属性名称 
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    public getItemNameByDeName(name:string) :string{
+        let itemName = name;
+        let mode: any = this.getMode();
+        if (!mode && mode.getDataItems instanceof Function) {
+            return name;
+        }
+        let formItemItems: any[] = mode.getDataItems();
+        formItemItems.forEach((item:any)=>{
+            if(item.prop === name){
+                itemName = item.name;
+            }
+        });
+        return itemName.trim();
+    }
+
 <#ibizinclude>
 ./SERVICE_BOTTOM.ts.ftl
 </#ibizinclude>
\ No newline at end of file

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

@@ -300,42 +300,42 @@ import {  Util } from '@/ibiz-core/utils';
                 falg.isPast = val;
             }
         }
-        // rule[name].forEach((item:any) => {
-        //     let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
-        //     // 常规规则
-        //     if(item.type == 'SIMPLE'){
-        //         startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,{},item.isKeyCond));
-        //         falg.infoMessage = item.ruleInfo;
-        //     }
-        //     // 数值范围
-        //     if(item.type == 'VALUERANGE2'){
-        //         startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
-        //         falg.infoMessage = item.ruleInfo;
-        //     }
-        //     // 正则式
-        //     if (item.type == "REGEX") {
-        //         startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond));
-        //         falg.infoMessage = item.ruleInfo;
-        //     }
-        //     // 长度
-        //     if (item.type == "STRINGLENGTH") {
-        //         startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
-        //         falg.infoMessage = item.ruleInfo;
-        //     }
-        //     // 系统值规则
-        //     if(item.type == "SYSVALUERULE") {
-        //         startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
-        //         falg.infoMessage = item.ruleInfo;
-        //     }
-        //     // 分组
-        //     if(item.type == 'GROUP'){
-        //         falg = this.verifyDeRules('group',item)
-        //         if(item.isNotMode){
-        //            falg.isPast = !falg.isPast;
-        //         }
-        //     }
-            
-        // });
+        rule[name].forEach((item:any) => {
+            let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
+                falg.infoMessage = item.ruleInfo;
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+                falg.infoMessage = item.ruleInfo;
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond));
+                falg.infoMessage = item.ruleInfo;
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+                falg.infoMessage = item.ruleInfo;
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+                falg.infoMessage = item.ruleInfo;
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
         if(!falg.hasOwnProperty("isPast")){
             falg.isPast = true;
         }