提交 3c714e1c 编写于 作者: Shine-zwj's avatar Shine-zwj

update

上级 e74ebde0
...@@ -35,20 +35,20 @@ ${ctrl.render.code} ...@@ -35,20 +35,20 @@ ${ctrl.render.code}
<el-card @click.native="onEventClick(item,true,$event)" :class="item.className"> <el-card @click.native="onEventClick(item,true,$event)" :class="item.className">
<#if ctrl.getPSSysCalendarItems()?? > <#if ctrl.getPSSysCalendarItems()?? >
<#list ctrl.getPSSysCalendarItems() as calendarItem> <#list ctrl.getPSSysCalendarItems() as calendarItem>
<div v<#if calendarItem_index != 0>-else</#if>-if="<#if calendarItem.getPSLayoutPanel()??>true<#else>false</#if> && item.itemType == '${calendarItem.getItemType()}'">
<#if calendarItem.getPSLayoutPanel()??> <#if calendarItem.getPSLayoutPanel()??>
<#assign panel = calendarItem.getPSLayoutPanel()> <#assign panel = calendarItem.getPSLayoutPanel()>
<div v-if="item.itemPanel && item.itemType == '${calendarItem.getItemType()}' ? true : false"> <@ibizindent blank=16>
<@ibizindent blank=21>
${P.getCtrlCode(panel, 'CONTROL.html').code} ${P.getCtrlCode(panel, 'CONTROL.html').code}
</@ibizindent> </@ibizindent>
</div>
</#if> </#if>
</div>
</#list> </#list>
</#if> <div v-else>
<div v-if="!item.itemPanel">
<h4>{{item.title}}</h4> <h4>{{item.title}}</h4>
<p>{{$t('app.calendar.from')}} {{item.start}} {{$t('app.calendar.to')}} {{item.end}}</p> <p>{{$t('app.calendar.from')}} {{item.start}} {{$t('app.calendar.to')}} {{item.end}}</p>
</div> </div>
</#if>
</el-card> </el-card>
</context-menu> </context-menu>
</el-timeline-item> </el-timeline-item>
......
...@@ -50,7 +50,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -50,7 +50,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
itemType : '${calendarItem.getItemType()}', itemType : '${calendarItem.getItemType()}',
color : '${calendarItem.getBKColor()}', color : '${calendarItem.getBKColor()}',
textColor : '${calendarItem.getColor()}', textColor : '${calendarItem.getColor()}',
itemPanel : <#if calendarItem.getPSLayoutPanel()??>true<#else>false</#if>,
}, },
</#list> </#list>
</#if> </#if>
...@@ -100,7 +99,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -100,7 +99,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
_response.data[index].color = _this.eventsConfig[resIndex].color; _response.data[index].color = _this.eventsConfig[resIndex].color;
_response.data[index].textColor = _this.eventsConfig[resIndex].textColor; _response.data[index].textColor = _this.eventsConfig[resIndex].textColor;
_response.data[index].itemType = _this.eventsConfig[resIndex].itemType; _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); _this.handleResponse(action, _response,false,_this.eventsConfig[resIndex].itemType);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册