Revert "表单值规则常规规则修复"

This reverts commit 0a7be27c.

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

@@ -389,6 +389,27 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
         return {context:tempContext,data:requestData};
     }
 
+    /**
+     * 通过属性名称获取表单项名称
+     * 
+     * @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

@@ -341,10 +341,10 @@ import schema from 'async-validator';
             }
         }
         rule[name].forEach((item:any) => {
-            let dataValue = this.data[name];
+            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));
+                startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,{},item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
             }
             // 数值范围