JavaScript
/
bee-table
3
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
yangchch6 2019-04-25 16:11:51 +08:00
parent f42d7ab073 e684899fb1
commit 0d4bdeb4ec
8 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/Table.js
View File

@ -680,7 +680,7 @@ var Table = function (_Component) {
expandable: false, expandable: false,
store: this.store, store: this.store,
dragborderKey: this.props.dragborderKey, dragborderKey: this.props.dragborderKey,
rowDraggAble: props.rowDraggAble, rowDraggAble: this.props.rowDraggAble,
onDragRow: this.onDragRow onDragRow: this.onDragRow
}); });
}; };
@ -818,7 +818,7 @@ var Table = function (_Component) {
rootIndex: rootIndex, rootIndex: rootIndex,
syncHover: props.syncHover, syncHover: props.syncHover,
bodyDisplayInRow: props.bodyDisplayInRow, bodyDisplayInRow: props.bodyDisplayInRow,
rowDraggAble: props.rowDraggAble, rowDraggAble: this.props.rowDraggAble,
onDragRow: this.onDragRow, onDragRow: this.onDragRow,
contentTable: this.contentTable contentTable: this.contentTable
}))); })));

2
build/TableHeader.js
View File

@ -708,7 +708,7 @@ var TableHeader = function (_Component) {
var _rowLeng = row.length - 1; var _rowLeng = row.length - 1;
return _react2["default"].createElement( return _react2["default"].createElement(
"tr", "tr",
{ key: index, style: rowStyle, aaaa: true, className: filterable && index == rows.length - 1 ? 'filterable' : '' }, { key: index, style: rowStyle, className: filterable && index == rows.length - 1 ? 'filterable' : '' },
row.map(function (da, columIndex, arr) { row.map(function (da, columIndex, arr) {
var thHover = da.drgHover ? " " + clsPrefix + "-thead th-drag-hover" : ""; var thHover = da.drgHover ? " " + clsPrefix + "-thead th-drag-hover" : "";
delete da.drgHover; delete da.drgHover;

2
demo/index.js
View File

File diff suppressed because one or more lines are too long

13
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bee-table", "name": "bee-table",
"version": "2.0.14", "version": "2.0.15",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",

4
src/Table.js
View File

@ -525,7 +525,7 @@ class Table extends Component {
expandable={false} expandable={false}
store={this.store} store={this.store}
dragborderKey={this.props.dragborderKey} dragborderKey={this.props.dragborderKey}
rowDraggAble={props.rowDraggAble} rowDraggAble={this.props.rowDraggAble}
onDragRow={this.onDragRow} onDragRow={this.onDragRow}
/> />
); );
@ -677,7 +677,7 @@ class Table extends Component {
rootIndex = {rootIndex} rootIndex = {rootIndex}
syncHover = {props.syncHover} syncHover = {props.syncHover}
bodyDisplayInRow = {props.bodyDisplayInRow} bodyDisplayInRow = {props.bodyDisplayInRow}
rowDraggAble={props.rowDraggAble} rowDraggAble={this.props.rowDraggAble}
onDragRow={this.onDragRow} onDragRow={this.onDragRow}
contentTable={this.contentTable} contentTable={this.contentTable}
/> />

2
src/TableHeader.js
View File

@ -632,7 +632,7 @@ class TableHeader extends Component {
<thead className={`${clsPrefix}-thead`} {...attr} data-theader-fixed='scroll' ref={_thead=>this._thead = _thead} > <thead className={`${clsPrefix}-thead`} {...attr} data-theader-fixed='scroll' ref={_thead=>this._thead = _thead} >
{rows.map((row, index) => { {rows.map((row, index) => {
let _rowLeng = (row.length-1); let _rowLeng = (row.length-1);
return(<tr key={index} style={rowStyle} aaaa className={(filterable && index == rows.length - 1)?'filterable':''}> return(<tr key={index} style={rowStyle} className={(filterable && index == rows.length - 1)?'filterable':''}>
{row.map((da, columIndex, arr) => { {row.map((da, columIndex, arr) => {
let thHover = da.drgHover let thHover = da.drgHover
? ` ${clsPrefix}-thead th-drag-hover` ? ` ${clsPrefix}-thead th-drag-hover`