lxm--标题，工具栏样式调整

@CONTROL/视图布局面板/@MACRO/EDIT.vue.ftl

@@ -6,13 +6,6 @@
     ./VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
 
-<#if view.hasPSControl('toolbar')>
-<@ibizindent blank=8>
-<div slot="extra">
-${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-</div>
-</@ibizindent>
-</#if>
         <div class="content-container">
 <#--  BEGIN：视图顶部视图消息  -->
 <@ibizindent blank=8>

@CONTROL/视图布局面板/@MACRO/EDIT3.vue.ftl

@@ -2,21 +2,18 @@
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
 
+<#if view.hasPSControl('toolbar')>
+  <#assign>
+  <template v-if="Object.is(this.selection.id, 'form')">
+      ${P.getCtrlCode('toolbar', 'CONTROL.html').code}
+  </template>
+  </#assign>
+</#if>
+
     <#ibizinclude>
     ./VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
 
-<#if view.hasPSControl('toolbar')>
-<@ibizindent blank=8>
-        <p slot="extra" v-show="Object.is(this.selection.id, 'form')">
-          <row style='margin-bottom: 6px;'>
-            <div class='pull-right'>
-        ${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-            </div>
-          </row>
-        </p>
-</@ibizindent>
-</#if>
         <div class="content-container">
 <#if view.hasPSControl('drtab')>
 <@ibizindent blank=8>

@CONTROL/视图布局面板/@MACRO/VIEW_CAPTION.vue.ftl

 <#--  不带数据信息标题  -->
 <#if view.isShowCaptionBar()>
-<p slot='title'>
+<div slot='title' class="header-container">
     <#if view.getPSSysImage()??>
     <#assign viewimg = view.getPSSysImage()/>
     <#if viewimg.getImagePath() !=  "">
@@ -10,5 +10,5 @@
     </#if>
     </#if>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-</p>
+</div>
 </#if>
\ No newline at end of file

@CONTROL/视图布局面板/@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

 <#--  带数据信息标题  -->
 <#if view.isShowCaptionBar() || view.hasPSControl('toolbar')>
-<p slot='title'>
-<#if view.isShowCaptionBar()>
+<div slot='title' class="header-container">
+  <#if view.isShowCaptionBar()>
     <#if view.getPSSysImage()??>
     <#assign viewimg = view.getPSSysImage()/>
     <#if viewimg.getImagePath() !=  ''>
@@ -11,6 +11,17 @@
     </#if>
     </#if>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-</#if>
-</p>
+  </#if>
+  <#if view.hasPSControl('toolbar')>
+    <#if selfToolbarRender??>
+      <@ibizindent blank=4>
+      ${selfToolbarRender}<#t>
+      </@ibizindent>
+    <#else>
+      <@ibizindent blank=4>
+      ${P.getCtrlCode('toolbar', 'CONTROL.html').code}<#t>
+      </@ibizindent>
+    </#if>
+  </#if>
+</div>
 </#if>
\ No newline at end of file

@CONTROL/视图布局面板/实体分页导航视图/VIEW.vue.ftl

@@ -4,13 +4,7 @@
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
-<#if view.hasPSControl('toolbar')>
-<@ibizindent blank=8>
-<p slot="extra">
-${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-</p>
-</@ibizindent>
-</#if>
+
     <div class='content-container'>
         <#ibizinclude>
         ../@MACRO/View_Pos_Top_Msgs.vue.ftl

@CONTROL/视图布局面板/实体分页搜索视图/VIEW.vue.ftl

@@ -4,13 +4,7 @@
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
-<#if view.hasPSControl('toolbar')>
-    <@ibizindent blank=8>
-    <p slot="extra">
-    ${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-    </p>
-    </@ibizindent>
-</#if>
+
     <div class="toolbars-container" style=''>
 <#if view.hasPSControl('tabexppanel')>
   <#assign tabexppanel = view.getPSControl('tabexppanel') />

@CONTROL/视图布局面板/实体列表视图/VIEW.vue.ftl

@@ -4,7 +4,7 @@
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+    ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>
 
         <div class='content-container'>

@CONTROL/视图布局面板/实体图表视图 （部件视图）/VIEW.vue.ftl

@@ -4,7 +4,7 @@
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+    ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>
 
         <div class='content-container'>

@CONTROL/视图布局面板/实体图表视图/VIEW.vue.ftl

@@ -4,7 +4,7 @@
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+    ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>
 
         <div class='content-container'>

@CONTROL/视图布局面板/实体日历视图/VIEW.vue.ftl

@@ -4,7 +4,7 @@
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+    ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>
 
         <div class='content-container'>

@CONTROL/视图布局面板/实体树导航视图/VIEW.vue.ftl

@@ -6,13 +6,7 @@
           ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
           </#ibizinclude>
         </@ibizindent>
-<#if view.hasPSControl('toolbar')>
-        <@ibizindent blank=8>
-          <p slot="extra">
-          ${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-          </p>
-        </@ibizindent>
-</#if>
+
         <div class='content-container'>
             <#--  BEGIN：视图顶部视图消息  -->
             <@ibizindent blank=12>

@CONTROL/视图布局面板/实体树视图/VIEW.vue.ftl

@@ -7,13 +7,7 @@
         ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
         </#ibizinclude>
 
-<#if view.hasPSControl('toolbar')>
-<@ibizindent blank=8>
-<p slot="extra">
-${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-</p>
-</@ibizindent>
-</#if>
+
 <#assign MDContent>
 <#--  搜索框: BEGIN  -->
 <#if (view.isEnableQuickSearch())>

@CONTROL/视图布局面板/实体编辑视图（左右关系）/VIEW.vue.ftl

@@ -2,17 +2,18 @@
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
 
+<#if view.hasPSControl('toolbar')>
+  <#assign>
+  <template v-if="Object.is(this.selection.id, 'form')">
+      ${P.getCtrlCode('toolbar', 'CONTROL.html').code}
+  </template>
+  </#assign>
+</#if>
+
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
     
-<#if view.hasPSControl('toolbar')>
-<@ibizindent blank=8>
-<p slot="extra" v-show="Object.is(this.selection.id, 'form')">
-${P.getCtrlCode('toolbar', 'CONTROL.html').code}
-</p>
-</@ibizindent>
-</#if>
         <div class="content-container edit-view2">
 <#if view.hasPSControl('drbar')>
 <@ibizindent blank=8>