Skip to content

Commit 2406a97

Browse files
committed
Some style adjustments.
1 parent 1ed16c3 commit 2406a97

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/components/list/fixed.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const setFixedColumn = (event: MouseEvent) => {
2626
export function setFixedColumnStyles(styles: any, colIdx: number, fixedColumnIdx: number, columnsConf: ListColumnConf[]) {
2727
if (fixedColumnIdx >= colIdx) {
2828
styles.position = 'sticky'
29-
styles.zIndex = 99
29+
styles.zIndex = 1099
3030
// TODO 判断left要小于视口宽度
3131
styles.left = columnsConf.slice(0, colIdx).reduce((count, col) => count + col.width, 0) + 'px'
3232
if (fixedColumnIdx == colIdx) {

src/components/list/list.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ export function closeContextMenu(event: MouseEvent) {
121121
@import '../../assets/main.scss';
122122
@include b('list') {
123123
position: relative;
124-
border-top: 1px solid var(--el-border-color);
125-
border-left: 1px solid var(--el-border-color);
126124
127125
@include m('size-mini') {
128126
padding: 1px;
@@ -147,10 +145,12 @@ export function closeContextMenu(event: MouseEvent) {
147145
148146
@include b('list-header') {
149147
display: flex;
148+
border-top: 1px solid var(--el-border-color);
149+
border-right: 1px solid var(--el-border-color);
150150
align-items: center;
151151
position: sticky;
152152
top: 0;
153-
z-index: 100;
153+
z-index: 1100;
154154
155155
@include b('list-cell') {
156156
display: flex;
@@ -183,14 +183,15 @@ export function closeContextMenu(event: MouseEvent) {
183183
184184
@include b('list-row') {
185185
display: flex;
186+
border-right: 1px solid var(--el-border-color);
186187
187188
&:hover .iw-list-cell {
188189
background-color: var(--el-color-info-light-9);
189190
}
190191
}
191192
192193
@include b('list-cell') {
193-
border-right: 1px solid var(--el-border-color);
194+
border-left: 1px solid var(--el-border-color);
194195
border-bottom: 1px solid var(--el-border-color);
195196
background-color: var(--el-bg-color);
196197
}

src/components/skeleton.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ const listConf = List.initConf(props, tableBasicConf)
9494
onMounted(async () => {
9595
Array.prototype.forEach.call(document.getElementsByClassName('iw-tt'), function (ttEle) {
9696
let outHeight = ttEle.parentElement?.clientHeight
97-
let layoutHeight = ttEle.getElementsByClassName('iw-tt-layouts')[0].clientHeight
97+
let layoutHeight = ttEle.getElementsByClassName('iw-tt-layouts')[0].offsetHeight
9898
Array.prototype.forEach.call(ttEle.getElementsByClassName('iw-tt-shows'), function (showEle) {
99-
let toolsHeight = showEle.getElementsByClassName('iw-tt-tools')[0].clientHeight
99+
let toolsHeight = showEle.getElementsByClassName('iw-tt-tools')[0].offsetHeight
100100
showEle.getElementsByClassName('iw-tt-table')[0].style.height = outHeight - layoutHeight - toolsHeight + 'px'
101101
})
102102
})
@@ -137,6 +137,7 @@ onMounted(async () => {
137137
138138
@include b('tt-layouts') {
139139
height: 40px;
140+
border: 1px solid red;
140141
}
141142
142143
@include b('tt-tools') {

0 commit comments

Comments
 (0)