分页面板导航参数调整

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

+<#ibizinclude>../../@NAVPARAMS/FUNC/PUBLIC.vue.ftl</#ibizinclude>
 <#ibizinclude>
 ./CONTROL-BASE.template.ftl
 </#ibizinclude>
@@ -12,7 +13,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: {} }) protected panelNavParam?: any;
+    public panelNavParam= <@getNavigateParams ctrl />;
 
     /**
      * 面板导航上下文
@@ -20,7 +21,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: {} }) protected panelNavContext?: any;
+    public panelNavContext= <@getNavigateContext ctrl />;
 
     /**
      * 获取多项数据

@CONTROL/分页视图面板/CONTROL.html.ftl

-<#ibizinclude>../../@NAVPARAMS/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#assign content>
-    :panelNavParam= '<@getNavigateParams ctrl />'
-    :panelNavContext= '<@getNavigateContext ctrl />' 
-</#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl
 </#ibizinclude>
\ No newline at end of file

@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl

@@ -118,22 +118,6 @@ export default class ${srfclassname('${view.name}')}Base extends Vue {
      */
     protected navParam: any = {<#if view.getPSAppViewNavParams?? && view.getPSAppViewNavParams()??> <#list view.getPSAppViewNavParams() as param>'${param.getKey()?lower_case}': '<#if param.isRawValue()>${param.getValue()}<#else>%${param.getValue()}%</#if>'<#if param_has_next>, </#if></#list> </#if>};
 
-    /**
-     * 面板导航参数
-     *
-     * @type {*}
-     * @memberof ${srfclassname('${view.name}')}Base
-     */
-    @Prop({ default: ()=> {} }) protected panelNavParam?: any;
-
-    /**
-     * 面板导航上下文
-     *
-     * @type {*}
-     * @memberof ${srfclassname('${view.name}')}Base
-     */
-    @Prop({ default: ()=> {} }) protected panelNavContext?: any;
-
     /**
      * 视图模型数据
      *
@@ -225,8 +209,7 @@ ${P.getCtrlCode(ctrl, 'CONTROL.vue').code}
      */
     protected parseViewParam(): void {
         const { context, viewparams } = this.$viewTool.parseViewData(this, ${view.isPSDEView()?c});
-        const { context:navContext, param: navParam } = this.$viewTool.formatNavigateParam({ context: this.panelNavContext, param: this.panelNavParam }, this.context, this.viewparams, {});
-        this.context = { ...this.context, ...context, ...navContext };
+        this.context = { ...this.context, ...context };
         this.viewparams = { ...this.viewparams, ...viewparams }
     }
 <#--  移动端参数：BEGIN  -->