update:更新

@VIEW/@MACRO/VIEW_LAYOUTPANEL/MACRO.ftl

@@ -75,11 +75,34 @@
         <span>属性项</span>
         </#if>
     <#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "RAWITEM">
-        <#if panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()?? && panelDetail.getPSRawItem().getPredefinedType?? && panelDetail.getPSRawItem().getPredefinedType()?? && panelDetail.getPSRawItem().getPredefinedType() == 'STATIC_IMAGE'>
-        <span>这里放图片</span>
-        <#elseif panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()?? && panelDetail.getPSRawItem().getPredefinedType?? && panelDetail.getPSRawItem().getPredefinedType()?? && panelDetail.getPSRawItem().getPredefinedType() == 'STATIC_CAROUSEL'>
-        <span>这里放轮播图</span>
-        <#elseif panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()?? && panelDetail.getPSRawItem().getPredefinedType?? && panelDetail.getPSRawItem().getPredefinedType()?? && panelDetail.getPSRawItem().getPredefinedType() == 'STATIC_VIDEOPLAYER'>
+        <#if panelDetail.getPSRawItem?? && panelDetail.getPSRawItem()??>
+        <#assign rawdetail = panelDetail.getPSRawItem()/>
+        <#if  rawdetail.getPredefinedType?? && rawdetail.getPredefinedType()?? && rawdetail.getPredefinedType() == 'STATIC_IMAGE'>
+        <app-rawitem-image
+            type="STATIC_IMAGE"
+            <#if rawdetail.getCssStyle?? && rawdetail.getCssStyle()??>
+            cssStyle="${ rawdetail.getCssStyle() }"
+            </#if>
+            <#if rawdetail.getPSSysImage?? && rawdetail.getPSSysImage()??>
+            imgurl="${ rawdetail.getPSSysImage() }"
+            </#if>
+            <#if rawdetail.getPSSysImage?? && rawdetail.getPSSysImage()?? && rawdetail.getPSSysImage().getCssClass?? && rawdetail.getPSSysImage().getCssClass()??>
+            imageClass="${ rawdetail.getPSSysImage().getCssClass() }"
+            </#if>>
+            </app-rawitem-image>
+        <#elseif rawdetail.getPredefinedType?? && rawdetail.getPredefinedType()?? && rawdetail.getPredefinedType() == 'STATIC_CAROUSEL'>
+        <app-rawitem-carousel
+            <#if rawdetail.getPSSysCss?? && rawdetail.getPSSysCss()?? && rawdetail.getPSSysCss().cssName?? >
+            class="${ rawdetail.getPSSysCss().cssName }"
+            </#if> 
+            <#if rawdetail.getCssStyle?? && rawdetail.getCssStyle()?? && rawdetail.getCssStyle().cssStyle?? >
+            rawstyle="${ rawdetail.getPSSysCss().cssName }"
+            </#if> 
+            <#if rawdetail.getPSRawItemParams?? && rawdetail.getPSRawItemParams()?? >
+            swipdata="${ rawdetail.getPSRawItemParams()}"
+            </#if>>
+            </app-rawitem-carousel>
+        <#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>
@@ -95,6 +118,7 @@
             </#if>
             contentStyle="${panelDetail.getPSRawItem().getCssStyle()}"/>
         </#if>
+     </#if>
     <#elseif panelDetail.getItemType()?? && panelDetail.getItemType() == "BUTTON">
         <#if panelDetail.getPSUIAction?? && panelDetail.getPSUIAction()?? && panelDetail.getPSUIAction().getPredefinedType?? && panelDetail.getPSUIAction().getPredefinedType()?? && panelDetail.getPSUIAction().getPredefinedType() == "APP_LOGIN">
         <app-login-button class="app-login-login" type='primary' :caption="$t('components.login.name')" @itemClick="handleItemClick" />