优化前端实体处理逻辑 --- fix4

APP/src/service/%DE_PKGPATH%/%APP_DELOGIC%-logic-base.ts.ftl

@@ -27,27 +27,32 @@ import { Verify } from '@/utils/verify/verify';
         </#if>
         </#if>
 </#if>  -->
-<#if logicparam.getSrcPSDELogicParam()?? && logicparam.getSrcFieldName()?? && logicparam.getDstPSDELogicParam()?? && logicparam.getDstFieldName()?? && logicparam.getSrcValueType()??>
+<#if logicparam.getDstPSDELogicParam()?? && logicparam.getDstFieldName()?? && logicparam.getSrcValueType()??>
 <#-- 源参数 -->
-<#assign srcParam = logicparam.getSrcPSDELogicParam() />
+<#if logicparam.getSrcPSDELogicParam()??><#assign srcParam = logicparam.getSrcPSDELogicParam() /></#if>
 <#-- 源参数属性名称 -->
-<#assign srcFieldParam = logicparam.getSrcFieldName()?lower_case />
+<#if logicparam.getSrcFieldName()??><#assign srcFieldParam = logicparam.getSrcFieldName()?lower_case /></#if>
 <#-- 目标参数 -->
 <#assign dstParam = logicparam.getDstPSDELogicParam() />
 <#-- 目标参数属性名称 -->
 <#assign dstFieldParam = logicparam.getDstFieldName()?lower_case />
 <#-- 源逻辑参数 -->
-<#if logicparam.getSrcValueType() =="SRCDLPARAM">
-    console.log(this.paramsMap);
-    let tempSrcParam${logicparam_index}Data:any = this.paramsMap.get('${srcParam.getCodeName()}').data;
     let tempDstParam${logicparam_index}Context:any = this.paramsMap.get('${dstParam.getCodeName()}').context;
     let tempDstParam${logicparam_index}Data:any = this.paramsMap.get('${dstParam.getCodeName()}').data;
+<#if logicparam.getSrcValueType() =="SRCDLPARAM">
+    let tempSrcParam${logicparam_index}Data:any = this.paramsMap.get('${srcParam.getCodeName()}').data;
     Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:tempSrcParam${logicparam_index}Data['${srcFieldParam}']});
-    this.paramsMap.set('${dstParam.getCodeName()}',{data:tempDstParam${logicparam_index}Data,context:tempDstParam${logicparam_index}Context});
-    console.log(this.paramsMap);
-<#else>
-
+<#-- 应用上下文 -->
+<#elseif logicparam.getSrcValueType() =="APPDATA">
+    Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:context['${srcFieldParam}']});
+<#-- 数据上下文 -->
+<#elseif logicparam.getSrcValueType() =="DATACONTEXT">
+    Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:data['${srcFieldParam}']});
+<#-- 直接值 -->
+<#elseif logicparam.getSrcValueType() =="SRCVALUE">
+    Object.assign(tempDstParam${logicparam_index}Data,{${dstFieldParam}:${logicparam.getSrcValue()}});
 </#if>
+    this.paramsMap.set('${dstParam.getCodeName()}',{data:tempDstParam${logicparam_index}Data,context:tempDstParam${logicparam_index}Context});
 </#if>
 </#list>
 </#if>