属性值规则测试 --- fix5

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

@@ -3,6 +3,15 @@ TARGET=PSAPPDATAENTITY
 </#ibiztemplate>
 import commonLogic from '@/locale/logic/common/common-logic';
 <#ibizinclude>../../../@MACRO/FUNC.ts</#ibizinclude>
+
+<#macro getAllCondition obj deValueRule>
+<#if obj.getPSDEFVRConditions?? && obj..getPSDEFVRConditions()??>
+<#list obj..getPSDEFVRConditions() as singleCondition>
+${deValueRule.getCodeName()?lower_case}${singleCondition.getDEFName()?lower_case}${singleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
+</#list>
+</#if>
+</#macro>
+
 <#assign langrestype = 'ZH_CN'/>
 <#assign emptyText = '暂无数据'>
 export default {
@@ -20,7 +29,8 @@ export default {
 <#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}${singleCondition.getModelName()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
+		${deValueRule.getCodeName()?lower_case}${singleCondition.getDEFName()?lower_case}${singleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
+		<@getAllCondition obj=singleCondition deValueRule=deValueRule />
 </#list>
 </#if>
 </#list>