Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/ModelMain.vue
master
修宁 7 months ago
parent
commit
36764fce17
  1. 23
      src/views/ModelMain.less
  2. 57
      src/views/ModelMain.vue

23
src/views/ModelMain.less

@ -116,6 +116,29 @@
line-height: 35px; line-height: 35px;
padding:0 0 0 10px; padding:0 0 0 10px;
font-size: 14px; font-size: 14px;
position: relative;
display: flex;
&>.el-input{
flex:1;
margin:4px 30px 4px 10px;
}
.close{
position: absolute;
right:0;
display: inline-flex;
padding:10px;
cursor:pointer;
&:hover{
color:var(--el-color-primary)
}
}
}
}
.section-bottom{
.section-item-wrap{
&>.title >.el-input{
flex:none;
}
} }
} }
.section-tabs.el-tabs--card{ .section-tabs.el-tabs--card{

57
src/views/ModelMain.vue

@ -49,7 +49,19 @@
<SplitArea v-show="!hideLeft" class="section-left" :class="{'hidden-split':hideLeft}" <SplitArea v-show="!hideLeft" class="section-left" :class="{'hidden-split':hideLeft}"
:size="hideLeft ? 0 : sectionLeftSize"> :size="hideLeft ? 0 : sectionLeftSize">
<div class="section-item-wrap"> <div class="section-item-wrap">
<div class="title">{{ calcLeftPanel?.title }}</div> <div class="title">
{{ calcLeftPanel?.title }}
<el-input
v-model="sectionLeftSearch"
style="width: 240px"
placeholder="Search"
>
<template #prefix>
<component :is="renderIcon('element Search')"></component>
</template>
</el-input>
<span class="close" @click="closeMe('hideLeft')"><component :is="renderIcon('element Close')"></component></span>
</div>
</div> </div>
<component :is="calcLeftPanel.component" /> <component :is="calcLeftPanel.component" />
</SplitArea> </SplitArea>
@ -101,7 +113,19 @@
</SplitArea> </SplitArea>
<SplitArea v-show="!hideRight" class="section-right" :size="hideRight ? 0 : sectionRightSize"> <SplitArea v-show="!hideRight" class="section-right" :size="hideRight ? 0 : sectionRightSize">
<div class="section-item-wrap"> <div class="section-item-wrap">
<div class="title">{{ calcRightPanel?.title }}</div> <div class="title">
{{ calcRightPanel?.title }}
<el-input
v-model="sectionLeftSearch"
style="width: 240px"
placeholder="Search"
>
<template #prefix>
<component :is="renderIcon('element Search')"></component>
</template>
</el-input>
<span class="close" @click="closeMe('hideReft')"><component :is="renderIcon('element Close')"></component></span>
</div>
</div> </div>
<component :is="calcRightPanel.component" /> <component :is="calcRightPanel.component" />
</SplitArea> </SplitArea>
@ -109,7 +133,19 @@
</SplitArea> </SplitArea>
<SplitArea v-show="!hideBottom" :class="['section-bottom']" :size="hideBottom ? 0 : bottomSize" :min-size="0"> <SplitArea v-show="!hideBottom" :class="['section-bottom']" :size="hideBottom ? 0 : bottomSize" :min-size="0">
<div class="section-item-wrap"> <div class="section-item-wrap">
<div class="title">{{ calcBottomPanel?.title }}</div> <div class="title">
{{ calcBottomPanel?.title }}
<el-input
v-model="sectionLeftSearch"
style="width: 240px"
placeholder="Search"
>
<template #prefix>
<component :is="renderIcon('element Search')"></component>
</template>
</el-input>
<span class="close" @click="closeMe('hideBottom')"><component :is="renderIcon('element Close')"></component></span>
</div>
</div> </div>
<component :is="calcBottomPanel.component" /> <component :is="calcBottomPanel.component" />
</SplitArea> </SplitArea>
@ -161,7 +197,8 @@ export default {
sectionRightSize: 20, sectionRightSize: 20,
sectionLeftTitle: 'modeltree', sectionLeftTitle: 'modeltree',
sectionRightTitle: 'property', sectionRightTitle: 'property',
sectionBottomTitle: '' sectionBottomTitle: '',
sectionLeftSearch:''
} }
}, },
computed: { computed: {
@ -261,6 +298,18 @@ export default {
this.hideBottom = false this.hideBottom = false
this.sectionBottomTitle = panel.name this.sectionBottomTitle = panel.name
} }
},
closeMe(btn){
if(btn==='hideLeft'){
this.hideLeft = true
this.sectionLeftTitle = ''
}else if(btn==='hideRight'){
this.hideRight = true
this.sectionRightTitle = ''
}else if(btn==='hideBottom'){
this.hideBottom = true
this.sectionBottomTitle = ''
}
} }
} }
} }

Loading…
Cancel
Save