属性值规则-- fix 关键条件

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

@@ -278,7 +278,7 @@ import schema from 'async-validator';
                 </#if>
               </#if>
               <#-- 属性值规则 -->
-              <#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
+              <#if fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
                 <#assign  deRule = fideValueRule.getPSDEFValueRule()/>
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").isPast},message: this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").infoMessage, trigger: 'change' },
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").isPast},message: this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").infoMessage, trigger: 'blur' },
@@ -301,7 +301,8 @@ import schema from 'async-validator';
     public deRules:any = {
         <#if ctrl.getPSDEFormItemVRs?? && ctrl.getPSDEFormItemVRs()??>
         <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
-            <#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
+            <#if fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
+                //<#if  fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()??>${fideValueRule.getCheckMode()?c}</#if>
                 <#assign  deRule = fideValueRule.getPSDEFValueRule()/>
                 <#if fideValueRule.getPSDEFormItemName?? && fideValueRule.getPSDEFormItemName()??>
                 ${fideValueRule.getPSDEFormItemName()}:[

@MACRO/LANG_FUN.ftl

@@ -55,8 +55,9 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       </#if>
                       condOP:"<#if condItem.getCondOp?? && condItem.getCondOp()??>${condItem.getCondOp()}</#if>",
                       ruleInfo:"<#if condItem.getRuleInfo?? && condItem.getRuleInfo()??>${condItem.getRuleInfo()}</#if>", 
-                      group:[
+                      isKeyCond:"<#if condItem.isKeyCond?? && condItem.isKeyCond()??>${condItem.isKeyCond()?c}</#if>",
                       <#if condItem.getCondType?? && condItem.getCondType()?? && condItem.getCondType() == 'GROUP'>
+                      group:[
                         <#if condItem.getPSDEFVRConditions?? && condItem.getPSDEFVRConditions()??>
                           <#list condItem.getPSDEFVRConditions() as group_item>
                                 <@getDeRule group_item />