Skip to content

iBiz-Vue-R7
iBiz-Vue-R7
提交 c75066e2 编写于 作者: ShineKOT's avatar ShineKOT
浏览文件
操作

feat: 更新编辑视图类工具栏

上级 33a5611f
隐藏空白字符变更
内嵌 并排
正在显示 包含 164 行增加 和 49 行删除
@CONTROL/视图布局面板/@MACRO/EDIT.vue.ftl
浏览文件 @ c75066e2
...@@ -49,15 +49,9 @@ ${P.getCtrlCode('form', 'CONTROL.html').code} ...@@ -49,15 +49,9 @@ ${P.getCtrlCode('form', 'CONTROL.html').code}
<#-- BEGIN: 编辑视图工具栏 --> <#-- BEGIN: 编辑视图工具栏 -->
<#if view.hasPSControl('toolbar')> <#if view.hasPSControl('toolbar')>
<#if selfToolbarRender??>
<@ibizindent blank=4>
${selfToolbarRender}<#t>
</@ibizindent>
<#else>
<@ibizindent blank=4> <@ibizindent blank=4>
${P.getCtrlCode('toolbar', 'CONTROL.html').code}<#t> ${P.getCtrlCode('toolbar', 'CONTROL.html').code}<#t>
</@ibizindent> </@ibizindent>
</#if>
<#else> <#else>
<div class='toolbar-container'> <div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
......
@CONTROL/视图布局面板/@MACRO/EDIT3.vue.ftl
浏览文件 @ c75066e2
<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>"> <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> <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"> <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.isShowCaptionBar()>
<#if view.hasPSControl('toolbar')> <div slot='title' class="header-container">
<#assign selfToolbarRender> <#if view.isShowCaptionBar()>
<template v-if="Object.is(this.selection.id, 'form')"> <#if view.getPSSysImage()??>
${P.getCtrlCode('toolbar', 'CONTROL.html').code} <#assign viewimg = view.getPSSysImage()/>
</template> <#if viewimg.getImagePath() != ''>
</#assign> <span class='caption-image'><i class='${viewimg.getCssClass()}'></i></span>
</#if> <#else>
<span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
<#ibizinclude> </#if>
./VIEW_CAPTION_DATAINFO.vue.ftl </#if>
</#ibizinclude> <span class='caption-info'>{{$t(model.srfCaption)}}</span>
</#if>
</div>
</#if>
<#-- BEGIN：视图顶部视图消息 --> <#-- BEGIN：视图顶部视图消息 -->
<@ibizindent blank=8> <@ibizindent blank=8>
...@@ -42,5 +45,24 @@ ...@@ -42,5 +45,24 @@
</#ibizinclude> </#ibizinclude>
</@ibizindent> </@ibizindent>
<#-- END：视图底部视图消息 --> <#-- END：视图底部视图消息 -->
<#-- BEGIN: 编辑视图工具栏 -->
<#if view.hasPSControl('toolbar')>
<@ibizindent blank=4>
<template v-if="Object.is(this.selection.id, 'form')">
${P.getCtrlCode('toolbar', 'CONTROL.html').code}
</template>
</@ibizindent>
<#else>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button @click="onClose($event)">
<i class='fa fa-sign-out'></i>
<span class='caption'>{{$t('app.commonWords.close')}}</span>
</i-button>
<div slot='content'>{{$t('app.commonWords.close')}}</div>
</tooltip>
</div>
</#if>
<#-- END: 编辑视图工具栏 -->
</card> </card>
</div> </div>
@CONTROL/视图布局面板/@MACRO/View_Pos_Body_Msgs.vue.ftl
浏览文件 @ c75066e2
<div class='view-body-messages'>
<#if view.getPSViewMsgGroup()??> <#if view.getPSViewMsgGroup()??>
<div class='view-body-messages'>
<#assign viewMsgGroup = view.getPSViewMsgGroup()/> <#assign viewMsgGroup = view.getPSViewMsgGroup()/>
<#compress> <#compress>
<#if viewMsgGroup.getCodeName()??> <#if viewMsgGroup.getCodeName()??>
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
<app-alert-group position='BODY' :context="context" :viewparam="viewparams" infoGroup='${viewMsgGroup.getName()}' viewname='${view.getCodeName()?lower_case}'></app-alert-group> <app-alert-group position='BODY' :context="context" :viewparam="viewparams" infoGroup='${viewMsgGroup.getName()}' viewname='${view.getCodeName()?lower_case}'></app-alert-group>
</#if> </#if>
</#compress> </#compress>
</#if> </div>
</div> </#if>
\ No newline at end of file \ No newline at end of file
@CONTROL/视图布局面板/@MACRO/View_Pos_Bottom_Msgs.vue.ftl
浏览文件 @ c75066e2
<div class='view-bottom-messages'>
<#if view.getPSViewMsgGroup()??> <#if view.getPSViewMsgGroup()??>
<div class='view-bottom-messages'>
<#assign viewMsgGroup = view.getPSViewMsgGroup()/> <#assign viewMsgGroup = view.getPSViewMsgGroup()/>
<#compress> <#compress>
<#if viewMsgGroup.getCodeName()??> <#if viewMsgGroup.getCodeName()??>
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
<app-alert-group position='BOTTOM' :context="context" :viewparam="viewparams" infoGroup='${viewMsgGroup.getName()}' viewname='${view.getCodeName()?lower_case}'></app-alert-group> <app-alert-group position='BOTTOM' :context="context" :viewparam="viewparams" infoGroup='${viewMsgGroup.getName()}' viewname='${view.getCodeName()?lower_case}'></app-alert-group>
</#if> </#if>
</#compress> </#compress>
</#if> </div>
</div> </#if>
\ No newline at end of file \ No newline at end of file
@CONTROL/视图布局面板/@MACRO/View_Pos_Top_Msgs.vue.ftl
浏览文件 @ c75066e2
<div class='view-top-messages'>
<#if view.getPSViewMsgGroup()??> <#if view.getPSViewMsgGroup()??>
<div class='view-top-messages'>
<#assign viewMsgGroup = view.getPSViewMsgGroup()/> <#assign viewMsgGroup = view.getPSViewMsgGroup()/>
<#compress> <#compress>
<#if viewMsgGroup.getCodeName()??> <#if viewMsgGroup.getCodeName()??>
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
<app-alert-group position='TOP' :context="context" :viewparam="viewparams" infoGroup='${viewMsgGroup.getName()}' viewname='${view.getCodeName()?lower_case}'></app-alert-group> <app-alert-group position='TOP' :context="context" :viewparam="viewparams" infoGroup='${viewMsgGroup.getName()}' viewname='${view.getCodeName()?lower_case}'></app-alert-group>
</#if> </#if>
</#compress> </#compress>
</#if> </div>
</div> </#if>
\ No newline at end of file \ No newline at end of file
@CONTROL/视图布局面板/实体工作流编辑视图/VIEW.less.ftl
浏览文件 @ c75066e2
...@@ -4,7 +4,15 @@ ...@@ -4,7 +4,15 @@
right: 0px; right: 0px;
} }
} }
.dewfeditview {
>.view-card >.ivu-card-body >.toolbar-container {
display: flex;
justify-content: center;
}
>.view-card.view-no-caption >.ivu-card-body {
height: 100%;
}
}
<#ibizinclude> <#ibizinclude>
../@MACRO/DEFAULT.less.ftl ../@MACRO/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
@CONTROL/视图布局面板/实体编辑视图/VIEW.less.ftl
浏览文件 @ c75066e2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
right: 0px; right: 0px;
} }
} }
.deeditview, .deeditview9{ .deeditview {
>.view-card >.ivu-card-body >.toolbar-container { >.view-card >.ivu-card-body >.toolbar-container {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
@CONTROL/视图布局面板/实体编辑视图（上下关系）/VIEW.less.ftl
浏览文件 @ c75066e2
<#ibizinclude> <#ibizinclude>
../@MACRO/DEFAULT.less.ftl ../@MACRO/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
.deeditview4 {
>.view-card >.ivu-card-body >.toolbar-container {
display: flex;
justify-content: center;
}
>.view-card.view-no-caption >.ivu-card-body {
height: 100%;
}
}
.view-container.${srffilepath2(view.getCodeName())} > .view-card > .ivu-card-body > .content-container { .view-container.${srffilepath2(view.getCodeName())} > .view-card > .ivu-card-body > .content-container {
height: calc(100% - 30px); height: calc(100% - 30px);
} }
\ No newline at end of file
@CONTROL/视图布局面板/实体编辑视图（上下关系）/VIEW.vue.ftl
浏览文件 @ c75066e2
...@@ -2,9 +2,21 @@ ...@@ -2,9 +2,21 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction> <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"> <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> <#if view.isShowCaptionBar()>
../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl <div slot='title' class="header-container">
</#ibizinclude> <#if view.isShowCaptionBar()>
<#if view.getPSSysImage()??>
<#assign viewimg = view.getPSSysImage()/>
<#if viewimg.getImagePath() != ''>
<span class='caption-image'><i class='${viewimg.getCssClass()}'></i></span>
<#else>
<span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
</#if>
</#if>
<span class='caption-info'>{{$t(model.srfCaption)}}</span>
</#if>
</div>
</#if>
<#-- BEGIN：视图顶部视图消息 --> <#-- BEGIN：视图顶部视图消息 -->
<@ibizindent blank=8> <@ibizindent blank=8>
<#ibizinclude> <#ibizinclude>
...@@ -44,5 +56,22 @@ ${P.getCtrlCode(ctrl, 'CONTROL.html').code} ...@@ -44,5 +56,22 @@ ${P.getCtrlCode(ctrl, 'CONTROL.html').code}
</#ibizinclude> </#ibizinclude>
</@ibizindent> </@ibizindent>
<#-- END：视图底部视图消息 --> <#-- END：视图底部视图消息 -->
<#-- BEGIN: 编辑视图工具栏 -->
<#if view.hasPSControl('toolbar')>
<@ibizindent blank=4>
${P.getCtrlCode('toolbar', 'CONTROL.html').code}<#t>
</@ibizindent>
<#else>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button @click="onClose($event)">
<i class='fa fa-sign-out'></i>
<span class='caption'>{{$t('app.commonWords.close')}}</span>
</i-button>
<div slot='content'>{{$t('app.commonWords.close')}}</div>
</tooltip>
</div>
</#if>
<#-- END: 编辑视图工具栏 -->
</card> </card>
</div> </div>
\ No newline at end of file
@CONTROL/视图布局面板/实体编辑视图（分页关系）/VIEW.less.ftl
浏览文件 @ c75066e2
...@@ -4,7 +4,15 @@ ...@@ -4,7 +4,15 @@
right: 0px; right: 0px;
} }
} }
.deeditview3{
>.view-card >.ivu-card-body >.toolbar-container {
display: flex;
justify-content: center;
}
>.view-card.view-no-caption >.ivu-card-body {
height: 100%;
}
}
<#ibizinclude> <#ibizinclude>
../@MACRO/DEFAULT.less.ftl ../@MACRO/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
@CONTROL/视图布局面板/实体编辑视图（左右关系）/VIEW.less.ftl
浏览文件 @ c75066e2
...@@ -12,7 +12,15 @@ ...@@ -12,7 +12,15 @@
overflow: auto; overflow: auto;
} }
} }
.deeditview2 {
>.view-card >.ivu-card-body >.toolbar-container {
display: flex;
justify-content: center;
}
>.view-card.view-no-caption >.ivu-card-body {
height: 100%;
}
}
.${srffilepath2(view.getCodeName())}{ .${srffilepath2(view.getCodeName())}{
> .view-card > .ivu-card-body{ > .view-card > .ivu-card-body{
display: flex; display: flex;
......
@CONTROL/视图布局面板/实体编辑视图（左右关系）/VIEW.vue.ftl
浏览文件 @ c75066e2
...@@ -8,16 +8,21 @@ ...@@ -8,16 +8,21 @@
</#ibizinclude> </#ibizinclude>
</@ibizindent> </@ibizindent>
<#-- END：视图顶部视图消息 --> <#-- END：视图顶部视图消息 -->
<#if view.hasPSControl('toolbar')> <#if view.isShowCaptionBar()>
<#assign selfToolbarRender> <div slot='title' class="header-container">
<template v-if="Object.is(this.selection.id, 'form')"> <#if view.isShowCaptionBar()>
${P.getCtrlCode('toolbar', 'CONTROL.html').code} <#if view.getPSSysImage()??>
</template> <#assign viewimg = view.getPSSysImage()/>
</#assign> <#if viewimg.getImagePath() != ''>
</#if> <span class='caption-image'><i class='${viewimg.getCssClass()}'></i></span>
<#ibizinclude> <#else>
../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
</#ibizinclude> </#if>
</#if>
<span class='caption-info'>{{$t(model.srfCaption)}}</span>
</#if>
</div>
</#if>
<div class="content-container edit-view2"> <div class="content-container edit-view2">
<#-- BEGIN：视图内容区视图消息 --> <#-- BEGIN：视图内容区视图消息 -->
<@ibizindent blank=8> <@ibizindent blank=8>
...@@ -39,5 +44,24 @@ ...@@ -39,5 +44,24 @@
</#ibizinclude> </#ibizinclude>
</@ibizindent> </@ibizindent>
<#-- END：视图底部视图消息 --> <#-- END：视图底部视图消息 -->
<#-- BEGIN: 编辑视图工具栏 -->
<#if view.hasPSControl('toolbar')>
<@ibizindent blank=4>
<template v-if="Object.is(this.selection.id, 'form')">
${P.getCtrlCode('toolbar', 'CONTROL.html').code}
</template>
</@ibizindent>
<#else>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button @click="onClose($event)">
<i class='fa fa-sign-out'></i>
<span class='caption'>{{$t('app.commonWords.close')}}</span>
</i-button>
<div slot='content'>{{$t('app.commonWords.close')}}</div>
</tooltip>
</div>
</#if>
<#-- END: 编辑视图工具栏 -->
</card> </card>
</div> </div>
\ No newline at end of file
@CONTROL/视图布局面板/实体编辑视图（部件视图）/VIEW.less.ftl
浏览文件 @ c75066e2
...@@ -4,7 +4,15 @@ ...@@ -4,7 +4,15 @@
right: 0px; right: 0px;
} }
} }
.deeditview9{
>.view-card >.ivu-card-body >.toolbar-container {
display: flex;
justify-content: center;
}
>.view-card.view-no-caption >.ivu-card-body {
height: 100%;
}
}
<#ibizinclude> <#ibizinclude>
../@MACRO/DEFAULT.less.ftl ../@MACRO/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或