固定列滚动条不可拖拽
This commit is contained in:
parent
29fb01dcf4
commit
1eac3bea4f
|
@ -31,7 +31,5 @@
|
||||||
.u-table-filter-column-filter-icon{
|
.u-table-filter-column-filter-icon{
|
||||||
right: 15px;
|
right: 15px;
|
||||||
}
|
}
|
||||||
.u-table-scroll .u-table-header{
|
|
||||||
margin-right: 15px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10310,8 +10310,6 @@ li.rc-time-picker-panel-select-option-disabled:hover {
|
||||||
height: 100%; }
|
height: 100%; }
|
||||||
.demo25 .u-table-filter-column-filter-icon {
|
.demo25 .u-table-filter-column-filter-icon {
|
||||||
right: 15px; }
|
right: 15px; }
|
||||||
.demo25 .u-table-scroll .u-table-header {
|
|
||||||
margin-right: 15px; }
|
|
||||||
|
|
||||||
th .drop-menu .uf {
|
th .drop-menu .uf {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -11482,10 +11482,15 @@
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
var leftFixedWidth = this.columnManager.getLeftColumnsWidth();
|
||||||
|
var rightFixedWidth = this.columnManager.getRightColumnsWidth();
|
||||||
|
var parStyle = {};
|
||||||
|
if (!fixed) {
|
||||||
|
parStyle = { 'marginLeft': leftFixedWidth, 'marginRight': rightFixedWidth };
|
||||||
|
}
|
||||||
return _react2['default'].createElement(
|
return _react2['default'].createElement(
|
||||||
'span',
|
'div',
|
||||||
null,
|
{ style: parStyle },
|
||||||
headTable,
|
headTable,
|
||||||
BodyTable
|
BodyTable
|
||||||
);
|
);
|
||||||
|
@ -11692,7 +11697,7 @@
|
||||||
{ className: clsPrefix + '-content' },
|
{ className: clsPrefix + '-content' },
|
||||||
_react2['default'].createElement(
|
_react2['default'].createElement(
|
||||||
'div',
|
'div',
|
||||||
{ className: isTableScroll ? clsPrefix + '-scroll' : '', style: { 'marginLeft': leftFixedWidth } },
|
{ className: isTableScroll ? clsPrefix + '-scroll' : '' },
|
||||||
this.getTable({ columns: this.columnManager.groupedColumns() }),
|
this.getTable({ columns: this.columnManager.groupedColumns() }),
|
||||||
this.getEmptyText(),
|
this.getEmptyText(),
|
||||||
this.getFooter()
|
this.getFooter()
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bee-table",
|
"name": "bee-table",
|
||||||
"version": "1.6.10-beta.0",
|
"version": "1.6.10-beta.1",
|
||||||
"description": "Table ui component for react",
|
"description": "Table ui component for react",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"react",
|
"react",
|
||||||
|
|
11
src/Table.js
11
src/Table.js
|
@ -807,8 +807,13 @@ class Table extends Component {
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
const leftFixedWidth = this.columnManager.getLeftColumnsWidth();
|
||||||
return <span>{headTable}{BodyTable}</span>;
|
const rightFixedWidth = this.columnManager.getRightColumnsWidth();
|
||||||
|
let parStyle = {}
|
||||||
|
if(!fixed){
|
||||||
|
parStyle = {'marginLeft':leftFixedWidth,'marginRight':rightFixedWidth}
|
||||||
|
}
|
||||||
|
return <div style={parStyle}>{headTable}{BodyTable}</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
getTitle() {
|
getTitle() {
|
||||||
|
@ -988,7 +993,7 @@ class Table extends Component {
|
||||||
{this.getTitle()}
|
{this.getTitle()}
|
||||||
<div className={`${clsPrefix}-content`}>
|
<div className={`${clsPrefix}-content`}>
|
||||||
|
|
||||||
<div className={isTableScroll ? `${clsPrefix}-scroll` : ''} style={{'marginLeft':leftFixedWidth}}>
|
<div className={isTableScroll ? `${clsPrefix}-scroll` : ''} >
|
||||||
{this.getTable({ columns: this.columnManager.groupedColumns() })}
|
{this.getTable({ columns: this.columnManager.groupedColumns() })}
|
||||||
{this.getEmptyText()}
|
{this.getEmptyText()}
|
||||||
{this.getFooter()}
|
{this.getFooter()}
|
||||||
|
|
Loading…
Reference in New Issue