导航参数调整

@LOGIC/@APPFUNC/打开应用视图/LOGIC.vue.ftl

@@ -16,8 +16,8 @@ protected click${item.codeName}(item: any = {}) {
     let navigateParam: any = <@getNavigateParams item />;
     let navigateContext: any = <@getNavigateContext item />;
     const { param: _navigateParam, context: _navigateContext } = this.$viewTool.formatNavigateParam({ context: navigateContext, param: navigateParam }, this.context, this.viewparams, {});
-    let context = { ...this.context, ..._navigateContext };
-    let param = { ...this.viewparams, ..._navigateParam };
+    let context = { ..._navigateContext };
+    let param = { ..._navigateParam };
 <#if dataview.getOpenMode() == 'POPUPMODAL' || dataview.getOpenMode() == 'POPUPAPP' || dataview.getOpenMode() == 'POPOVER' || dataview.getOpenMode()?index_of('DRAWER') == 0 >
 <@outPutViewInfo dataview/>
 </#if>

@LOGIC/@UIACTION/前台调用/LOGIC.vue.ftl

@@ -58,7 +58,7 @@ ${front_block}
         context = { ...container.context, ...context };
         let panelNavParam= <@getNavigateParams item />;
         let panelNavContext= <@getNavigateContext item />;
-        const { context: navContext, param: navParam } = this.$viewTool.formatNavigateParam({ context: panelNavContext, param: panelNavParam }, context, params, {});
+        const { context: navContext, param: navParam } = this.viewTool.formatNavigateParam({ context: panelNavContext, param: panelNavParam }, context, params, {});
         <#-- 构建srfparentdename和srfparentkey start -->
         let parentObj: any = {
             srfparentdename: srfParentDeName ? srfParentDeName : null,