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

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

@@ -161,20 +161,32 @@
     public navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
 
     /**
-     * 导航视图参数
+     * 导航过滤项
      *
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
+    public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
+    <#if xDataControl.getPSNavigateContexts?? && xDataControl.getPSNavigateContexts()??>
     
     /**
-     * 导航过滤项
+     * 导航上下文参数
      *
-     * @type {string}
+     * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
+    public navigateContext:any = <@getNavigateContext xDataControl />;
+    </#if>
+    <#if xDataControl.getPSNavigateParams?? && xDataControl.getPSNavigateParams()??>
+
+    /**
+     * 导航视图参数
+     *
+     * @type {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public tempNavigateParams:any = <@getNavigateParams xDataControl />;
+    </#if> 
 </#if>
 
     /**
@@ -345,12 +357,6 @@
         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>
-        <#if xDataControl.getPSNavigateContexts?? && xDataControl.getPSNavigateContexts()??>
-        let tempNavigateContext:any = <@getNavigateContext xDataControl />;
-        </#if>
-        <#if xDataControl.getPSNavigateParams?? && xDataControl.getPSNavigateParams()??>
-        let tempNavigateParams:any = <@getNavigateParams xDataControl />;
-        </#if> 
         </#if>
         this.selection = {};
         Object.assign(this.selection, { view: { viewname: this.navViewName }, data:data });