@@ -320,7 +320,7 @@ return /******/ (function(modules) { // webpackBootstrap
320320 if (_util2.default.canUseDOM()) {
321321 _this.isIE = document.documentMode;
322322 }
323- _this.store = new _TableDataStore.TableDataStore(_this.props.data. slice());
323+ _this.store = new _TableDataStore.TableDataStore(_this.props.data ? _this.props.data. slice() : [] );
324324
325325 _this.initTable(_this.props);
326326
@@ -3014,8 +3014,8 @@ return /******/ (function(modules) { // webpackBootstrap
30143014 var isSelectRowDefined = selectRow.mode === _Const2.default.ROW_SELECT_SINGLE || selectRow.mode === _Const2.default.ROW_SELECT_MULTI;
30153015 if (isSelectRowDefined) {
30163016 var style = {
3017- width: selectRow.columnWidth || 30 ,
3018- minWidth: selectRow.columnWidth || 30
3017+ width: selectRow.columnWidth || '30px' ,
3018+ minWidth: selectRow.columnWidth || '30px'
30193019 };
30203020 if (!selectRow.hideSelectColumn) {
30213021 selectRowHeader = _react2.default.createElement('col', { style: style, key: -1 });
@@ -3026,10 +3026,11 @@ return /******/ (function(modules) { // webpackBootstrap
30263026 display: column.hidden ? 'none' : null
30273027 };
30283028 if (column.width) {
3029- style.width = column.width;
3029+ var width = !isNaN(column.width) ? column.width + 'px' : column.width;
3030+ style.width = width;
30303031 /** add min-wdth to fix user assign column width
30313032 not eq offsetWidth in large column table **/
3032- style.minWidth = column. width;
3033+ style.minWidth = width;
30333034 }
30343035 return _react2.default.createElement('col', { style: style, key: i, className: column.className });
30353036 });
@@ -3628,6 +3629,9 @@ return /******/ (function(modules) { // webpackBootstrap
36283629 // modified by iuculanop
36293630 // BEGIN
36303631 value: function __handleCustomUpdate__REACT_HOT_LOADER__(value) {
3632+ if (!this.validator(value)) {
3633+ return;
3634+ }
36313635 this.props.completeEdit(value, this.props.rowIndex, this.props.colIndex);
36323636 }
36333637 }, {
@@ -16654,6 +16658,30 @@ return /******/ (function(modules) { // webpackBootstrap
1665416658 }
1665516659
1665616660 _createClass(SelectFilter, [{
16661+ key: 'componentWillReceiveProps',
16662+ value: function componentWillReceiveProps(nextProps) {
16663+ var isPlaceholderSelected = nextProps.defaultValue === undefined || !nextProps.options.hasOwnProperty(nextProps.defaultValue);
16664+ this.setState({
16665+ isPlaceholderSelected: isPlaceholderSelected
16666+ });
16667+ }
16668+ }, {
16669+ key: 'componentDidUpdate',
16670+ value: function componentDidUpdate(prevProps) {
16671+ var needFilter = false;
16672+ if (this.props.defaultValue !== prevProps.defaultValue) {
16673+ needFilter = true;
16674+ } else if (this.props.options !== prevProps.options) {
16675+ needFilter = true;
16676+ }
16677+ if (needFilter) {
16678+ var value = this.refs.selectInput.value;
16679+ if (value) {
16680+ this.props.filterHandler(value, _Const2.default.FILTER_TYPE.SELECT);
16681+ }
16682+ }
16683+ }
16684+ }, {
1665716685 key: 'filter',
1665816686 value: function filter(event) {
1665916687 var value = event.target.value;
0 commit comments