属性值规则测试 --- fix8

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

@@ -407,7 +407,7 @@ import { Environment } from '@/environments/environment';
                 ${fideValueRule.getPSDEFormItemName()?lower_case}:[
                 <#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? &&  deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
                 <#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem>
-                    <@getDeRule condItem />
+                    <@getDeRule condItem deRule/>
                 </#list>
                 </#if>],
                 </#if>

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

@@ -690,7 +690,7 @@ ${gridColumn.getName()}
                 ${fideValueRule.getPSDEGridEditItemName()}:[
                 <#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? &&  deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
                 <#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem>
-                    <@getDeRule condItem />
+                    <@getDeRule condItem deRule />
                 </#list>
                 </#if>],
                 </#if>

@MACRO/LANG_FUN.ftl

@@ -29,11 +29,11 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
 </#macro>
 
 <#-- 属性值规则 -->
-<#macro getDeRule condItem>
+<#macro getDeRule condItem deRule>
                   {
                       type:"<#if condItem.getCondType?? && condItem.getCondType()??>${condItem.getCondType()}</#if>",
                       condOP:"<#if condItem.getCondOp?? && condItem.getCondOp()??>${condItem.getCondOp()}</#if>",
-                      ruleInfo:"<#if condItem.getRuleInfo?? && condItem.getRuleInfo()??>${condItem.getRuleInfo()}</#if>", 
+                      ruleInfo:`<#noparse>${</#noparse>this.$t('${deRule.getCodeName()?lower_case}<#if condItem.getDEFName?? && condItem.getDEFName()??>${condItem.getDEFName()?lower_case}</#if>${condItem.getCondType()?lower_case}')<#noparse>}</#noparse>`, 
                       isKeyCond:<#if condItem.isKeyCond?? && condItem.isKeyCond()??>${condItem.isKeyCond()?c}</#if>,
                       <#if condItem.getParamValue?? && condItem.getParamValue()??>
                       paramValue:"${condItem.getParamValue()}",
@@ -76,7 +76,7 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       group:[
                         <#if condItem.getPSDEFVRConditions?? && condItem.getPSDEFVRConditions()??>
                           <#list condItem.getPSDEFVRConditions() as group_item>
-                                  <@getDeRule group_item />
+                                  <@getDeRule group_item deRule />
                           </#list>
                         </#if>
                         ]

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_en_US_base.ts.ftl

@@ -27,6 +27,24 @@ export default {
 </#list>
 	},
 </#if>
+<#--  属性值规则输出  -->
+<#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
+	derules:{
+<#list item.getPSDataEntity().getAllPSDEFValueRules() as deValueRule>
+<#if deValueRule?? && (deValueRule.isDefaultMode() == false)  && deValueRule.getPSDEFVRGroupCondition?? && deValueRule.getPSDEFVRGroupCondition()?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
+<#assign deVRConditions = deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() />
+<#list deVRConditions as singleCondition>
+		${deValueRule.getCodeName()?lower_case}<#if singleCondition.getDEFName?? && singleCondition.getDEFName()??>${singleCondition.getDEFName()?lower_case}</#if>${singleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
+		<#if singleCondition.getPSDEFVRConditions?? && singleCondition.getPSDEFVRConditions()??>
+		<#list singleCondition.getPSDEFVRConditions() as sonsingleCondition>
+		${deValueRule.getCodeName()?lower_case}<#if sonsingleCondition.getDEFName?? && sonsingleCondition.getDEFName()??>${sonsingleCondition.getDEFName()?lower_case}</#if>${sonsingleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${sonsingleCondition.getRuleInfo()}",null),
+		</#list>
+		</#if>
+</#list>
+</#if>
+</#list>
+	},
+</#if>
 <#--  实体视图输出  -->
 <#if item.getAllPSAppViews()??>
 	views: {

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_zh_CN_base.ts.ftl

@@ -15,6 +15,7 @@ export default {
   </#list>
   },
 </#if>
+<#--  属性值规则输出  -->
 <#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
 	derules:{
 <#list item.getPSDataEntity().getAllPSDEFValueRules() as deValueRule>