Merge branch 'dev'

@CONTROL/分页导航面板/CONTROL-BASE.vue.ftl

@@ -127,6 +127,15 @@ import { Environment } from '@/environments/environment';
      */
     public action:any = '';
 
+    /**
+     * 当前激活数据
+     *
+     * @public
+     * @type {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public activeData:any = {};
+
     /**
      * 分页面板权限标识存储对象
      *
@@ -223,6 +232,7 @@ import { Environment } from '@/environments/environment';
                     return;
                 }
                 if(Object.is(action,'loadmodel')){
+                    this.activeData = data;
                     this.computedAuthPanel(data);
                 }else{
                     this.action = action;
@@ -273,7 +283,7 @@ import { Environment } from '@/environments/environment';
             return;
         }
         this.activiedTabViewPanel = $event;
-        this.viewState.next({ tag: this.activiedTabViewPanel, action: this.action, data: {}});
+        this.viewState.next({ tag: this.activiedTabViewPanel, action: this.action, data: this.activeData}});
     }
 
 

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

@@ -50,6 +50,14 @@
      */
     public isActivied: boolean = true;
 
+    /**
+     * 当前激活数据
+     *
+     * @type {boolean}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    @Prop() public activeData?:any;
+
     /**
      * 局部上下文
      *
@@ -137,11 +145,11 @@
             Object.assign(this.viewparams,{[this.navfilter]:this.context['<#if ctrl.getPSAppDataEntity()?? && ctrl.getPSAppDataEntity().getCodeName()??>${ctrl.getPSAppDataEntity().getCodeName()?lower_case}</#if>']})
         }
         if(this.localContext && Object.keys(this.localContext).length >0){
-            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            let _context:any = this.$util.computedNavData(this.activeData?JSON.parse(this.activeData):{},this.context,this.viewparams,this.localContext);
             Object.assign(this.context,_context);
         }
         if(this.localViewParam && Object.keys(this.localViewParam).length >0){
-            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            let _param:any = this.$util.computedNavData(this.activeData?JSON.parse(this.activeData):{},this.context,this.viewparams,this.localViewParam);
             Object.assign(this.viewparams,_param);
         }
         this.viewdata =JSON.stringify(this.context);

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

@@ -2,6 +2,7 @@
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
+    :activeData="JSON.stringify(activeData)"
     v-if="isInit.${ctrl.name}"
     name="${ctrl.name}"  
     ref='${ctrl.name}'