sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

no message

Browse Source 
Former-commit-id: 9453d5f2aec357104f056dba6f47ef1b8f29f572 [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e] [formerly 9453d5f2aec357104f056dba6f47ef1b8f29f572 [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e] [formerly 9453d5f2aec357104f056dba6f47ef1b8f29f572 [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e] [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e [formerly f181fac0f6e6d14e2f2ab53d081cb8771ec22a74 [formerly efa2861264c4a7ba2f9479dc9dfe439211570c3d]]]]]
Former-commit-id: a5eb299ad9a63bb41d13d00e6c115c05f93456de
Former-commit-id: 13e2931de82d9632571d29b7373f7e3eb73cbb89
Former-commit-id: 0feda7b58c86749acf39aea9143b6dc839344b6f [formerly bf194142fcfa5475ad71167cd5c6f6853b1aceb0]
Former-commit-id: 11e1c8af7eefe11a82a7e7fe46f548b83af8fa2a
Former-commit-id: 2682716f9983411625913f6fb042ca854e67fd32
Former-commit-id: fc65c1e1e36f2fb1ec058ea5c4ab1730b942561d
Former-commit-id: 35511812c19b71fbed5e3be31c5753a022c6194a
Former-commit-id: 5c7ef7d715b06c67df5e49b61e1eed21d194bb39
This commit is contained in:
liyang
2018-07-03 13:38:55 +08:00
parent 6ff914fd42
commit 5633c03490
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/assets/style/theme/theme-base.scss
View File

@@ -262,6 +262,7 @@
left: 0px;
right: 0px;
overflow: hidden;
// 填充式布局组件
.d2-container-full {
position: absolute;
top: 0px;
@@ -277,13 +278,36 @@
.d2-container-full__body {
flex-grow: 1;
padding: 0px 20px;
overflow: hidden;
overflow: auto;
position: relative;
}
.d2-container-full__footer {
padding: 20px;
}
}
// 填充式布局组件 - 滚动优化
.d2-container-full-bs {
position: absolute;
top: 0px;
right: 20px;
bottom: 0px;
left: 0px;
display: flex;
flex-direction: column;
overflow: hidden;
.d2-container-full-bs__header {
padding: 20px;
}
.d2-container-full-bs__body {
flex-grow: 1;
padding: 0px 20px;
overflow: hidden;
position: relative;
}
.d2-container-full-bs__footer {
padding: 20px;
}
}
// 卡片布局组件
.d2-container-card {
border-top-left-radius: 0px;

18
src/assets/style/theme/theme.scss
View File

@@ -268,6 +268,24 @@
}
}
// [组件]
// d2-container-full-bs 填充型 滚动优化
.d2-container-full-bs {
border: $theme-container-border-outer;
border-top: none;
border-bottom: none;
.d2-container-full-bs__header {
border-bottom: $theme-container-border-inner;
background: $theme-container-header-footer-background-color;
}
.d2-container-full-bs__body {
background: $theme-container-background-color;
}
.d2-container-full-bs__footer {
border-top: $theme-container-border-inner;
background: $theme-container-header-footer-background-color;
}
}
// [组件]
// d2-container-card 卡片型
.d2-container-card {
border: $theme-container-border-outer;

10
src/components/core/d2-container/components/d2-container-full-bs.vue
View File

@@ -1,14 +1,14 @@
<template>
<div class="d2-container-full">
<div v-if="$slots.header" class="d2-container-full__header" ref="header">
<div class="d2-container-full-bs">
<div v-if="$slots.header" class="d2-container-full-bs__header" ref="header">
<slot name="header"/>
</div>
<div class="d2-container-full__body" ref="wrapper">
<div class="d2-container-full-bs__body" ref="wrapper">
<div style="padding: 20px 0px;">
<slot/>
</div>
</div>
<div v-if="$slots.footer" class="d2-container-full__footer" ref="footer">
<div v-if="$slots.footer" class="d2-container-full-bs__footer" ref="footer">
<slot name="footer"/>
</div>
</div>
@@ -19,7 +19,7 @@
import BScroll from 'better-scroll'
export default {
name: 'd2-container-full',
name: 'd2-container-full-bs',
data () {
return {
BS: null