提交 5139ac0c 编写于 作者: zcdtk's avatar zcdtk
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected parsePanelParam(){ protected parsePanelParam(){
const { context: navContext, param: navParam } = this.$viewTool.formatNavigateParam({ context: this.panelNavContext, param: this.panelNavParam }, this.context, this.viewparams, {}); const { context: context, param: param } = this.$viewTool.formatNavigateParam( this.panelNavContext, this.panelNavParam, this.context, this.viewparams, {});
this._context = { ...this.context, ...navContext }; this._context = { ...context };
this._viewparams = { ...this.viewparams, ...navParam }; this._viewparams = { ...param };
} }
......
...@@ -167,9 +167,9 @@ ...@@ -167,9 +167,9 @@
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected parsePanelParam(){ protected parsePanelParam(){
const { context: navContext, param: navParam } = this.$viewTool.formatNavigateParam({ context: this.panelNavContext, param: this.panelNavParam }, this.context, this.viewparams, {}); const { context: context, param: param } = this.$viewTool.formatNavigateParam( this.panelNavContext, this.panelNavParam, this.context, this.viewparams, {});
this._context = { ...this.context, ...navContext }; this._context = { ...context };
this._viewparams = { ...this.viewparams, ...navParam }; this._viewparams = { ...param };
} }
/** /**
......
...@@ -15,9 +15,9 @@ protected click${item.codeName}(item: any = {}) { ...@@ -15,9 +15,9 @@ protected click${item.codeName}(item: any = {}) {
<#else> <#else>
let navigateParam: any = <@getNavigateParams item />; let navigateParam: any = <@getNavigateParams item />;
let navigateContext: any = <@getNavigateContext item />; let navigateContext: any = <@getNavigateContext item />;
const { param: _navigateParam, context: _navigateContext } = this.$viewTool.formatNavigateParam({ context: navigateContext, param: navigateParam }, this.context, this.viewparams, {}); const { param: _param, context: _context } = this.$viewTool.formatNavigateParam(navigateContext, navigateParam, this.context, this.viewparams, {});
let context = { ..._navigateContext }; let context = { ..._context };
let param = { ..._navigateParam }; let param = { ..._param };
<#if dataview.getOpenMode() == 'POPUPMODAL' || dataview.getOpenMode() == 'POPUPAPP' || dataview.getOpenMode() == 'POPOVER' || dataview.getOpenMode()?index_of('DRAWER') == 0 > <#if dataview.getOpenMode() == 'POPUPMODAL' || dataview.getOpenMode() == 'POPUPAPP' || dataview.getOpenMode() == 'POPOVER' || dataview.getOpenMode()?index_of('DRAWER') == 0 >
<@outPutViewInfo dataview/> <@outPutViewInfo dataview/>
</#if> </#if>
......
...@@ -65,7 +65,7 @@ ${front_block} ...@@ -65,7 +65,7 @@ ${front_block}
Object.assign(params, parentObj); Object.assign(params, parentObj);
let panelNavParam= <@getNavigateParams item />; let panelNavParam= <@getNavigateParams item />;
let panelNavContext= <@getNavigateContext item />; let panelNavContext= <@getNavigateContext item />;
const { context: _context, param: _params } = this.viewTool.formatNavigateParam({ context: panelNavContext, param: panelNavParam }, context, params, {}); const { context: _context, param: _params } = this.viewTool.formatNavigateParam( panelNavContext, panelNavParam, context, params, {});
<#-- BEGIN:界面行为结果 --> <#-- BEGIN:界面行为结果 -->
<#if item.getFrontProcessType() != 'OTHER'> <#if item.getFrontProcessType() != 'OTHER'>
let response: any = null; let response: any = null;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册