日历部件

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

@@ -32,21 +32,23 @@ ${ctrl.render.code}
             :timestamp="item.start" 
             placement="top">
             <context-menu :contextMenuStyle="{width: '100%'}" :data="item" :renderContent="renderContextMenu">
-            <#if ctrl.getPSSysCalendarItems()?? >
+                <el-card @click.native="onEventClick(item,true,$event)" :class="item.className">
+                <#if ctrl.getPSSysCalendarItems()?? >
                 <#list ctrl.getPSSysCalendarItems() as calendarItem>
-                <#if calendarItem.getPSLayoutPanel()??>
-                <#assign panel = calendarItem.getPSLayoutPanel()>
-                <div v-if="item.itemType == '${calendarItem.getItemType()}' ? true : false">
-                <@ibizindent blank=16>
-                ${P.getCtrlCode(panel, 'CONTROL.html').code}
-                </@ibizindent>
-                </div>
-                </#if>
+                    <#if calendarItem.getPSLayoutPanel()??>
+                    <#assign panel = calendarItem.getPSLayoutPanel()>
+                    <div v-if="item.itemPanel && item.itemType == '${calendarItem.getItemType()}' ? true : false">
+                    <@ibizindent blank=21>
+                    ${P.getCtrlCode(panel, 'CONTROL.html').code}
+                    </@ibizindent>
+                    </div>
+                    </#if>
                 </#list>
-            </#if>
-                <el-card @click.native="onEventClick(item,true,$event)" :class="item.className">
+                </#if>
+                    <div v-if="!item.itemPanel">
                     <h4>{{item.title}}</h4>
                     <p>{{$t('app.calendar.from')}} {{item.start}} {{$t('app.calendar.to')}} {{item.end}}</p>
+                    </div>
                 </el-card>
             </context-menu>
           </el-timeline-item>

@CONTROL/日历部件/SERVICE.ts.ftl

@@ -50,6 +50,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
           itemType : '${calendarItem.getItemType()}',
           color : '${calendarItem.getBKColor()}',
           textColor : '${calendarItem.getColor()}',
+          itemPanel : <#if calendarItem.getPSLayoutPanel()??>true<#else>false</#if>',
         },
   </#list>
 </#if>
@@ -99,6 +100,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                         _response.data[index].color = _this.eventsConfig[resIndex].color;
                         _response.data[index].textColor = _this.eventsConfig[resIndex].textColor;
                         _response.data[index].itemType = _this.eventsConfig[resIndex].itemType;
+                        _response.data[index].itemPanel = _this.eventsConfig[resIndex].itemPanel;
                     });
                     ;
                     _this.handleResponse(action, _response,false,_this.eventsConfig[resIndex].itemType);