属性值规则测试 --- fix7

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

@@ -4,14 +4,6 @@ TARGET=PSAPPDATAENTITY
 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}<#if singleCondition.getDEFName?? && singleCondition.getDEFName()??>${singleCondition.getDEFName()?lower_case}</#if>${singleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
-</#list>
-</#if>
-</#macro>
-
 <#assign langrestype = 'ZH_CN'/>
 <#assign emptyText = '暂无数据'>
 export default {
@@ -30,7 +22,11 @@ export default {
 <#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),
-		<@getAllCondition obj=singleCondition deValueRule=deValueRule />
+		<#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>