处理表格导航视图导航数据 --- fix3

@CONTROL/表格导航/CONTROL-BASE.vue.ftl

@@ -44,7 +44,8 @@
               :is="selection.view.viewname"
               class="viewcontainer2"
               :viewDefaultUsage="false"
-              :viewdata="JSON.stringify(selection.data)">
+              :viewdata="JSON.stringify(selection.context)"
+              :viewparam="JSON.stringify(selection.viewparam)">
             </component>
         </div>
     </split>
@@ -149,6 +150,15 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public split: number = 0.5;
+
+    /**
+     * 刷新标识
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public counter:number = 0;
+
 <#if ctrl.getXDataPSControl()??>
 <#assign xDataControl = ctrl.getXDataPSControl() />
 
@@ -194,7 +204,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public tempNavigateParams:any = <@getNavigateParams xDataControl />;
+    public navigateParams:any = <@getNavigateParams xDataControl />;
     </#if> 
 </#if>
 
@@ -351,13 +361,14 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
-        let data:any = {};
+        let tempContext:any = {};
+        let tempViewParam:any = {};
         if (args.length === 0) {
             return ;
         }
         const arg:any = args[0];
         if(this.context){
-            Object.assign(data,JSON.parse(JSON.stringify(this.context)));
+            Object.assign(tempContext,JSON.parse(JSON.stringify(this.context)));
         }
         <#if ctrl.getXDataPSControl()??>
         <#assign xDataControl = ctrl.getXDataPSControl()/>
@@ -365,10 +376,30 @@
         <#assign curDataEntity = xDataControl.getPSAppDataEntity()/>
         Object.assign(data,{'${curDataEntity.getCodeName()?lower_case}':arg['${curDataEntity.getCodeName()?lower_case}']});
         Object.assign(data,{srfparentdename:'${curDataEntity.getCodeName()}',srfparentkey:arg['${curDataEntity.getCodeName()?lower_case}']});
+        if(this.navFilter && !Object.is(this.navFilter,"")){
+            Object.assign(tempViewParam,{[this.navFilter]:arg['${curDataEntity.getCodeName()?lower_case}']});
+            this.counter += 1;
+            Object.assign(tempContext,{srfcounter:this.counter});
+        }
+        if(this.navPSDer && Object.is(this.navPSDer,"")){
+            Object.assign(tempViewParam,{[this.navPSDer]:arg['${curDataEntity.getCodeName()?lower_case}']});
+            this.counter += 1;
+            Object.assign(tempContext,{srfcounter:this.counter});
+        }
         </#if>
         </#if>
+        if(this.navigateContext && Object.keys(this.navigateContext).length >0){
+            let _context:any = this.$util.computedNavData(arg,tempContext,tempViewParam,this.navigateContext);
+            Object.assign(tempContext,_context);
+        }
+        if(this.navigateParams && Object.keys(this.navigateParams).length >0){
+            let _params:any = this.$util.computedNavData(arg,tempContext,tempViewParam,this.navigateParams);
+            Object.assign(tempViewParam,_params);
+            this.counter += 1;
+            Object.assign(tempContext,{srfcounter:this.counter});
+        }
         this.selection = {};
-        Object.assign(this.selection, { view: { viewname: this.navViewName }, data:data });
+        Object.assign(this.selection, { view: { viewname: this.navViewName },  context:tempContext,viewparam:tempViewParam });
         this.$emit('selectionchange',args);
         this.$forceUpdate();
     }