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

优化过滤列样式

This commit is contained in:
yangchch6 2019-05-06 16:00:02 +08:00
parent ddaadf2772
commit b888bd0ce3
13 changed files with 89 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/FilterDropDown.js
View File

@ -283,7 +283,7 @@ var FilterDropDown = function (_Component) {
_beeButton2["default"], _beeButton2["default"],
{ {
shape: 'border', shape: 'border',
style: { marginLeft: "3px", minWidth: "0px", width: "24px", padding: 0 } style: { marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0 }
}, },
_react2["default"].createElement(_beeIcon2["default"], { style: { padding: 0, color: '#585858' }, type: 'uf-filter' }) _react2["default"].createElement(_beeIcon2["default"], { style: { padding: 0, color: '#585858' }, type: 'uf-filter' })
) )
@ -293,7 +293,7 @@ var FilterDropDown = function (_Component) {
{ {
onClick: this.onClickClear, onClick: this.onClickClear,
shape: 'border', shape: 'border',
style: { marginLeft: "1px", minWidth: "0px", width: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" } style: { marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }
}, },
_react2["default"].createElement(_beeIcon2["default"], { style: { padding: 0, color: '#585858', "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }, type: 'uf-filterno' }) _react2["default"].createElement(_beeIcon2["default"], { style: { padding: 0, color: '#585858', "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }, type: 'uf-filterno' })
) )

1
build/FilterType.js
View File

@ -248,6 +248,7 @@ var FilterType = function (_Component) {
'div', 'div',
{ className: clsPrefix + ' filter-wrap' }, { className: clsPrefix + ' filter-wrap' },
_react2["default"].createElement(_beeSelect2["default"], _extends({}, _this.props, { _react2["default"].createElement(_beeSelect2["default"], _extends({}, _this.props, {
size: 'sm',
value: _this.state.value, value: _this.state.value,
onChange: _this.changeSelect onChange: _this.changeSelect
})), })),

2
demo/index.js
View File

File diff suppressed because one or more lines are too long

9
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

4
package.json
View File

@ -62,7 +62,6 @@
"component-classes": "^1.2.6", "component-classes": "^1.2.6",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
"object-path": "^0.11.3", "object-path": "^0.11.3",
"ref-tree": "2.0.1-beta.1",
"shallowequal": "^1.0.2", "shallowequal": "^1.0.2",
"throttle-debounce": "^2.0.1", "throttle-debounce": "^2.0.1",
"tinper-bee-core": "latest", "tinper-bee-core": "latest",
@ -91,6 +90,7 @@
"react-addons-test-utils": "^15.5.0", "react-addons-test-utils": "^15.5.0",
"react-dom": "^16.6.3", "react-dom": "^16.6.3",
"reqwest": "^2.0.5", "reqwest": "^2.0.5",
"tinper-bee": "latest" "tinper-bee": "latest",
"ref-tree": "2.0.1-beta.1"
} }
} }

4
src/FilterDropDown.js
View File

@ -157,7 +157,7 @@ class FilterDropDown extends Component {
> >
<Button <Button
shape="border" shape="border"
style={{ marginLeft: "3px", minWidth: "0px", width: "24px", padding: 0 }} style={{ marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0 }}
> >
<Icon style={{ padding: 0, color: '#585858' }} type="uf-filter" /> <Icon style={{ padding: 0, color: '#585858' }} type="uf-filter" />
</Button> </Button>
@ -165,7 +165,7 @@ class FilterDropDown extends Component {
<Button <Button
onClick={this.onClickClear} onClick={this.onClickClear}
shape="border" shape="border"
style={{ marginLeft: "1px", minWidth: "0px", width: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }} style={{ marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }}
> >
<Icon style={{ padding: 0, color: '#585858', "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }} type="uf-filterno" /> <Icon style={{ padding: 0, color: '#585858', "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }} type="uf-filterno" />
</Button> </Button>

1
src/FilterType.js
View File

@ -209,6 +209,7 @@ class FilterType extends Component {
return <div className={`${clsPrefix} filter-wrap`}> return <div className={`${clsPrefix} filter-wrap`}>
<Select <Select
{...this.props} {...this.props}
size="sm"
value={this.state.value} value={this.state.value}
onChange={this.changeSelect} onChange={this.changeSelect}
/><FilterDropDown /><FilterDropDown