日历导航参数

@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>
@@ -127,21 +128,24 @@
     public navViewName: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
   <#list xDataControl.getPSSysCalendarItems() as calendarItem>
-        ${calendarItem.getItemType()}: "<#if calendarItem.getNavPSAppView?? && calendarItem.getNavPSAppView()??><#assign navPSAppView = calendarItem.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>",
+        ${calendarItem.getItemType()}: "<#if calendarItem.getNavPSAppView?? && calendarItem.getNavPSAppView()??><#assign navPSAppView = calendarItem.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>"<#if calendarItem_has_next>,</#if>
   </#list>
 </#if>
     };
 
     /**
-     * 导航视图参数
+     * 导航参数
      *
-     * @type {string}
+     * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public navViewParam: any = {
+    public navParam: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
   <#list xDataControl.getPSSysCalendarItems() as calendarItem>
-        ${calendarItem.getItemType()}: '<#if calendarItem.getNavViewParamJO?? && calendarItem.getNavViewParamJO()??>${calendarItem.getNavViewParamJO()}</#if>',
+        ${calendarItem.getItemType()}: {
+            navigateContext:<#if calendarItem.getPSNavigateContexts?? && calendarItem.getPSNavigateContexts()??><@getNavigateContext calendarItem /><#else>null</#if>,
+            navigateParams:<#if calendarItem.getPSNavigateParams?? && calendarItem.getPSNavigateParams()??><@getNavigateParams calendarItem /><#else>null</#if>
+        }<#if calendarItem_has_next>,</#if>
   </#list>
 </#if>
     };
@@ -149,18 +153,32 @@
     /**
      * 导航过滤项
      *
-     * @type {string}
+     * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-</#if>
     public navFilter: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
   <#list xDataControl.getPSSysCalendarItems() as calendarItem>
-        ${calendarItem.getItemType()}: "<#if calendarItem.getNavFilter?? && calendarItem.getNavFilter()??>${calendarItem.getNavFilter()}</#if>",
+        ${calendarItem.getItemType()}: "<#if calendarItem.getNavFilter?? && calendarItem.getNavFilter()??>${calendarItem.getNavFilter()}</#if>"<#if calendarItem_has_next>,</#if>
   </#list>
 </#if>
     };
 
+    /**
+     * 导航关系
+     *
+     * @type {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public navPSDer: any = {
+<#if xDataControl.getPSSysCalendarItems()??>
+  <#list xDataControl.getPSSysCalendarItems() as calendarItem>
+        ${calendarItem.getItemType()}: "<#if calendarItem.getNavPSDER?? && calendarItem.getNavPSDER()??>n_${calendarItem.getNavPSDER().getPSPickupDEField().getCodeName()?lower_case}_eq</#if>"<#if calendarItem_has_next>,</#if>
+  </#list>
+</#if>
+    };
+</#if>
+
     /**
      * 显示处理提示
      *