提交 ba73d4da 编写于 作者: Mosher's avatar Mosher

update:更新

上级 79349d00
...@@ -408,7 +408,6 @@ ...@@ -408,7 +408,6 @@
const _this: any = this; const _this: any = this;
<#if view.getPSViewLayoutPanel()?? && !view.getPSViewLayoutPanel().isUseDefaultLayout()> <#if view.getPSViewLayoutPanel()?? && !view.getPSViewLayoutPanel().isUseDefaultLayout()>
<#assign afterMountedBlock> <#assign afterMountedBlock>
_this.isLayoutLoadding = false;
<#if view.getPSAppViewEngines()??> <#if view.getPSAppViewEngines()??>
_this.engineInit(); _this.engineInit();
</#if> </#if>
...@@ -420,6 +419,7 @@ ...@@ -420,6 +419,7 @@
</#if> </#if>
</#assign> </#assign>
_this.initLayout().then((result: any) => { _this.initLayout().then((result: any) => {
_this.isLayoutLoadding = false;
<#assign hasLogic = false> <#assign hasLogic = false>
<#if view.getPSAppViewLogics?? && view.getPSAppViewLogics()??> <#if view.getPSAppViewLogics?? && view.getPSAppViewLogics()??>
<#list view.getPSAppViewLogics() as logic> <#list view.getPSAppViewLogics() as logic>
......
...@@ -164,6 +164,10 @@ export default class ${srfclassname('${item.getCodeName()}')}UILogicBase { ...@@ -164,6 +164,10 @@ export default class ${srfclassname('${item.getCodeName()}')}UILogicBase {
*/ */
public getCondParam(actionContext: UIActionContext, param: string, property: string) { public getCondParam(actionContext: UIActionContext, param: string, property: string) {
const resultParam = actionContext.getParam(param).getReal(); const resultParam = actionContext.getParam(param).getReal();
// 当不存在参数属性时,返回直接值
if (property === '') {
return resultParam;
}
if (resultParam && resultParam.hasOwnProperty(property)) { if (resultParam && resultParam.hasOwnProperty(property)) {
return resultParam[property]; return resultParam[property];
} }
......
...@@ -462,7 +462,19 @@ ...@@ -462,7 +462,19 @@
msgBoxParam.bind(result); msgBoxParam.bind(result);
} }
actionContext.bindLastReturnParam(result); actionContext.bindLastReturnParam(result);
return true; <#if logicNode.getPSDEUILogicLinks?? && logicNode.getPSDEUILogicLinks()??>
<#list logicNode.getPSDEUILogicLinks() as link>
<#if link.getDstPSDEUILogicNode?? && link.getDstPSDEUILogicNode()??>
<#if link.getPSDEUILogicLinkGroupCond?? && link.getPSDEUILogicLinkGroupCond()??>
if(<@getCond link.getPSDEUILogicLinkGroupCond() />) {
resolve(this.execute_${link.getDstPSDEUILogicNode().codeName?lower_case}_node(actionContext));
}
<#else>
resolve(this.execute_${link.getDstPSDEUILogicNode().codeName?lower_case}_node(actionContext));
</#if>
</#if>
</#list>
</#if>
<#else> <#else>
throw new Error('${logicNode.getButtonsType()}未实现'); throw new Error('${logicNode.getButtonsType()}未实现');
</#if> </#if>
...@@ -531,6 +543,7 @@ ...@@ -531,6 +543,7 @@
* @memberof ${srfclassname('${item.getCodeName()}')}UILogicBase * @memberof ${srfclassname('${item.getCodeName()}')}UILogicBase
*/ */
protected async execute_${logicNode.codeName?lower_case}_node(actionContext: UIActionContext) { protected async execute_${logicNode.codeName?lower_case}_node(actionContext: UIActionContext) {
<#assign needNextNode = true>
<#if logicNode.getLogicNodeType() == 'BEGIN'> <#if logicNode.getLogicNodeType() == 'BEGIN'>
<#-- 开始节点 --> <#-- 开始节点 -->
<@beginNode logicNode/> <@beginNode logicNode/>
...@@ -577,6 +590,7 @@ ...@@ -577,6 +590,7 @@
<#-- 调试逻辑参数节点 --> <#-- 调试逻辑参数节点 -->
<@debugParamNode logicNode/> <@debugParamNode logicNode/>
<#elseif logicNode.getLogicNodeType() == 'MSGBOX'> <#elseif logicNode.getLogicNodeType() == 'MSGBOX'>
<#assign needNextNode = false>
<#-- 消息弹窗节点 --> <#-- 消息弹窗节点 -->
<@msgBoxNode logicNode/> <@msgBoxNode logicNode/>
<#elseif logicNode.getLogicNodeType() == 'RAWJSCODE'> <#elseif logicNode.getLogicNodeType() == 'RAWJSCODE'>
...@@ -592,6 +606,8 @@ ...@@ -592,6 +606,8 @@
console.log('${logicNode.getLogicNodeType()}暂未支持'); console.log('${logicNode.getLogicNodeType()}暂未支持');
</#if> </#if>
console.log('已完成执行 ${logicNode.name} 节点'); console.log('已完成执行 ${logicNode.name} 节点');
<#if needNextNode>
<@computeNextNode logicNode/> <@computeNextNode logicNode/>
</#if>
} }
</#macro> </#macro>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册