update：更新

55f29b6a · Mosher · 89ea9d11 · 55f29b6a · 55f29b6a · 55f29b6a
--- a/@CONTROL/数据关系分页部件/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/数据关系分页部件/CONTROL-BASE.vue.ftl
--- a/@CONTROL/视图布局面板/@MACRO/EDIT3.vue.ftl
+++ b/@CONTROL/视图布局面板/@MACRO/EDIT3.vue.ftl
-<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction :viewTitle="$t(model.srfCaption)" 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 selfToolbarRender>
-  <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>
-
-<#--  BEGIN：视图顶部视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-./View_Pos_Top_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图顶部视图消息  -->
-        <div class="content-container">
-<#--  BEGIN：视图内容区视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-./View_Pos_Body_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图内容区视图消息  -->
-<#if view.hasPSControl('drtab')>
-<@ibizindent blank=8>
-    ${P.getCtrlCode('drtab', 'CONTROL.html').code}
-</@ibizindent>
-</#if>
-        </div>
-<#--  BEGIN：视图底部视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-./View_Pos_Bottom_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图底部视图消息  -->
-    </card>
-</div>
+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
+    <app-studioaction :viewTitle="$t(model.srfCaption)" 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 selfToolbarRender>
+  <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>
+<#--  BEGIN：视图顶部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+./View_Pos_Top_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图顶部视图消息  -->
+        <div class="content-container">
+        <#--  BEGIN：视图内容区视图消息  -->
+            <@ibizindent blank=8>
+            <#ibizinclude>
+            ./View_Pos_Body_Msgs.vue.ftl
+            </#ibizinclude>
+            </@ibizindent>
+            <#--  END：视图内容区视图消息  -->
+            <div class="edit-view3">
+                <div class="edit-view3-drheader">
+                    <span :class="{ 'dr-tab-item': true, 'is-active': drItem && drItem.id !== 'form' }" @click="handleDrTabChange"><#if view.getPSControl('drtab').getEditItemCaption?? && view.getPSControl('drtab').getEditItemCaption()??>${view.getPSControl('drtab').getEditItemCaption()}</#if></span>
+                    <#if view.hasPSControl('drtab')>
+                        <@ibizindent blank=8>
+                            ${P.getCtrlCode('drtab', 'CONTROL.html').code}
+                        </@ibizindent>
+                    </#if>
+                </div>
+                <div class="edit-view3-content">
+                    <div class="edit-view3-content__form" :style="drItem && drItem.id !== 'form' ? 'display: none;' : ''">
+                        <#if view.hasPSControl('form')>
+                            <@ibizindent blank=8>
+                                ${P.getCtrlCode('form', 'CONTROL.html').code}
+                            </@ibizindent>
+                        </#if>
+                    </div>
+                    <component
+                        class="view-container2"
+                        v-if="drItem && drItem.id && drItem.id !== 'form'"
+                        :is="drItem.navView"
+                        :viewDefaultUsage="false"
+                        :viewdata="JSON.stringify(drItem.srfnavdata.context)"
+                        :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
+                    </component>
+                </div>
+            </div>
+        </div>
+<#--  BEGIN：视图底部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+./View_Pos_Bottom_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图底部视图消息  -->
+    </card>
+</div>
--- a/@CONTROL/视图布局面板/实体编辑视图（上下关系）/VIEW.vue.ftl
+++ b/@CONTROL/视图布局面板/实体编辑视图（上下关系）/VIEW.vue.ftl
-<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction :viewTitle="$t(model.srfCaption)" 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>' :disHover="true" :padding="0" :bordered="false">
-
-    <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
-    </#ibizinclude>
-<#--  BEGIN：视图顶部视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-../@MACRO/View_Pos_Top_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图顶部视图消息  -->
-        <div class="content-container">
-<#--  BEGIN：视图内容区视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-../@MACRO/View_Pos_Body_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图内容区视图消息  -->
-<#if view.hasPSControl('form')>
-<@ibizindent blank=8>
-${P.getCtrlCode('form', 'CONTROL.html').code}
-</@ibizindent>
-</#if>        
-<#if view.getAllPSControls()??>
-<#list view.getAllPSControls() as ctrl>
-<#if ctrl.getControlType() != "TOOLBAR" && ctrl.getControlType() != "FORM">
-<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
-<@ibizindent blank=12>
-${P.getCtrlCode(ctrl, 'CONTROL.html').code}
-</@ibizindent>
-</#if>
-</#if>
-</#list>
-</#if>
-        </div>
-<#--  BEGIN：视图底部视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图底部视图消息  -->
-    </card>
+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
+    <app-studioaction :viewTitle="$t(model.srfCaption)" 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>' :disHover="true" :padding="0" :bordered="false">
+
+    <#ibizinclude>
+    ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+    </#ibizinclude>
+<#--  BEGIN：视图顶部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+../@MACRO/View_Pos_Top_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图顶部视图消息  -->
+        <div class="content-container">
+        <#--  BEGIN：视图内容区视图消息  -->
+            <@ibizindent blank=8>
+            <#ibizinclude>
+            ./View_Pos_Body_Msgs.vue.ftl
+            </#ibizinclude>
+            </@ibizindent>
+            <#--  END：视图内容区视图消息  -->
+            <div class="edit-view4">
+                <div class="edit-view4-form">
+                    <#if view.hasPSControl('form')>
+                        <@ibizindent blank=8>
+                            ${P.getCtrlCode('form', 'CONTROL.html').code}
+                        </@ibizindent>
+                    </#if>
+                    
+                </div>
+                <div class="edit-view4-content">
+                    <#if view.hasPSControl('drtab')>
+                        <@ibizindent blank=8>
+                            ${P.getCtrlCode('drtab', 'CONTROL.html').code}
+                        </@ibizindent>
+                    </#if>
+                    <component
+                        class="view-container2"
+                        v-if="drItem && !drItem.disabled"
+                        :is="drItem.navView"
+                        :viewDefaultUsage="false"
+                        :viewdata="JSON.stringify(drItem.srfnavdata.context)"
+                        :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
+                    </component>
+                </div>
+            </div>
+        </div>
+<#--  BEGIN：视图底部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图底部视图消息  -->
+    </card>
 </div>
