add：自定义布局 - a7

@VIEW/@MACRO/LAYOUTPANEL_VIEW.template.ftl

@@ -5,6 +5,18 @@
 <#if view.getPSViewLayoutPanel()?? && view.getPSViewLayoutPanel().isUseDefaultLayout()>
 ${P.getLayoutCode('VIEW.vue').code}
 <#else>
-<@renderRootElement view.getPSViewLayoutPanel() />
+<#assign viewLayout = view.getPSViewLayoutPanel() />
+<#if viewLayout.getPSLayout()?? && viewLayout.getPSLayout().getLayout()?? viewLayout.getPSLayout().getLayout() == "FLEX">
+    <#assign rootStyle = "height: '100%'; width: '100%';'display': 'flex';'flex-direction': 'column';" />
+<#else>
+    <#assign rootStyle = "height: '100%'; width: '100%'; 'overflow': 'auto';" />
+</#if>
+<div class="app-view-layout" style="${rootStyle}">
+    <#if viewLayout.getRootPSPanelItems()??>
+    <#list viewLayout.getRootPSPanelItems() as panelDetail>
+    <@renderByDetailType panelDetail />
+    </#list>
+    </#if>
+</div>
 </#if>
 </template>
\ No newline at end of file

@VIEW/@MACRO/VIEW_LAYOUTPANEL/VIEW_LAYOUTPANEL_RENDER.vue.ftl

@@ -21,19 +21,3 @@
 </#if>
 </#macro>
 
-<#-- 绘制顶层元素 -->
-<#macro renderRootElement viewLayout>
-<#if viewLayout.getPSLayout()?? && viewLayout.getPSLayout().getLayout()?? viewLayout.getPSLayout().getLayout() == "FLEX">
-    <#assign rootStyle = "height: '100%'; width: '100%';'display': 'flex';'flex-direction': 'column';" />
-<#else>
-    <#assign rootStyle = "height: '100%'; width: '100%'; 'overflow': 'auto';" />
-</#if>
-<div class="app-view-layout" style="${rootStyle}">
-    <#if viewLayout.getRootPSPanelItems()??>
-    <#list viewLayout.getRootPSPanelItems() as panelDetail>
-    <@renderByDetailType panelDetail />
-    </#list>
-    </#if>
-</div>
-</#macro>
-