From 7baf5788472ed327c78b3e532d679ce99958b1bc Mon Sep 17 00:00:00 2001 From: Mosher <moseternal@gmail.com> Date: Thu, 3 Nov 2022 09:26:11 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=9B=B4=E6=96=B0=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- @VIEW/@MACRO/VIEW_LAYOUTPANEL/MACRO.ftl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/@VIEW/@MACRO/VIEW_LAYOUTPANEL/MACRO.ftl b/@VIEW/@MACRO/VIEW_LAYOUTPANEL/MACRO.ftl index 8ba3a30b..20d6d475 100644 --- a/@VIEW/@MACRO/VIEW_LAYOUTPANEL/MACRO.ftl +++ b/@VIEW/@MACRO/VIEW_LAYOUTPANEL/MACRO.ftl @@ -96,7 +96,7 @@ <#elseif rawdetail.getPredefinedType?? && rawdetail.getPredefinedType()?? && rawdetail.getPredefinedType() == 'STATIC_VIDEOPLAYER'> <span>杩欓噷鏀捐棰�</span> <#elseif panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()?? && panelDetail.getPSRawItem().getPredefinedType?? && panelDetail.getPSRawItem().getPredefinedType()?? && panelDetail.getPSRawItem().getPredefinedType() == 'NAV_POS'> - <app-nav-pos name="${panelDetail.getName()}" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['${panelDetail.getName()}'].navData"></app-nav-pos> + <app-nav-pos name="${panelDetail.getName()}" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['${panelDetail.getName()}'].navData"></app-nav-pos> <#elseif panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()?? && panelDetail.getPSRawItem().getPredefinedType?? && panelDetail.getPSRawItem().getPredefinedType()?? && (panelDetail.getPSRawItem().getPredefinedType() == 'STATIC_LABEL' || panelDetail.getPSRawItem().getPredefinedType() == 'STATIC_TEXT')> <app-preset-text predefinedType="${panelDetail.getPSRawItem().getPredefinedType()}" @@ -108,6 +108,8 @@ value="${panelDetail.getHtmlContent()}" </#if> contentStyle="${panelDetail.getPSRawItem().getCssStyle()}"/> + <#elseif panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()?? && panelDetail.getPSRawItem().getPredefinedType?? && panelDetail.getPSRawItem().getPredefinedType()?? && panelDetail.getPSRawItem().getPredefinedType() == 'NAV_TABS'> + <tab-page-exp></tab-page-exp> </#if> </#if> <#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "BUTTON"> -- 2.21.0