\ No newline at end of file
--- a/@VIEW/@MACRO/EDIT_VIEW3-BASE.vue.ftl
+++ b/@VIEW/@MACRO/EDIT_VIEW3-BASE.vue.ftl
-<#ibizinclude>
-./LAYOUTPANEL_VIEW.template.ftl
-</#ibizinclude>
-
-<#ibizinclude>
-./VIEW_HEADER-BASE.vue.ftl
-</#ibizinclude>
-
-<#ibizinclude>
-./VIEW_CONTENT-BASE.vue.ftl
-</#ibizinclude>
-
-    /**
-     * 选中数据
-     *
-     * @type {*}
-     * @memberof ${srfclassname('${view.name}')}Base
-     */
-    public selection: any = {};
-    
-<#ibizinclude>
-./VIEW_BOTTOM-BASE.vue.ftl
-</#ibizinclude>
-
-<#ibizinclude>
-./VIEW-BASE.style.ftl
+<#ibizinclude>
+./LAYOUTPANEL_VIEW.template.ftl
+</#ibizinclude>
+
+<#ibizinclude>
+./VIEW_HEADER-BASE.vue.ftl
+</#ibizinclude>
+
+<#ibizinclude>
+./VIEW_CONTENT-BASE.vue.ftl
+</#ibizinclude>
+
+    /**
+     * 选中数据
+     *
+     * @type {*}
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public drItem: any = {};
+
+    /**
+     * 处理分页项变化
+     *
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public handleDrTabChange() {
+        
+    }
+    
+<#ibizinclude>
+./VIEW_BOTTOM-BASE.vue.ftl
+</#ibizinclude>
+
+<#ibizinclude>
+./VIEW-BASE.style.ftl
 </#ibizinclude>
\ No newline at end of file
--- a/@VIEW/实体编辑视图（上下关系）/VIEW-BASE.vue.ftl
+++ b/@VIEW/实体编辑视图（上下关系）/VIEW-BASE.vue.ftl
-<#assign self_content>
-
-    /**
-     * 选中数据
-     *
-     * @type {*}
-     * @memberof ${srfclassname('${view.name}')}Base
-     */
-    public selection: any = {};
-   
-</#assign>
-
-<#ibizinclude>
-../@MACRO/VIEW-BASE.vue.ftl
+<#assign self_content>
+
+    /**
+     * 选中数据
+     *
+     * @type {*}
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public drItem: any = {};
+   
+</#assign>
+
+<#ibizinclude>
+../@MACRO/VIEW-BASE.vue.ftl
 </#ibizinclude>
\ No newline at end of file