Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuemobr7 into dev

@CONTROL/分页视图面板/CONTROL-BASE.vue.ftl

@@ -105,9 +105,9 @@
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */
     protected parsePanelParam(){
-        const { context: navContext, param: navParam } = this.$viewTool.formatNavigateParam({ context: this.panelNavContext, param: this.panelNavParam }, this.context, this.viewparams, {});
-        this._context = { ...this.context, ...navContext };
-        this._viewparams = { ...this.viewparams, ...navParam };
+        const { context: context, param: param } = this.$viewTool.formatNavigateParam( this.panelNavContext, this.panelNavParam, this.context, this.viewparams, {});
+        this._context = { ...context };
+        this._viewparams = { ...param };
     }
 
 

@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl

@@ -167,9 +167,9 @@
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */
     protected parsePanelParam(){
-        const { context: navContext, param: navParam } = this.$viewTool.formatNavigateParam({ context: this.panelNavContext, param: this.panelNavParam }, this.context, this.viewparams, {});
-        this._context = { ...this.context, ...navContext };
-        this._viewparams = { ...this.viewparams, ...navParam };
+        const { context: context, param: param } = this.$viewTool.formatNavigateParam( this.panelNavContext, this.panelNavParam, this.context, this.viewparams, {});
+        this._context = { ...context };
+        this._viewparams = { ...param };
     }
 
     /**

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

@@ -15,9 +15,9 @@ protected click${item.codeName}(item: any = {}) {
     <#else>
     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 = { ..._navigateContext };
-    let param = { ..._navigateParam };
+    const { param: _param, context: _context } = this.$viewTool.formatNavigateParam(navigateContext, navigateParam, this.context, this.viewparams, {});
+    let context = { ..._context };
+    let param = { ..._param };
 <#if dataview.getOpenMode() == 'POPUPMODAL' || dataview.getOpenMode() == 'POPUPAPP' || dataview.getOpenMode() == 'POPOVER' || dataview.getOpenMode()?index_of('DRAWER') == 0 >
 <@outPutViewInfo dataview/>
 </#if>

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

@@ -65,7 +65,7 @@ ${front_block}
         Object.assign(params, parentObj);
         let panelNavParam= <@getNavigateParams 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：界面行为结果  -->
             <#if item.getFrontProcessType() != 'OTHER'>
         let response: any = null;