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

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

@@ -67,6 +67,7 @@
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
     protected afterCreated(){
+        this.parsePanelParam();
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -81,6 +82,18 @@
         }
     }
 
+    /**
+     * 解析面板导航参数
+     *
+     *  @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 };
+    }
+
+
     /**
      * vue 生命周期
      *