属性值规则校验逻辑调整

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

@@ -330,8 +330,8 @@ import schema from 'async-validator';
         }
         rule[name].forEach((item:any) => {
             // 常规规则
-            if(item.type == 'SIMPLE' && this.data[this.service.getItemNameByDeName(item.deName)] != item.paramValue){
-                falg.isPast = false;
+            if(item.type == 'SIMPLE'){
+                falg.isPast = this.$verify.checkFieldSimpleRule(this.data[this.service.getItemNameByDeName(item.deName)],item.condOP,item.paramValue,item.ruleInfo,item.paramType,{},item.isKeyCond);
                 falg.infoMessage = item.ruleInfo;
             }
             // 正则式
@@ -340,12 +340,9 @@ import schema from 'async-validator';
                 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)){
-                    falg.isPast = false;
-                    falg.infoMessage = item.ruleInfo;
-                }
+            if (item.type == "STRINGLENGTH") {
+                falg.isPast = !this.$verify.checkFieldStringLengthRule(this.data[this.service.getItemNameByDeName(item.deName)],item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeManValue,item.ruleInfo,item.isKeyCond);
+                falg.infoMessage = item.ruleInfo;
             }
             // 系统值规则
             if(item.type === "SYSVALUERULE" && (item.isNotMode ? item.sysRule.RegExCode.test(this.data[name]) : !item.sysRule.RegExCode.test(this.data[name]))) {

@MACRO/LANG_FUN.ftl

@@ -62,9 +62,6 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       <#if condItem.isIncludeMinValue?? && condItem.isIncludeMinValue()??>
                       isIncludeMinValue:${condItem.isIncludeMinValue()?c},
                       </#if>
-                      <#if condItem.getParamType?? && condItem.getParamType()??>
-                      paramType:"${condItem.getParamType()}",
-                      </#if>
                       <#if condItem.getPSSysValueRule?? && condItem.getPSSysValueRule()??>
                       <#assign valRule = condItem.getPSSysValueRule()>
                       sysRule:{