修复日历部件布局和参数问题

@CONTROL/日历部件/CONTROL-BASE.vue.ftl

@@ -9,22 +9,6 @@
 ${ctrl.render.code}
 <#else>
     <div :class='calendarClass<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>'>
-    <#if ctrl.getQuickPSDEToolbar?? && ctrl.getQuickPSDEToolbar()??>
-      <span class="quick-toolbar">
-        <#assign quickToolbar = ctrl.getQuickPSDEToolbar()/>
-        <@ibizindent blank=12>
-        ${P.getCtrlCode(quickToolbar, 'CONTROL.html').code}
-        </@ibizindent>
-      </span>
-    </#if>
-    <#if ctrl.getBatchPSDEToolbar?? && ctrl.getBatchPSDEToolbar()??>
-    <span v-if="selections.length > 0" class="batch-toolbar">
-      <#assign batchToolbar = ctrl.getBatchPSDEToolbar()/>
-      <@ibizindent blank=12>
-      ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
-      </@ibizindent>
-    </span>
-    </#if>
       <context-menu-container>
 <#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'>
         <template v-if="events.length >0">
@@ -60,6 +44,14 @@ ${ctrl.render.code}
         </template>
         <template v-else>
             <span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
+            <#if ctrl.getQuickPSDEToolbar?? && ctrl.getQuickPSDEToolbar()??>
+            <span class="quick-toolbar">
+                <#assign quickToolbar = ctrl.getQuickPSDEToolbar()/>
+                <@ibizindent blank=12>
+                ${P.getCtrlCode(quickToolbar, 'CONTROL.html').code}
+                </@ibizindent>
+            </span>
+            </#if>
         </template>
 <#else>
         <template>
@@ -98,6 +90,14 @@ ${ctrl.render.code}
         </template>
 </#if>
       </context-menu-container>
+    <#if ctrl.getBatchPSDEToolbar?? && ctrl.getBatchPSDEToolbar()??>
+    <span v-if="selections.length > 0" class="batch-toolbar">
+      <#assign batchToolbar = ctrl.getBatchPSDEToolbar()/>
+      <@ibizindent blank=12>
+      ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
+      </@ibizindent>
+    </span>
+    </#if>
     </div>
 </#if>
 </template>
@@ -601,6 +601,7 @@ FullCalendar,
         let _this = this;
         let view: any = {};
         let _context: any = Object.assign({},this.context);
+        let _viewparams:any = Object.assign({start:event.start,end:event.end},this.viewparams);
         switch(event.itemType) {
 <#if ctrl.getPSSysCalendarItems()??>
   <#list ctrl.getPSSysCalendarItems() as calendarItem>
@@ -624,16 +625,16 @@ FullCalendar,
         if(!view.viewname){
             return;
         } else if (Object.is(view.placement, 'INDEXVIEWTAB') || Object.is(view.placement, '')) {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, this.context, view.deResParameters, view.parameters, [JSON.parse(JSON.stringify(_context))] , JSON.parse(JSON.stringify(this.viewparams)));
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, this.context, view.deResParameters, view.parameters, [JSON.parse(JSON.stringify(_context))] , _viewparams);
             this.$router.push(routePath);
         } else {
             let container: Subject<any> = new Subject();
             if (Object.is(view.placement, 'POPOVER')) {
-                container = this.$apppopover.openPop(isOriginData ? $event2 : $event.jsEvent, view,JSON.parse(JSON.stringify(_context)),  JSON.parse(JSON.stringify(this.viewparams)));
+                container = this.$apppopover.openPop(isOriginData ? $event2 : $event.jsEvent, view,JSON.parse(JSON.stringify(_context)), _viewparams);
             } else if (Object.is(view.placement, 'POPUPMODAL')) {
-                container = this.$appmodal.openModal(view,  JSON.parse(JSON.stringify(_context)),  JSON.parse(JSON.stringify(this.viewparams)));
+                container = this.$appmodal.openModal(view,  JSON.parse(JSON.stringify(_context)), _viewparams);
             } else if (view.placement.startsWith('DRAWER')) {
-                container = this.$appdrawer.openDrawer(view,  JSON.parse(JSON.stringify(_context)),  JSON.parse(JSON.stringify(this.viewparams)));
+                container = this.$appdrawer.openDrawer(view,  JSON.parse(JSON.stringify(_context)),  _viewparams);
             }
             container.subscribe((result: any) => {
                 if (!result || !Object.is(result.ret, 'OK')) {