update参数调整

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

@@ -13,14 +13,11 @@ protected click${item.codeName}(item: any = {}) {
     <#if dataview.isRedirectView()>
     this.$notify({ type: 'warning', message: '重定向视图暂不支持应用功能打开' });
     <#else>
-    let _params: any = <@getNavigateParams item />;
-    let _context: any = <@getNavigateContext item />;
-        <#if item.getOpenViewParam?? && item.getOpenViewParam()??>
-    Object.assign(_params, ${item.getOpenViewParam()});
-        </#if>
-    const param = this.$viewTool.doEditorItemParam({context:_context,param:_context},this.context,this.viewparams,{});
-    _context = Object.assign({...this.context},param.context);
-    _params = Object.assign({...this.viewparams},param.param);
+    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 };
 <#if dataview.getOpenMode() == 'POPUPMODAL' || dataview.getOpenMode() == 'POPUPAPP' || dataview.getOpenMode() == 'POPOVER' || dataview.getOpenMode()?index_of('DRAWER') == 0 >
 <@outPutViewInfo dataview/>
 </#if>
@@ -46,23 +43,23 @@ protected click${item.codeName}(item: any = {}) {
             </#if>
             <#--  END：是否应用实体视图  -->
             <#--  END：准备参数  -->
-    const routeParam: any = this.globaluiservice.openService.formatRouteParam(_context, deResParameters, parameters, [], _params);
+    const routeParam: any = this.globaluiservice.openService.formatRouteParam(context, deResParameters, parameters, [], param);
     this.globaluiservice.openService.openView(routeParam);
         </#if>
         <#if dataview.getOpenMode() == 'POPUP'>
     console.log('-----POPUP-----非模式弹出，暂时不实现');
         </#if>
         <#if dataview.getOpenMode() == 'POPUPMODAL'>
-    this.globaluiservice.openService.openModal(view, _context, _params);
+    this.globaluiservice.openService.openModal(view, context, param);
         </#if>
         <#if dataview.getOpenMode() == 'POPUPAPP'>
     console.log('-----POPUPAPP-----独立程序弹出，暂时不实现');
         </#if>
         <#if dataview.getOpenMode()?index_of('DRAWER') == 0>
-    this.globaluiservice.openService.openDrawer(view, _context, _params);
+    this.globaluiservice.openService.openDrawer(view, context, param);
         </#if>
         <#if dataview.getOpenMode() == 'POPOVER'>
-    this.globaluiservice.openService.openPopOver(view, _context, _params);
+    this.globaluiservice.openService.openPopOver(view, context, param);
         </#if>
         <#if dataview.getOpenMode()?index_of('USER') == 0>
     console.log('-----${dataview.getOpenMode()}-----用户自定义');