提交 8d306da1 编写于 作者: Mosher's avatar Mosher

update:更新

上级 933f3811
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
} }
} }
.exp-bar-action-container { .exp-bar-action-container {
display: flex;
align-items: center;
}
.container-header{
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
......
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
} }
} }
.exp-bar-action-container { .exp-bar-action-container {
display: flex;
align-items: center;
}
.container-header{
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
......
...@@ -4,22 +4,15 @@ ...@@ -4,22 +4,15 @@
<#else> <#else>
<div id="${ctrl.getCodeName()?lower_case}" class='app-tree-exp-bar<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>'> <div id="${ctrl.getCodeName()?lower_case}" class='app-tree-exp-bar<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>'>
<#if ctrl.isShowTitleBar()> <#if ctrl.isShowTitleBar()>
<div class='tree-exp-bar-header'> <div class='tree-exp-bar-header'>
<div class="tree-exp-bar-title"> <div class="tree-exp-bar-title">
<icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>{{ $t('app.treeExpBar.title') }}<#else>${ctrl.getTitle()}</#if> <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>
<#if singleControl.getControlType() == "TOOLBAR">
${P.getCtrlCode(singleControl, 'CONTROL.html').code}
</#if>
</#list>
</#if>
</div> </div>
</div>
</#if> </#if>
<div class="exp-bar-action-container">
<#if ctrl.isEnableSearch()> <#if ctrl.isEnableSearch()>
<div class='search-content'> <div class='search-container'>
<i-input <i-input
v-model="srfnodefilter" v-model="srfnodefilter"
:search="true" :search="true"
...@@ -27,7 +20,16 @@ ...@@ -27,7 +20,16 @@
@on-search="onSearch"> @on-search="onSearch">
</i-input> </i-input>
</div> </div>
<#if ctrl.getPSControls()??>
<#assign controls = ctrl.getPSControls()/>
<#list controls as singleControl>
<#if singleControl.getControlType() == "TOOLBAR">
${P.getCtrlCode(singleControl, 'CONTROL.html').code}
</#if>
</#list>
</#if>
</#if> </#if>
</div>
<div class='tree-exp-content'> <div class='tree-exp-content'>
<#if ctrl.getPSDETree()??><#t> <#if ctrl.getPSDETree()??><#t>
<#assign tree = ctrl.getPSDETree()/> <#assign tree = ctrl.getPSDETree()/>
......
.app-tree-exp-bar { .app-tree-exp-bar {
> .ivu-split-horizontal { height: 100%;
> .ivu-split-trigger-con { display: flex;
height: 100%; flex-direction: column;
width: 1px; .tree-exp-bar-header {
} line-height: 50px;
> .ivu-split-pane { border-bottom: 1px solid #ddd;
> div { .tree-exp-bar-title {
height: 100%; font-size: 18px;
overflow-y: auto; padding-left: 8px;
overflow-x: hidden; i {
display: flex; font-size: 20px;
flex-direction: column; margin-top: -2px;
.tree-exp-bar-header { }
line-height: 50px; }
border-bottom: 1px solid #ddd; }
display: flex; .exp-bar-action-container {
justify-content: space-between; display: flex;
.tree-exp-bar-title { justify-content: flex-start;
font-size: 18px; align-items: center;
padding-left: 8px; flex-wrap: wrap;
flex-shrink: 0; .search-container {
i { width: 30%;
font-size: 20px; height: 48px;
margin-top: -2px; padding: 10px 10px 10px 0;
} min-width: 200px;
} max-width: 400px;
.toolbar-container{ }
margin-left: auto; .toolbar-container{
margin-right: 10px; padding: 4px;
display: flex; }
flex-wrap: wrap; .quick-group-container {
align-items: center; padding-top: 8px;
.ivu-badge-count{ padding-right: 20px;
top: 2px; }
} }
} .tree-exp-bar-content {
} flex-grow: 1;
.search-content { overflow: auto;
width: 100%; }
height: 48px; }
padding: 10px 5px 10px 5px;
} <#ibizinclude>
.tree-exp-content { ../@MACRO/CSS/DEFAULT.less.ftl
<#-- 计算高度 -->
<#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
height: calc(100% - 88px);
<#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
height: calc(100% - 40px);
<#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
height: calc(100% - 38px);
<#else>
height: 100%;
</#if>
overflow: auto;
padding: 16px 0;
margin-bottom: 10px;
}
.tree-exp-content2 {
height: 100%;
overflow: auto;
flex-grow: 1;
}
}
}
> .right-pane.ivu-split-pane {
> div {
padding-left: 10px;
}
}
> .left-pane.ivu-split-pane {
padding-right: 10px;
}
}
}
<#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
} }
} }
.exp-bar-action-container { .exp-bar-action-container {
display: flex;
align-items: center;
}
.container-header{
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
......
${P.getLayoutCode().code} <#if view.getPSViewLayoutPanel()?? && view.getPSViewLayoutPanel().isUseDefaultLayout()>
\ No newline at end of file ${P.getLayoutCode().code}
<#else>
.${srffilepath2(view.getCodeName())} {
display: block;
}
</#if>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册