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

merge

This commit is contained in:
wanghaoo 2018-11-28 15:47:21 +08:00
parent 419913410f f32a4a1beb
commit 9ed6fd4cad
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
<a name="1.5.14"></a>
## [1.5.14](https://github.com/tinper-bee/bee-table/compare/v1.5.13...v1.5.14) (2018-11-28)
<a name="1.5.13"></a> <a name="1.5.13"></a>
## [1.5.13](https://github.com/tinper-bee/bee-table/compare/v1.5.12...v1.5.13) (2018-11-28) ## [1.5.13](https://github.com/tinper-bee/bee-table/compare/v1.5.12...v1.5.13) (2018-11-28)

6
build/FilterType.js
View File

@ -230,7 +230,7 @@ var FilterType = function (_Component) {
format: format, format: format,
locale: _zh_CN2["default"] locale: _zh_CN2["default"]
})), })),
filterDropdown == 'show' && _react2["default"].createElement(_FilterDropDown2["default"], { _react2["default"].createElement(_FilterDropDown2["default"], {
locale: locale, locale: locale,
onSelectDropdown: onSelectDropdown, onSelectDropdown: onSelectDropdown,
onClickClear: _this.clearDateValue, onClickClear: _this.clearDateValue,
@ -252,7 +252,7 @@ var FilterType = function (_Component) {
dateInputPlaceholder: ['开始', '结束'], dateInputPlaceholder: ['开始', '结束'],
showClear: true showClear: true
})), })),
filterDropdown == 'show' && _react2["default"].createElement(_FilterDropDown2["default"], { _react2["default"].createElement(_FilterDropDown2["default"], {
locale: locale, locale: locale,
onSelectDropdown: onSelectDropdown, onSelectDropdown: onSelectDropdown,
onClickClear: _this.clearDateValue, onClickClear: _this.clearDateValue,
@ -268,7 +268,7 @@ var FilterType = function (_Component) {
className: className, className: className,
onChange: onChange onChange: onChange
}), }),
filterDropdown == 'show' && _react2["default"].createElement(_FilterDropDown2["default"], { locale: locale, _react2["default"].createElement(_FilterDropDown2["default"], { locale: locale,
onSelectDropdown: onSelectDropdown onSelectDropdown: onSelectDropdown
}) })
); );

6
dist/demo.js vendored
View File

@ -14182,7 +14182,7 @@
format: format, format: format,
locale: _zh_CN2['default'] locale: _zh_CN2['default']
})), })),
filterDropdown == 'show' && _react2['default'].createElement(_FilterDropDown2['default'], { _react2['default'].createElement(_FilterDropDown2['default'], {
locale: locale, locale: locale,
onSelectDropdown: onSelectDropdown, onSelectDropdown: onSelectDropdown,
onClickClear: _this.clearDateValue, onClickClear: _this.clearDateValue,
@ -14204,7 +14204,7 @@
dateInputPlaceholder: ['开始', '结束'], dateInputPlaceholder: ['开始', '结束'],
showClear: true showClear: true
})), })),
filterDropdown == 'show' && _react2['default'].createElement(_FilterDropDown2['default'], { _react2['default'].createElement(_FilterDropDown2['default'], {
locale: locale, locale: locale,
onSelectDropdown: onSelectDropdown, onSelectDropdown: onSelectDropdown,
onClickClear: _this.clearDateValue, onClickClear: _this.clearDateValue,
@ -14220,7 +14220,7 @@
className: className, className: className,
onChange: onChange onChange: onChange
}), }),
filterDropdown == 'show' && _react2['default'].createElement(_FilterDropDown2['default'], { locale: locale, _react2['default'].createElement(_FilterDropDown2['default'], { locale: locale,
onSelectDropdown: onSelectDropdown onSelectDropdown: onSelectDropdown
}) })
); );

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": "1.5.13", "version": "1.5.14",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",

12
src/FilterType.js
View File

@ -174,14 +174,14 @@ class FilterType extends Component {
open={this.state.open} open={this.state.open}
format={format} format={format}
locale={zhCN} locale={zhCN}
/>{filterDropdown == 'show' && <FilterDropDown /><FilterDropDown
locale={locale} locale={locale}
onSelectDropdown={onSelectDropdown} onSelectDropdown={onSelectDropdown}
onClickClear={this.clearDateValue} onClickClear={this.clearDateValue}
isShowCondition={filterDropdown} isShowCondition={filterDropdown}
isShowClear={this.state.dateValue} isShowClear={this.state.dateValue}
> >
</FilterDropDown>} </FilterDropDown>
</div> </div>
case 'daterange': case 'daterange':
return <div className={`${clsPrefix} filter-wrap`}> return <div className={`${clsPrefix} filter-wrap`}>
@ -195,14 +195,14 @@ class FilterType extends Component {
placeholder={'开始 ~ 结束'} placeholder={'开始 ~ 结束'}
dateInputPlaceholder={['开始', '结束']} dateInputPlaceholder={['开始', '结束']}
showClear={true} showClear={true}
/>{filterDropdown == 'show' && <FilterDropDown /><FilterDropDown
locale={locale} locale={locale}
onSelectDropdown={onSelectDropdown} onSelectDropdown={onSelectDropdown}
onClickClear={this.clearDateValue} onClickClear={this.clearDateValue}
isShowCondition={filterDropdown} isShowCondition={filterDropdown}
isShowClear={this.state.dateValue} isShowClear={this.state.dateValue}
> >
</FilterDropDown>} </FilterDropDown>
</div> </div>
case 'bool': case 'bool':
return <div className={`${clsPrefix} filter-wrap`}> return <div className={`${clsPrefix} filter-wrap`}>
@ -210,10 +210,10 @@ class FilterType extends Component {
className={className} className={className}
onChange={onChange} onChange={onChange}
/> />
{filterDropdown == 'show' && <FilterDropDown locale={locale} <FilterDropDown locale={locale}
onSelectDropdown={onSelectDropdown} onSelectDropdown={onSelectDropdown}
> >
</FilterDropDown>} </FilterDropDown>
</div> </div>
default: default:
return <div></div>; return <div></div>;