提交 199386fe 编写于 作者: Mosher's avatar Mosher

update:更新部件占位

上级 7eb1f610
...@@ -12,7 +12,7 @@ ${P.getLayoutCode('VIEW.vue').code} ...@@ -12,7 +12,7 @@ ${P.getLayoutCode('VIEW.vue').code}
</#if> </#if>
<#if view.getPSViewLayoutPanel().getRootPSPanelItems()??> <#if view.getPSViewLayoutPanel().getRootPSPanelItems()??>
<#list view.getPSViewLayoutPanel().getRootPSPanelItems() as panelDetail> <#list view.getPSViewLayoutPanel().getRootPSPanelItems() as panelDetail>
<@renderByDetailType panelDetail /> <@renderByDetailType panelDetail view />
</#list> </#list>
</#if> </#if>
</div> </div>
......
<#-- 按类型绘制 --> <#-- 按类型绘制 -->
<#macro renderByDetailType panelDetail> <#macro renderByDetailType panelDetail view>
<#if panelDetail.getItemType()?? && panelDetail.getItemType() == "CONTAINER"> <#if panelDetail.getItemType()?? && panelDetail.getItemType() == "CONTAINER">
<#-- 边缘布局 --> <#-- 边缘布局 -->
<#if panelDetail.getPSLayout().getLayout()?? && panelDetail.getPSLayout().getLayout() == "BORDER" > <#if panelDetail.getPSLayout().getLayout()?? && panelDetail.getPSLayout().getLayout() == "BORDER" >
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<#if panelDetail.getPSPanelItems()??> <#if panelDetail.getPSPanelItems()??>
<#list panelDetail.getPSPanelItems() as panelItem> <#list panelDetail.getPSPanelItems() as panelItem>
<template #${panelItem.getName()}> <template #${panelItem.getName()}>
<@renderByDetailType panelItem /> <@renderByDetailType panelItem view />
</template> </template>
</#list> </#list>
</#if> </#if>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<#if panelDetail.getPSPanelItems()??> <#if panelDetail.getPSPanelItems()??>
<#list panelDetail.getPSPanelItems() as panelItem> <#list panelDetail.getPSPanelItems() as panelItem>
<template #${panelItem.getName()}> <template #${panelItem.getName()}>
<@renderByDetailType panelItem /> <@renderByDetailType panelItem view />
</template> </template>
</#list> </#list>
</#if> </#if>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<#if panelDetail.getPSPanelItems()??> <#if panelDetail.getPSPanelItems()??>
<#list panelDetail.getPSPanelItems() as panelItem> <#list panelDetail.getPSPanelItems() as panelItem>
<template #${panelItem.getName()}> <template #${panelItem.getName()}>
<@renderByDetailType panelItem /> <@renderByDetailType panelItem view />
</template> </template>
</#list> </#list>
</#if> </#if>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<#if panelDetail.getPSPanelItems?? && panelDetail.getPSPanelItems()??> <#if panelDetail.getPSPanelItems?? && panelDetail.getPSPanelItems()??>
<#list panelDetail.getPSPanelItems() as panelItem> <#list panelDetail.getPSPanelItems() as panelItem>
<template #${panelItem.getName()}> <template #${panelItem.getName()}>
<@renderByDetailType panelItem /> <@renderByDetailType panelItem view />
</template> </template>
</#list> </#list>
</#if> </#if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<#if panelDetail.getPSPanelTabPages?? && panelDetail.getPSPanelTabPages()??> <#if panelDetail.getPSPanelTabPages?? && panelDetail.getPSPanelTabPages()??>
<#list panelDetail.getPSPanelTabPages() as tabPage> <#list panelDetail.getPSPanelTabPages() as tabPage>
<template #${tabPage.getName()}> <template #${tabPage.getName()}>
<@renderByDetailType tabPage /> <@renderByDetailType tabPage view />
</template> </template>
</#list> </#list>
</#if> </#if>
...@@ -89,7 +89,11 @@ ...@@ -89,7 +89,11 @@
</#if> --> </#if> -->
<span>按钮</span> <span>按钮</span>
<#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "CTRLPOS"> <#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "CTRLPOS">
<span>部件占位</span> <#if view?? && view.hasPSControl?? && view.hasPSControl(panelDetail.getName())>
${P.getCtrlCode(panelDetail.getName(), 'CONTROL.html').code}
<#else>
<span>部件占位${panelDetail.getName()}</span>
</#if>
<#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "USERCONTROL"> <#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "USERCONTROL">
<#-- <#if panelDetail.getPredefinedType?? && panelDetail.getPredefinedType == "AUTH_CAPTCHA"> <#-- <#if panelDetail.getPredefinedType?? && panelDetail.getPredefinedType == "AUTH_CAPTCHA">
<span>人机识别</span> <span>人机识别</span>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册