update：更新

APP/src/uiservice/%DE_PKGPATH%/%APP_DEUILOGIC%-ui-logic-base.ts.ftl

@@ -5,6 +5,7 @@ TARGET=PSAPPDEUILOGIC
 ../@MACRO/ui-logic-node.txt
 </#ibizinclude>
 import { UIActionContext } from "@/logic/ui-logic";
+import { LogicReturnType } from "@/logic/const/logic-return-type";
 /**
  * ${item.name}
  *
@@ -43,24 +44,24 @@ export default class ${srfclassname('${item.getCodeName()}')}UILogicBase {
         {
             name: '${logicParam.name}',
             codeName: '${logicParam.codeName}',
-            activeContainerParam: <#if logicParam.isActiveContainerParam?? && logicParam.isActiveContainerParam()>true<#else>false</#if>,
-            activeCtrlParam: <#if logicParam.isActiveCtrlParam?? && logicParam.isActiveCtrlParam()>true<#else>false</#if>,
-            activeViewParam: <#if logicParam.isActiveViewParam?? && logicParam.isActiveViewParam()>true<#else>false</#if>,
-            appGlobalParam: <#if logicParam.isAppGlobalParam?? && logicParam.isAppGlobalParam()>true<#else>false</#if>,
-            applicationParam: <#if logicParam.isApplicationParam?? && logicParam.isApplicationParam()>true<#else>false</#if>,
-            ctrlParam: <#if logicParam.isCtrlParam?? && logicParam.isCtrlParam()>true<#else>false</#if>,
-            default: <#if logicParam.isDefault?? && logicParam.isDefault()>true<#else>false</#if>,
-            entityParam: <#if logicParam.isEntityParam?? && logicParam.isEntityParam()>true<#else>false</#if>,
-            entityListParam: <#if logicParam.isEntityListParam?? && logicParam.isEntityListParam()>true<#else>false</#if>,
-            entityPageParam: <#if logicParam.isEntityPageParam?? && logicParam.isEntityPageParam()>true<#else>false</#if>,
-            filterParam: <#if logicParam.isFilterParam?? && logicParam.isFilterParam()>true<#else>false</#if>,
-            navContextParam: <#if logicParam.isNavContextParam?? && logicParam.isNavContextParam()>true<#else>false</#if>,
-            simpleParam: <#if logicParam.isSimpleParam?? && logicParam.isSimpleParam()>true<#else>false</#if>,
-            simpleListParam: <#if logicParam.isSimpleListParam?? && logicParam.isSimpleListParam()>true<#else>false</#if>,
-            routeViewSessionParam: <#if logicParam.isRouteViewSessionParam?? && logicParam.isRouteViewSessionParam()>true<#else>false</#if>,
-            viewNavDataParam: <#if logicParam.isViewNavDataParam?? && logicParam.isViewNavDataParam()>true<#else>false</#if>,
-            viewSessionParam: <#if logicParam.isViewSessionParam?? && logicParam.isViewSessionParam()>true<#else>false</#if>,
-            lastReturnParam: <#if logicParam.isLastReturnParam?? && logicParam.isLastReturnParam()>true<#else>false</#if>
+            <#if logicParam.isActiveContainerParam?? && logicParam.isActiveContainerParam()>activeContainerParam: true,</#if>
+            <#if logicParam.isActiveCtrlParam?? && logicParam.isActiveCtrlParam()>activeCtrlParam: true,</#if>
+            <#if logicParam.isActiveViewParam?? && logicParam.isActiveViewParam()>activeViewParam: true,</#if>
+            <#if logicParam.isAppGlobalParam?? && logicParam.isAppGlobalParam()>appGlobalParam: true,</#if>
+            <#if logicParam.isApplicationParam?? && logicParam.isApplicationParam()>applicationParam: true,</#if>
+            <#if logicParam.isCtrlParam?? && logicParam.isCtrlParam()>ctrlParam: true,</#if>
+            <#if logicParam.isDefault?? && logicParam.isDefault()>default: true,</#if>
+            <#if logicParam.isEntityParam?? && logicParam.isEntityParam()>entityParam: true,</#if>
+            <#if logicParam.isEntityListParam?? && logicParam.isEntityListParam()>entityListParam: true,</#if>
+            <#if logicParam.isEntityPageParam?? && logicParam.isEntityPageParam()>entityPageParam: true,</#if>
+            <#if logicParam.isFilterParam?? && logicParam.isFilterParam()>filterParam: true,</#if>
+            <#if logicParam.isNavContextParam?? && logicParam.isNavContextParam()>navContextParam: true,</#if>
+            <#if logicParam.isSimpleParam?? && logicParam.isSimpleParam()>simpleParam: true,</#if>
+            <#if logicParam.isSimpleListParam?? && logicParam.isSimpleListParam()>simpleListParam: true,</#if>
+            <#if logicParam.isRouteViewSessionParam?? && logicParam.isRouteViewSessionParam()>routeViewSessionParam: true,</#if>
+            <#if logicParam.isViewNavDataParam?? && logicParam.isViewNavDataParam()>viewNavDataParam: true,</#if>
+            <#if logicParam.isViewSessionParam?? && logicParam.isViewSessionParam()>viewSessionParam: true,</#if>
+            <#if logicParam.isLastReturnParam?? && logicParam.isLastReturnParam()>lastReturnParam: true</#if>
         },
     </#list>
 </#if>

APP/src/uiservice/@MACRO/ui-logic-node.txt

@@ -36,7 +36,20 @@
 
 <#--  START: 拷贝参数节点  -->
 <#macro copyParamNode logicNode>
-        //  TODO 等待补充
+    <#if logicNode.getDstPSDEUILogicParam?? && logicNode.getDstPSDEUILogicParam()?? && logicNode.getSrcPSDEUILogicParam?? && logicNode.getSrcPSDEUILogicParam()??>
+        try {
+            // 源数据
+            const srcParam:any = actionContext.getParam('${logicNode.getSrcPSDEUILogicParam().codeName}');
+            // 目标数据
+            const dstParam: any = actionContext.getParam('${logicNode.getDstPSDEUILogicParam().codeName}');
+            srcParam.copyTo(dstParam);
+            actionContext.bindLastReturnParam(null);
+        } catch (error: any) {
+            throw new Error(`逻辑参数 ${logicNode.getDstPSDEUILogicParam().name} <#noparse>${error ## error.message ? error.message : '发生未知错误！'}`</#noparse>);
+        }
+    <#else>
+        throw new Error('操作参数或者源参数缺失!');
+    </#if>
         console.log('已完成执行 ${logicNode.name} 节点');
 </#macro>
 <#--  END: 拷贝参数节点  -->
@@ -83,7 +96,11 @@
 
 <#--  START: 行为处理节点  -->
 <#macro deActionNode logicNode>
-        //  TODO 等待补充
+        const dstParam = actionContext.getParam('<#if logicNode.getDstPSDEUILogicParam?? && logicNode.getDstPSDEUILogicParam()??>${logicNode.getDstPSDEUILogicParam().codeName}</#if>');
+        if (!Object.is(dstParam.logicParamType, UILogicParamType.entityListParam) && !Object.is(dstParam.logicParamType, UILogicParamType.entityParam)) {
+            throw new Error(`实体行为操作参数只能为数据对象变量类型或者数据对象列表类型`);
+        }
+        const retParam = actionContext.getParam('<#if logicNode.getRetPSDEUILogicParam?? && logicNode.getRetPSDEUILogicParam()??>${logicNode.getRetPSDEUILogicParam().codeName}</#if>');
         console.log('已完成执行 ${logicNode.name} 节点');
 </#macro>
 <#--  END: 行为处理节点  -->
@@ -179,7 +196,23 @@
 
 <#--  START: 结束节点  -->
 <#macro endNode logicNode>
-        //  TODO 等待补充
+        const strReturnType: string = '<#if logicNode.getReturnType?? && logicNode.getReturnType()??>${logicNode.getReturnType()}</#if>';
+        if (Object.is(strReturnType, LogicReturnType.NONEVALUE) || Object.is(strReturnType, LogicReturnType.NULLVALUE)) {
+            actionContext.setResult(null);
+        } else if (Object.is(strReturnType, LogicReturnType.SRCVALUE)) {
+            actionContext.setResult('<#if logicNode.getRawValue?? && logicNode.getRawValue()??>${logicNode.getRawValue()}</#if>');
+        } else if (Object.is(strReturnType, LogicReturnType.BREAK)) {
+            actionContext.setResult(LogicReturnType.BREAK);
+        } else if (Object.is(strReturnType, LogicReturnType.LOGICPARAM) || Object.is(strReturnType, LogicReturnType.LOGICPARAMFIELD)) {
+            const returnParam = actionContext.getParam('<#if logicNode.getReturnParam?? && logicNode.getReturnParam()??>${logicNode.getReturnParam().codeName}</#if>');
+            if (Object.is(strReturnType, LogicReturnType.LOGICPARAM)) {
+                actionContext.setResult(returnParam.getReal());
+            } else {
+                actionContext.setResult(returnParam.get('<#if logicNode.getDstFieldName?? && logicNode.getDstFieldName()??>${logicNode.getDstFieldName()}</#if>'));
+            }
+        } else {
+            <#noparse>throw new Error(`无法识别的返回值类型${strReturnType}`);</#noparse>
+        }
         console.log('已完成执行 ${logicNode.name} 节点');
 </#macro>
 <#--  END: 结束节点  -->