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

update:更新

上级 b3abdc61
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-menu <el-menu
:mode="menuDir" :mode="menuDir"
:default-openeds="defaultOpeneds" :default-openeds="defaultOpeneds"
:default-active="items[0].id" :default-active="selection ? selection.id : ''"
@select="onSelect" @select="onSelect"
@open="onOpen" @open="onOpen"
@close="onClose"> @close="onClose">
...@@ -194,10 +194,6 @@ ...@@ -194,10 +194,6 @@
} }
}); });
} }
this.$nextTick(() => {
this.onSelect(this.items[0].id)
this.$emit('selectionchange', [this.items[0]]);
});
} }
/** /**
......
...@@ -2,24 +2,20 @@ ...@@ -2,24 +2,20 @@
height: 100%; height: 100%;
width: 100%; width: 100%;
background: white; background: white;
>.ivu-layout-sider { > .el-menu {
background: white;
border-right: solid 1px #e6e6e6;
margin-bottom: 10px;
>.ivu-layout-sider-children {
overflow: auto;
>.el-menu {
height: 100%; height: 100%;
border-right: solid 0px #e6e6e6; border-right: solid 0px #e6e6e6;
} }
> .el-menu { > .el-menu {
margin-top: -1px; margin-top: -1px;
border-right: 0; border-right: 0;
.el-submenu__title i, .el-menu-item i { .el-submenu__title i,
.el-menu-item i {
font-size: 14px; font-size: 14px;
width: 14px; width: 14px;
} }
.el-menu-item, .el-submenu__title { .el-menu-item,
.el-submenu__title {
height: 36px; height: 36px;
font-size: 14px; font-size: 14px;
line-height: 32px; line-height: 32px;
...@@ -30,14 +26,16 @@ ...@@ -30,14 +26,16 @@
margin-right: 5px; margin-right: 5px;
} }
} }
.el-menu-item, .el-submenu, .el-menu { .el-menu-item,
.el-submenu,
.el-menu {
border-top: 1px solid #fff; border-top: 1px solid #fff;
} }
.el-menu-item, .el-submenu > .el-submenu__title { .el-menu-item,
.el-submenu > .el-submenu__title {
height: 40px; height: 40px;
line-height: 36px; line-height: 36px;
border-left: 3px solid transparent; border-left: 3px solid transparent;
padding-left: 16px !important;
} }
.el-menu-item.is-active { .el-menu-item.is-active {
background: #e9e9e9 !important; background: #e9e9e9 !important;
...@@ -52,12 +50,14 @@ ...@@ -52,12 +50,14 @@
// } // }
> .el-submenu { > .el-submenu {
> .el-menu { > .el-menu {
> .el-menu-item, > .el-submenu > .el-submenu__title { > .el-menu-item,
> .el-submenu > .el-submenu__title {
padding-left: 38px !important; padding-left: 38px !important;
} }
> .el-submenu { > .el-submenu {
> .el-menu { > .el-menu {
> .el-menu-item, > .el-submenu > .el-submenu__title { > .el-menu-item,
> .el-submenu > .el-submenu__title {
padding-left: 58px !important; padding-left: 58px !important;
} }
} }
...@@ -65,18 +65,7 @@ ...@@ -65,18 +65,7 @@
} }
} }
} }
}
}
>content {
height: 100%;
.main-data {
width: 100%;
height: 100%;
padding: 0 15px;
}
}
} }
<#ibizinclude> <#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl ../@MACRO/CSS/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
...@@ -4,19 +4,25 @@ ...@@ -4,19 +4,25 @@
right: 0px; right: 0px;
} }
} }
.edit-view2-drbar__caption {
height: 40px;
line-height: 40px;
padding-left: 20px;
background: #fff;
color: #303133;
border-left: 3px solid #fff;
}
.edit-view2 { .edit-view2-drbar__caption.is-active {
flex-direction: row !important; background: #e9e9e9;
overflow: auto; color: #666666;
.view-form { border-left: 3px solid #3fd5c0;
overflow: auto;
}
} }
.${srffilepath2(view.getCodeName())}{ .edit-view2-drbar {
> .view-card > .ivu-card-body{ .app-dr-bar {
display: flex; height: calc(100% - 40px);
flex-direction: column; padding: 0;
} }
} }
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
</#ibizinclude> </#ibizinclude>
</@ibizindent> </@ibizindent>
<#-- END:视图内容区视图消息 --> <#-- END:视图内容区视图消息 -->
<layout class="content-container edit-view2"> <div class="content-container">
<layout class="edit-view2">
<sider class="edit-view2-drbar" :width="<#if view.hasPSControl('drbar') && view.getPSControl('drbar').getWidth?? && view.getPSControl('drbar').getWidth()?? && view.getPSControl('drbar').getWidth() gt 240>${view.getPSControl('drbar').getWidth()?c}<#else>240</#if>"> <sider class="edit-view2-drbar" :width="<#if view.hasPSControl('drbar') && view.getPSControl('drbar').getWidth?? && view.getPSControl('drbar').getWidth()?? && view.getPSControl('drbar').getWidth() gt 240>${view.getPSControl('drbar').getWidth()?c}<#else>240</#if>">
<#if view.hasPSControl('drbar') && view.hasPSControl('form')> <#if view.hasPSControl('drbar') && view.hasPSControl('form')>
<div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange"> <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
</component> </component>
</content> </content>
</layout> </layout>
</div>
<#-- BEGIN:视图底部视图消息 --> <#-- BEGIN:视图底部视图消息 -->
<@ibizindent blank=8> <@ibizindent blank=8>
<#ibizinclude> <#ibizinclude>
......
...@@ -26,6 +26,12 @@ ...@@ -26,6 +26,12 @@
*/ */
public formData:any = {}; public formData:any = {};
/**
* 关系栏变化
*
* @type {*}
* @memberof ${srfclassname('${view.name}')}Base
*/
public drBarChange() { public drBarChange() {
if (this.engine) { if (this.engine) {
this.engine.drBarSelectionChange({ id: 'form' }); this.engine.drBarSelectionChange({ id: 'form' });
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册