fix: 表头列增加className,左固定列增加边界

This commit is contained in:
wanghaoo 2018-09-26 13:43:55 +08:00
parent ec825b944c
commit e08c25dd2c
6 changed files with 1824 additions and 13787 deletions

16
dist/demo.css vendored
View File

@ -8562,11 +8562,15 @@ ul {
text-align: center;
display: inline-block; }
.u-table-thead th .bee-table-column-sorter > .bee-table-column-sorter-down,
.u-table-thead th .bee-table-column-sorter > .bee-table-column-sorter-up {
.u-table-thead th .bee-table-column-sorter > .bee-table-column-sorter-up, .u-table-thead th .bee-table-column-sorter > .bee-table-column-sorter-flat {
line-height: 6px;
display: block;
width: 14px;
cursor: pointer; }
.u-table-thead th .bee-table-column-sorter > .bee-table-column-sorter-flat {
display: none; }
.u-table-thead th:hover .bee-table-column-sorter > .bee-table-column-sorter-flat {
display: block; }
.u-table-thead th .bee-table-column-sorter-down.on .uf-triangle-down,
.u-table-thead th .bee-table-column-sorter-down.on .uf-triangle-up,
.u-table-thead th .bee-table-column-sorter-up.on .uf-triangle-down,
@ -8603,7 +8607,7 @@ ul {
right: 0px;
top: 0;
background: transparent;
width: 2px;
width: 1px;
box-sizing: border-box;
z-index: 100; }
.u-table-thead-th .th-drag-gap {
@ -10243,12 +10247,4 @@ li.rc-time-picker-panel-select-option-disabled:hover {
.demo25 .u-table-scroll .u-table-header {
margin-right: 15px; }
th .drop-menu .uf {
font-size: 12px;
visibility: hidden;
margin-left: 15px; }
th:hover .uf {
visibility: visible; }
/*# sourceMappingURL=demo.css.map */

2
dist/demo.css.map vendored

File diff suppressed because one or more lines are too long

15568
dist/demo.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -290,15 +290,28 @@ $table-move-in-color: $bg-color-base;
height: 1em;
vertical-align: middle;
text-align: center;
// display: none;
display: inline-block;
& > .bee-table-column-sorter-down,
& > .bee-table-column-sorter-up {
& > .bee-table-column-sorter-up, & > .bee-table-column-sorter-flat {
line-height: 6px;
display: block;
width: 14px;
cursor: pointer;
}
& > .bee-table-column-sorter-flat{
display: none;
}
}
&:hover{
.bee-table-column-sorter {
& > .bee-table-column-sorter-flat{
display: block;
}
}
}
.bee-table-column-sorter-down.on .uf-triangle-down,
.bee-table-column-sorter-down.on .uf-triangle-up,
@ -354,7 +367,7 @@ $table-move-in-color: $bg-color-base;
right: 0px;
top: 0;
background:transparent;
width: 2px;
width: 1px;
box-sizing: border-box;
z-index: 100;

View File

@ -323,9 +323,9 @@ class TableHeader extends Component {
let th;
if (filterable && index == rows.length - 1) {
da.children = this.filterRenderType(da['filtertype'], da.dataindex, i);
th = <th {...da} key={i} className={` ${fixedStyle}`} />;
th = <th {...da} key={i} className={`${da.className} ${fixedStyle}`} />;
} else {
th = da.onClick ? (<th {...da} className={` ${fixedStyle}`} key={i} onClick={(event) => { da.onClick(da, event) }} />) : (<th {...da} key={i} className={` ${fixedStyle}`} />);
th = da.onClick ? (<th {...da} className={`${da.className} ${fixedStyle}`} key={i} onClick={(event) => { da.onClick(da, event) }} />) : (<th {...da} key={i} className={`${da.className} ${fixedStyle}`} />);
}
return (th);
}