Skip to content

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

Merge branch 'dev'

上级 3274b458 3a83b939
隐藏空白字符变更
内嵌 并排
正在显示 包含 60 行增加 和 19 行删除
@CONTROL/列表导航/CONTROL-BASE.vue.ftl
浏览文件 @ 43a05c70
......@@ -6,7 +6,9 @@
<div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
<#if ctrl.isShowTitleBar()>
<div class='list-exp-bar-header'>
<#if ctrl.getTitle() == ''>{{$t('app.listExpBar.title')}}<#else>${ctrl.getTitle()}</#if>
<div class="list-exp-bar-title">
<icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{$t('app.listExpBar.title')}}<#else>${ctrl.getTitle()}</#if>
</div>
</div>
</#if>
<div class="container-header">
......
@CONTROL/列表导航/CONTROL.less.ftl
浏览文件 @ 43a05c70
......@@ -13,8 +13,9 @@
.list-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.list-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
......@@ -85,8 +86,9 @@
.list-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.list-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
......
@CONTROL/卡片视图导航/CONTROL-BASE.vue.ftl
浏览文件 @ 43a05c70
......@@ -6,7 +6,9 @@
<div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
<#if ctrl.isShowTitleBar()>
<div class='dataview-exp-bar-header'>
<div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.dataViewExpBar.title') }}<#else>${ctrl.getTitle()}</#if></div>
<div class="dataview-exp-bar-title">
<icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.dataViewExpBar.title') }}<#else>${ctrl.getTitle()}</#if>
</div>
</div>
</#if>
<div class="container-header">
......
@CONTROL/卡片视图导航/CONTROL.less.ftl
浏览文件 @ 43a05c70
......@@ -13,8 +13,9 @@
.dataview-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.dataview-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
......@@ -23,8 +24,13 @@
}
.container-header{
display: flex;
justify-content: space-between;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.quick-group-container {
padding-top: 8px;
padding-right: 20px;
}
.search-container {
width: 30%;
height: 48px;
......@@ -77,8 +83,9 @@
.dataview-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.dataview-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
......@@ -89,6 +96,7 @@
display: flex;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.search-container {
width: 30%;
height: 48px;
......@@ -100,6 +108,7 @@
padding: 4px;
}
.quick-group-container{
padding-top: 8px;
padding-right: 20px;
}
}
......
@CONTROL/日历导航/CONTROL-BASE.vue.ftl
浏览文件 @ 43a05c70
......@@ -6,7 +6,9 @@
<div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
<#if ctrl.isShowTitleBar()>
<div class='calendar-exp-bar-header'>
<div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.calendarExpBar.title') }}<#else>${ctrl.getTitle()}</#if></div>
<div class="calendar-exp-bar-title">
<icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.calendarExpBar.title') }}<#else>${ctrl.getTitle()}</#if>
</div>
</div>
</#if>
<div class="container-header">
......
@CONTROL/日历导航/CONTROL.less.ftl
浏览文件 @ 43a05c70
......@@ -13,18 +13,24 @@
.calendar-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.calendar-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
}
}
}
}
.container-header{
display: flex;
justify-content: space-between;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.quick-group-container {
padding-top: 8px;
padding-right: 20px;
}
.search-container {
width: 30%;
height: 48px;
......@@ -80,8 +86,9 @@
.calendar-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.calendar-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
......@@ -90,8 +97,13 @@
}
.container-header{
display: flex;
justify-content: space-between;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.quick-group-container {
padding-top: 8px;
padding-right: 20px;
}
.search-container {
width: 30%;
height: 48px;
......
@CONTROL/树视图导航栏/CONTROL-BASE.vue.ftl
浏览文件 @ 43a05c70
......@@ -6,7 +6,9 @@
<div slot='left'>
<#if ctrl.isShowTitleBar()>
<div class='tree-exp-bar-header'>
<div class="tree-exp-bar-title"><#if ctrl.getTitle() == ''>{{ $t('app.treeExpBar.title') }}<#else>${ctrl.getTitle()}</#if></div>
<div class="tree-exp-bar-title">
<icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.treeExpBar.title') }}<#else>${ctrl.getTitle()}</#if>
</div>
<#if ctrl.getPSControls()??>
<#assign controls = ctrl.getPSControls()/>
<#list controls as singleControl>
......
@CONTROL/表格导航/CONTROL-BASE.vue.ftl
浏览文件 @ 43a05c70
......@@ -6,7 +6,9 @@
<div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
<#if ctrl.isShowTitleBar()>
<div class='grid-exp-bar-header'>
<div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.gridBar.title') }}<#else>${ctrl.getTitle()}</#if></div>
<div class="grid-exp-bar-title">
<icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.gridBar.title') }}<#else>${ctrl.getTitle()}</#if>
</div>
</div>
</#if>
<div class="container-header">
......
@CONTROL/表格导航/CONTROL.less.ftl
浏览文件 @ 43a05c70
......@@ -13,8 +13,9 @@
.grid-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
.grid-exp-bar-title {
font-size: 18px;
padding-left: 8px;
i {
font-size: 20px;
margin-top: -2px;
......@@ -23,8 +24,13 @@
}
.container-header{
display: flex;
justify-content: space-between;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.quick-group-container {
padding-top: 8px;
padding-right: 20px;
}
.search-container {
width: 30%;
height: 48px;
......@@ -98,6 +104,7 @@
display: flex;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.search-container {
width: 30%;
height: 48px;
......@@ -109,6 +116,7 @@
padding: 4px;
}
.quick-group-container {
padding-top: 8px;
padding-right: 20px;
}
}
......
@EDITOR/图片控件（磁盘图片）/EDITOR.vue.ftl
浏览文件 @ 43a05c70
......@@ -3,8 +3,8 @@
formItemName="${item.name}"
:value="data.${item.name}"
:formState="formState"
folder=<#if item.getEditorParam("folder",'') != ''>"'${item.getEditorParam("folder",'')}'"<#else>"${ctrl.getPSDataEntity().getCodeName()?lower_case}"</#if>
ownertype=<#if item.getEditorParam("ownerType",'') != ''>"'${item.getEditorParam("ownerType",'')}'"<#else>"${item.name}"</#if>
folder=<#if item.getEditorParam("folder",'') != ''>"${item.getEditorParam("folder",'')}"<#else>"${ctrl.getPSDataEntity().getCodeName()?lower_case}"</#if>
ownertype=<#if item.getEditorParam("ownerType",'') != ''>"${item.getEditorParam("ownerType",'')}"<#else>"${item.name}"</#if>
:ownerid=<#if item.getEditorParam("ownerid",'') != ''>"'${item.getEditorParam("ownerid",'')}'"<#else>"data.srfkey"</#if>
:show-ocrview=<#if item.getEditorParam("showOcrview",'') != ''>"${item.getEditorParam("showOcrview",'')}"<#else>"false"</#if>
:show-preview=<#if item.getEditorParam("showPreview",'') != ''>"${item.getEditorParam("showPreview",'')}"<#else>"false"</#if>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或