From e1c87da64731ebcf2764f653cf37c05a0cac981c Mon Sep 17 00:00:00 2001 From: kvkens Date: Tue, 4 Dec 2018 14:29:45 +0800 Subject: [PATCH 1/2] bugfix:onFilterChange.onFilterClear --- build/Table.js | 8 ++++---- src/Table.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/Table.js b/build/Table.js index 118725f..dd5b4ac 100644 --- a/build/Table.js +++ b/build/Table.js @@ -368,8 +368,8 @@ var Table = function (_Component) { Table.prototype.getHeader = function getHeader(columns, fixed) { var _props = this.props, filterDelay = _props.filterDelay, - onFilterRowsDropChange = _props.onFilterRowsDropChange, - onFilterRowsChange = _props.onFilterRowsChange, + onFilterChange = _props.onFilterChange, + onFilterClear = _props.onFilterClear, filterable = _props.filterable, showHeader = _props.showHeader, expandIconAsCell = _props.expandIconAsCell, @@ -421,8 +421,8 @@ var Table = function (_Component) { rowStyle: trStyle, fixed: fixed, filterable: filterable, - onFilterRowsChange: onFilterRowsChange, - onFilterRowsDropChange: onFilterRowsDropChange, + onFilterChange: onFilterChange, + onFilterClear: onFilterClear, filterDelay: filterDelay, afterDragColWidth: afterDragColWidth, contentDomWidth: this.contentDomWidth, diff --git a/src/Table.js b/src/Table.js index e381bd0..3fa87a0 100644 --- a/src/Table.js +++ b/src/Table.js @@ -294,7 +294,7 @@ class Table extends Component { } getHeader(columns, fixed) { - const { filterDelay, onFilterRowsDropChange, onFilterRowsChange, filterable, showHeader, expandIconAsCell, clsPrefix, onDragStart, onDragEnter, onDragOver, onDrop, draggable, + const { filterDelay, onFilterChange, onFilterClear, filterable, showHeader, expandIconAsCell, clsPrefix, onDragStart, onDragEnter, onDragOver, onDrop, draggable, onMouseDown, onMouseMove, onMouseUp, dragborder, onThMouseMove, dragborderKey, minColumnWidth, headerHeight,afterDragColWidth,headerScroll ,bordered} = this.props; const rows = this.getHeaderRows(columns); if (expandIconAsCell && fixed !== 'right') { @@ -329,8 +329,8 @@ class Table extends Component { rowStyle={trStyle} fixed={fixed} filterable={filterable} - onFilterRowsChange={onFilterRowsChange} - onFilterRowsDropChange={onFilterRowsDropChange} + onFilterChange={onFilterChange} + onFilterClear={onFilterClear} filterDelay={filterDelay} afterDragColWidth = {afterDragColWidth} contentDomWidth={this.contentDomWidth} From e7934023645329dec3c59684f2ab527713a8fa18 Mon Sep 17 00:00:00 2001 From: kvkens Date: Tue, 4 Dec 2018 14:30:18 +0800 Subject: [PATCH 2/2] publish 1.6.6 --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b747d6..81d2104 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ + +## [1.6.6](https://github.com/tinper-bee/bee-table/compare/v1.6.5...v1.6.6) (2018-12-04) + + + ## [1.6.5](https://github.com/tinper-bee/bee-table/compare/v1.6.4...v1.6.5) (2018-12-04) @@ -119,7 +124,7 @@ -## [1.5.1](https://github.com/tinper-bee/bee-table/compare/v1.5.0...v1.5.1) (2018-11-19) +## [1.5.1](https://github.com/tinper-bee/bee-table/compare/v1.5.0...v1.5.1) (2018-11-18) diff --git a/package.json b/package.json index bb4b59a..edcfc23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bee-table", - "version": "1.6.5", + "version": "1.6.6", "description": "Table ui component for react", "keywords": [ "react",