Merge branch 'dev'

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

@@ -3,15 +3,8 @@
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION.vue.ftl
+    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
-
-<#if view.hasPSControl('toolbar')>
-<#assign toolbarCtrl = view.getPSControl('toolbar')>
-<@ibizindent blank=8>
-${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
-</@ibizindent>
-</#if>
 <#--  BEGIN：视图顶部视图消息  -->
 <@ibizindent blank=8>
 <#ibizinclude>

@EDITOR/用户自定义(动态配置AvueForm)/EDITOR.vue.ftl

-<avue-custom-form :isSubForm="<#if editor.getEditorParam('isSubForm','') != ''>true<#else>false</#if>" :isParseString="<#if editor.getEditorParam('isParseString','') != ''>true<#else>false</#if>" :isFormData="<#if editor.getEditorParam('isFormData','') != ''>true<#else>false</#if>" <#if editor.getEditorParam('options','') != ''>:options="${editor.getEditorParam('options','')}"</#if> v-model="data.${editor.name}" :formData="data" <#if editor.getEditorParam('url','') != ''>:url="${editor.getEditorParam('url','')}"</#if> :formState="formState"></avue-custom-form>
\ No newline at end of file
+<avue-custom-form :isSubForm="<#if editor.getEditorParam('isSubForm','') != ''>${editor.getEditorParam('isSubForm','')}<#else>false</#if>" :isParseString="<#if editor.getEditorParam('isParseString','') != ''>${editor.getEditorParam('isParseString','')}<#else>false</#if>" :isFormData="<#if editor.getEditorParam('isFormData','') != ''>${editor.getEditorParam('isFormData','')}<#else>false</#if>" <#if editor.getEditorParam('options','') != ''>:options='${editor.getEditorParam('options','')}'</#if> v-model="data.${editor.name}" :formData="data" <#if editor.getEditorParam('url','') != ''>:url="${editor.getEditorParam('url','')}"</#if> :formState="formState"></avue-custom-form>
\ No newline at end of file