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

merge

This commit is contained in:
wanghaoo 2019-03-06 10:43:24 +08:00
parent 0576ed23c0 5c0c3b70aa
commit f85a78f506
14 changed files with 39680 additions and 28113 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="2.0.2"></a>
## [2.0.2](https://github.com/tinper-bee/bee-table/compare/v2.0.0...v2.0.2) (2019-03-02)
<a name="2.0.0"></a> <a name="2.0.0"></a>
# [2.0.0](https://github.com/tinper-bee/bee-table/compare/v1.6.43...v2.0.0) (2019-03-01) # [2.0.0](https://github.com/tinper-bee/bee-table/compare/v1.6.43...v2.0.0) (2019-03-01)

10
build/FilterType.js
View File

@ -14,7 +14,11 @@ var _propTypes = require('prop-types');
var _propTypes2 = _interopRequireDefault(_propTypes); var _propTypes2 = _interopRequireDefault(_propTypes);
var _zh_CN = require('rc-calendar/lib/locale/zh_CN'); var _beeDatepicker = require('bee-datepicker');
var _beeDatepicker2 = _interopRequireDefault(_beeDatepicker);
var _zh_CN = require('bee-datepicker/build/locale/zh_CN');
var _zh_CN2 = _interopRequireDefault(_zh_CN); var _zh_CN2 = _interopRequireDefault(_zh_CN);
@ -30,10 +34,6 @@ var _beeInputNumber = require('bee-input-number');
var _beeInputNumber2 = _interopRequireDefault(_beeInputNumber); var _beeInputNumber2 = _interopRequireDefault(_beeInputNumber);
var _beeDatepicker = require('bee-datepicker');
var _beeDatepicker2 = _interopRequireDefault(_beeDatepicker);
var _FilterDropDown = require('./FilterDropDown'); var _FilterDropDown = require('./FilterDropDown');
var _FilterDropDown2 = _interopRequireDefault(_FilterDropDown); var _FilterDropDown2 = _interopRequireDefault(_FilterDropDown);

6
build/Table.css
View File

@ -565,6 +565,12 @@
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding-right: 24px; } padding-right: 24px; }
.editable-cell-input-wrapper .u-form-item.formItem-style .u-label {
display: none; }
.editable-cell-input-wrapper .u-input-group .u-form-control {
height: 26px; }
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding: 5px 24px 5px 5px; padding: 5px 24px 5px 5px;
height: 30px; } height: 30px; }

2
demo/demolist/Demo8.js
View File

@ -50,7 +50,7 @@ class Demo8 extends Component {
render() { render() {
return ( return (
<div> <div className="demo8">
<Table columns={columns8} data={this.state.data} /> <Table columns={columns8} data={this.state.data} />
<Pagination <Pagination
first first

10
demo/demolist/Demo8.scss Normal file
View File

@ -0,0 +1,10 @@
.demo8{
.u-table {
margin-bottom: 11px;
}
.u-pagination{
display: flex;
align-items: center;
justify-content: center;
}
}

4
demo/index.js
View File

File diff suppressed because one or more lines are too long

211
dist/demo.css vendored
View File

@ -5284,7 +5284,7 @@ a, .mdl-accordion, .mdl-button, .mdl-card, .mdl-checkbox, .mdl-dropdown-menu,
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
background-color: #fff; background-color: #fff;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 4px; } border-radius: 3px; }
.u-panel .u-panel-heading { .u-panel .u-panel-heading {
border-top-left-radius: 3px; border-top-left-radius: 3px;
border-top-right-radius: 3px; border-top-right-radius: 3px;
@ -6054,7 +6054,7 @@ input.u-button[type="submit"] {
color: #333; color: #333;
background-color: #fff; background-color: #fff;
border-color: #ccc; } border-color: #ccc; }
.u-button-default:hover, .u-button-default:focus, .u-button-default:active { .u-button-default:hover, .u-button-default:active {
background-color: #e6e6e6; background-color: #e6e6e6;
border-color: #adadad; } border-color: #adadad; }
@ -6070,18 +6070,17 @@ input.u-button[type="submit"] {
color: rgb(0,0,0); color: rgb(0,0,0);
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(165, 173, 186); } border-color: rgb(165, 173, 186); }
.u-button-border:focus:not(:active) {
color: rgb(0,0,0);
background-color: rgb(238,238,238);
border-color: rgb(165, 173, 186); }
.u-button.u-button-primary { .u-button.u-button-primary {
color: rgb(255,255,255); color: rgb(255,255,255);
background-color: rgb(245, 60, 50); background-color: rgb(245, 60, 50);
border: 1px rgb(245, 60, 50) solid; } border: 1px rgb(245, 60, 50) solid; }
.u-button.u-button-primary.focus, .u-button.u-button-primary:focus, .u-button.u-button-primary:hover { .u-button.u-button-primary:hover {
background-color: rgb(230, 0, 18); background-color: rgb(230, 0, 18);
border-color: rgb(230, 0, 18); } border-color: rgb(230, 0, 18); }
.u-button.u-button-primary.focus, .u-button.u-button-primary:focus, .u-button.u-button-primary.u-button[disabled]:hover {
background-color: rgb(245, 60, 50);
border-color: rgb(245, 60, 50); }
.u-button.u-button-primary.active, .u-button.u-button-primary:active { .u-button.u-button-primary.active, .u-button.u-button-primary:active {
background-color: rgb(230, 0, 18); background-color: rgb(230, 0, 18);
border-color: rgb(230, 0, 18); } border-color: rgb(230, 0, 18); }
@ -6090,9 +6089,12 @@ input.u-button[type="submit"] {
color: rgb(0,0,0); color: rgb(0,0,0);
background-color: rgb(224,224,224); background-color: rgb(224,224,224);
border: 1px rgb(224,224,224) solid; } border: 1px rgb(224,224,224) solid; }
.u-button.u-button-secondary.focus, .u-button.u-button-secondary:focus, .u-button.u-button-secondary:hover { .u-button.u-button-secondary:hover {
background-color: rgb(238,238,238); background-color: rgb(189,189,189);
border-color: rgb(238,238,238); } border-color: rgb(189,189,189); }
.u-button.u-button-secondary.focus, .u-button.u-button-secondary:focus, .u-button.u-button-secondary.u-button[disabled]:hover {
background-color: rgb(224,224,224);
border-color: rgb(224,224,224); }
.u-button.u-button-secondary.active, .u-button.u-button-secondary:active { .u-button.u-button-secondary.active, .u-button.u-button-secondary:active {
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(189,189,189); } border-color: rgb(189,189,189); }
@ -6101,9 +6103,12 @@ input.u-button[type="submit"] {
color: rgb(255,255,255); color: rgb(255,255,255);
background-color: rgb(244,67,54); background-color: rgb(244,67,54);
border: 1px rgb(244,67,54) solid; } border: 1px rgb(244,67,54) solid; }
.u-button.u-button-danger.focus, .u-button.u-button-danger:focus, .u-button.u-button-danger:hover { .u-button.u-button-danger:hover {
background-color: rgb(229,115,115); background-color: rgb(229,115,115);
border-color: rgb(229,115,115); } border-color: rgb(229,115,115); }
.u-button.u-button-danger.focus, .u-button.u-button-danger:focus, .u-button.u-button-danger.u-button[disabled]:hover {
background-color: rgb(244,67,54);
border-color: rgb(244,67,54); }
.u-button.u-button-danger.active, .u-button.u-button-danger:active { .u-button.u-button-danger.active, .u-button.u-button-danger:active {
background-color: rgb(211,47,47); background-color: rgb(211,47,47);
border-color: rgb(211,47,47); } border-color: rgb(211,47,47); }
@ -6112,9 +6117,12 @@ input.u-button[type="submit"] {
color: rgb(255,255,255); color: rgb(255,255,255);
background-color: rgb(0,188,212); background-color: rgb(0,188,212);
border: 1px rgb(0,188,212) solid; } border: 1px rgb(0,188,212) solid; }
.u-button.u-button-info.focus, .u-button.u-button-info:focus, .u-button.u-button-info:hover { .u-button.u-button-info:hover {
background-color: rgb(77,208,225); background-color: rgb(77,208,225);
border-color: rgb(77,208,225); } border-color: rgb(77,208,225); }
.u-button.u-button-info.focus, .u-button.u-button-info:focus, .u-button.u-button-info.u-button[disabled]:hover {
background-color: rgb(0,188,212);
border-color: rgb(0,188,212); }
.u-button.u-button-info.active, .u-button.u-button-info:active { .u-button.u-button-info.active, .u-button.u-button-info:active {
background-color: rgb(0,151,167); background-color: rgb(0,151,167);
border-color: rgb(0,151,167); } border-color: rgb(0,151,167); }
@ -6123,9 +6131,12 @@ input.u-button[type="submit"] {
color: rgb(255,255,255); color: rgb(255,255,255);
background-color: rgb(255,152,0); background-color: rgb(255,152,0);
border: 1px rgb(255,152,0) solid; } border: 1px rgb(255,152,0) solid; }
.u-button.u-button-warning.focus, .u-button.u-button-warning:focus, .u-button.u-button-warning:hover { .u-button.u-button-warning:hover {
background-color: rgb(255,183,77); background-color: rgb(255,183,77);
border-color: rgb(255,183,77); } border-color: rgb(255,183,77); }
.u-button.u-button-warning.focus, .u-button.u-button-warning:focus, .u-button.u-button-warning.u-button[disabled]:hover {
background-color: rgb(255,152,0);
border-color: rgb(255,152,0); }
.u-button.u-button-warning.active, .u-button.u-button-warning:active { .u-button.u-button-warning.active, .u-button.u-button-warning:active {
background-color: rgb(245,124,0); background-color: rgb(245,124,0);
border-color: rgb(245,124,0); } border-color: rgb(245,124,0); }
@ -6134,9 +6145,12 @@ input.u-button[type="submit"] {
color: rgb(255,255,255); color: rgb(255,255,255);
background-color: rgb(76,175,80); background-color: rgb(76,175,80);
border: 1px rgb(76,175,80) solid; } border: 1px rgb(76,175,80) solid; }
.u-button.u-button-success.focus, .u-button.u-button-success:focus, .u-button.u-button-success:hover { .u-button.u-button-success:hover {
background-color: rgb(129,199,132); background-color: rgb(129,199,132);
border-color: rgb(129,199,132); } border-color: rgb(129,199,132); }
.u-button.u-button-success.focus, .u-button.u-button-success:focus, .u-button.u-button-success.u-button[disabled]:hover {
background-color: rgb(76,175,80);
border-color: rgb(76,175,80); }
.u-button.u-button-success.active, .u-button.u-button-success:active { .u-button.u-button-success.active, .u-button.u-button-success:active {
background-color: rgb(56,142,60); background-color: rgb(56,142,60);
border-color: rgb(56,142,60); } border-color: rgb(56,142,60); }
@ -6145,9 +6159,12 @@ input.u-button[type="submit"] {
color: rgb(255,255,255); color: rgb(255,255,255);
background-color: rgb(97,97,97); background-color: rgb(97,97,97);
border: 1px rgb(97,97,97) solid; } border: 1px rgb(97,97,97) solid; }
.u-button.u-button-dark.focus, .u-button.u-button-dark:focus, .u-button.u-button-dark:hover { .u-button.u-button-dark:hover {
background-color: rgb(117,117,117); background-color: rgb(117,117,117);
border-color: rgb(117,117,117); } border-color: rgb(117,117,117); }
.u-button.u-button-dark.focus, .u-button.u-button-dark:focus, .u-button.u-button-dark.u-button[disabled]:hover {
background-color: rgb(97,97,97);
border-color: rgb(97,97,97); }
.u-button.u-button-dark.active, .u-button.u-button-dark:active { .u-button.u-button-dark.active, .u-button.u-button-dark:active {
background-color: rgb(66,66,66); background-color: rgb(66,66,66);
border-color: rgb(66,66,66); } border-color: rgb(66,66,66); }
@ -6156,9 +6173,12 @@ input.u-button[type="submit"] {
color: rgb(97,97,97); color: rgb(97,97,97);
background-color: rgb(255,255,255); background-color: rgb(255,255,255);
border: 1px rgb(255,255,255) solid; } border: 1px rgb(255,255,255) solid; }
.u-button.u-button-light.focus, .u-button.u-button-light:focus, .u-button.u-button-light:hover { .u-button.u-button-light:hover {
background-color: rgb(238,238,238); background-color: rgb(238,238,238);
border-color: rgb(238,238,238); } border-color: rgb(238,238,238); }
.u-button.u-button-light.focus, .u-button.u-button-light:focus, .u-button.u-button-light.u-button[disabled]:hover {
background-color: rgb(255,255,255);
border-color: rgb(255,255,255); }
.u-button.u-button-light.active, .u-button.u-button-light:active { .u-button.u-button-light.active, .u-button.u-button-light:active {
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(189,189,189); } border-color: rgb(189,189,189); }
@ -6167,10 +6187,14 @@ input.u-button[type="submit"] {
color: rgb(76,175,80); color: rgb(76,175,80);
background-color: #fff; background-color: #fff;
border: 1px rgb(76,175,80) solid; } border: 1px rgb(76,175,80) solid; }
.u-button-border.u-button-success.focus, .u-button-border.u-button-success:focus, .u-button-border.u-button-success:hover { .u-button-border.u-button-success:hover {
background-color: rgb(129,199,132); background-color: rgb(129,199,132);
border-color: rgb(129,199,132); border-color: rgb(129,199,132);
color: #fff; } color: #fff; }
.u-button-border.u-button-success.focus, .u-button-border.u-button-success:focus, .u-button-border.u-button-success.u-button[disabled]:hover {
color: rgb(76,175,80);
background-color: #fff;
border-color: rgb(76,175,80); }
.u-button-border.u-button-success.active, .u-button-border.u-button-success:active { .u-button-border.u-button-success.active, .u-button-border.u-button-success:active {
color: #fff; color: #fff;
background-color: rgb(56,142,60); background-color: rgb(56,142,60);
@ -6180,10 +6204,14 @@ input.u-button[type="submit"] {
color: rgb(255,152,0); color: rgb(255,152,0);
background-color: #fff; background-color: #fff;
border: 1px rgb(255,152,0) solid; } border: 1px rgb(255,152,0) solid; }
.u-button-border.u-button-warning.focus, .u-button-border.u-button-warning:focus, .u-button-border.u-button-warning:hover { .u-button-border.u-button-warning:hover {
background-color: rgb(255,183,77); background-color: rgb(255,183,77);
border-color: rgb(255,183,77); border-color: rgb(255,183,77);
color: #fff; } color: #fff; }
.u-button-border.u-button-warning.focus, .u-button-border.u-button-warning:focus, .u-button-border.u-button-warning.u-button[disabled]:hover {
color: rgb(255,152,0);
background-color: #fff;
border-color: rgb(255,152,0); }
.u-button-border.u-button-warning.active, .u-button-border.u-button-warning:active { .u-button-border.u-button-warning.active, .u-button-border.u-button-warning:active {
color: #fff; color: #fff;
background-color: rgb(245,124,0); background-color: rgb(245,124,0);
@ -6193,10 +6221,14 @@ input.u-button[type="submit"] {
color: rgb(244,67,54); color: rgb(244,67,54);
background-color: #fff; background-color: #fff;
border: 1px rgb(244,67,54) solid; } border: 1px rgb(244,67,54) solid; }
.u-button-border.u-button-danger.focus, .u-button-border.u-button-danger:focus, .u-button-border.u-button-danger:hover { .u-button-border.u-button-danger:hover {
background-color: rgb(229,115,115); background-color: rgb(229,115,115);
border-color: rgb(229,115,115); border-color: rgb(229,115,115);
color: #fff; } color: #fff; }
.u-button-border.u-button-danger.focus, .u-button-border.u-button-danger:focus, .u-button-border.u-button-danger.u-button[disabled]:hover {
color: rgb(244,67,54);
background-color: #fff;
border-color: rgb(244,67,54); }
.u-button-border.u-button-danger.active, .u-button-border.u-button-danger:active { .u-button-border.u-button-danger.active, .u-button-border.u-button-danger:active {
color: #fff; color: #fff;
background-color: rgb(211,47,47); background-color: rgb(211,47,47);
@ -6206,10 +6238,14 @@ input.u-button[type="submit"] {
color: rgb(0,188,212); color: rgb(0,188,212);
background-color: #fff; background-color: #fff;
border: 1px rgb(0,188,212) solid; } border: 1px rgb(0,188,212) solid; }
.u-button-border.u-button-info.focus, .u-button-border.u-button-info:focus, .u-button-border.u-button-info:hover { .u-button-border.u-button-info:hover {
background-color: rgb(77,208,225); background-color: rgb(77,208,225);
border-color: rgb(77,208,225); border-color: rgb(77,208,225);
color: #fff; } color: #fff; }
.u-button-border.u-button-info.focus, .u-button-border.u-button-info:focus, .u-button-border.u-button-info.u-button[disabled]:hover {
color: rgb(0,188,212);
background-color: #fff;
border-color: rgb(0,188,212); }
.u-button-border.u-button-info.active, .u-button-border.u-button-info:active { .u-button-border.u-button-info.active, .u-button-border.u-button-info:active {
color: #fff; color: #fff;
background-color: rgb(0,151,167); background-color: rgb(0,151,167);
@ -6219,10 +6255,14 @@ input.u-button[type="submit"] {
color: rgb(245, 60, 50); color: rgb(245, 60, 50);
background-color: #fff; background-color: #fff;
border: 1px rgb(245, 60, 50) solid; } border: 1px rgb(245, 60, 50) solid; }
.u-button-border.u-button-primary.focus, .u-button-border.u-button-primary:focus, .u-button-border.u-button-primary:hover { .u-button-border.u-button-primary:hover {
background-color: rgb(230, 0, 18); background-color: rgb(230, 0, 18);
border-color: rgb(230, 0, 18); border-color: rgb(230, 0, 18);
color: #fff; } color: #fff; }
.u-button-border.u-button-primary.focus, .u-button-border.u-button-primary:focus, .u-button-border.u-button-primary.u-button[disabled]:hover {
color: rgb(245, 60, 50);
background-color: #fff;
border-color: rgb(245, 60, 50); }
.u-button-border.u-button-primary.active, .u-button-border.u-button-primary:active { .u-button-border.u-button-primary.active, .u-button-border.u-button-primary:active {
color: #fff; color: #fff;
background-color: rgb(230, 0, 18); background-color: rgb(230, 0, 18);
@ -6232,10 +6272,14 @@ input.u-button[type="submit"] {
color: rgb(224,224,224); color: rgb(224,224,224);
background-color: #fff; background-color: #fff;
border: 1px rgb(224,224,224) solid; } border: 1px rgb(224,224,224) solid; }
.u-button-border.u-button-secondary.focus, .u-button-border.u-button-secondary:focus, .u-button-border.u-button-secondary:hover { .u-button-border.u-button-secondary:hover {
background-color: rgb(238,238,238); background-color: rgb(189,189,189);
border-color: rgb(238,238,238); border-color: rgb(189,189,189);
color: #fff; } color: #fff; }
.u-button-border.u-button-secondary.focus, .u-button-border.u-button-secondary:focus, .u-button-border.u-button-secondary.u-button[disabled]:hover {
color: rgb(224,224,224);
background-color: #fff;
border-color: rgb(224,224,224); }
.u-button-border.u-button-secondary.active, .u-button-border.u-button-secondary:active { .u-button-border.u-button-secondary.active, .u-button-border.u-button-secondary:active {
color: #fff; color: #fff;
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
@ -6245,10 +6289,14 @@ input.u-button[type="submit"] {
color: rgb(97,97,97); color: rgb(97,97,97);
background-color: #fff; background-color: #fff;
border: 1px rgb(97,97,97) solid; } border: 1px rgb(97,97,97) solid; }
.u-button-border.u-button-dark.focus, .u-button-border.u-button-dark:focus, .u-button-border.u-button-dark:hover { .u-button-border.u-button-dark:hover {
background-color: rgb(117,117,117); background-color: rgb(117,117,117);
border-color: rgb(117,117,117); border-color: rgb(117,117,117);
color: #fff; } color: #fff; }
.u-button-border.u-button-dark.focus, .u-button-border.u-button-dark:focus, .u-button-border.u-button-dark.u-button[disabled]:hover {
color: rgb(97,97,97);
background-color: #fff;
border-color: rgb(97,97,97); }
.u-button-border.u-button-dark.active, .u-button-border.u-button-dark:active { .u-button-border.u-button-dark.active, .u-button-border.u-button-dark:active {
color: #fff; color: #fff;
background-color: rgb(66,66,66); background-color: rgb(66,66,66);
@ -6258,10 +6306,14 @@ input.u-button[type="submit"] {
color: rgb(97,97,97); color: rgb(97,97,97);
background-color: #fff; background-color: #fff;
border: 1px rgb(255,255,255) solid; } border: 1px rgb(255,255,255) solid; }
.u-button-border.u-button-light.focus, .u-button-border.u-button-light:focus, .u-button-border.u-button-light:hover { .u-button-border.u-button-light:hover {
background-color: rgb(238,238,238); background-color: rgb(238,238,238);
border-color: rgb(238,238,238); border-color: rgb(238,238,238);
color: #fff; } color: #fff; }
.u-button-border.u-button-light.focus, .u-button-border.u-button-light:focus, .u-button-border.u-button-light.u-button[disabled]:hover {
color: rgb(97,97,97);
background-color: #fff;
border-color: rgb(255,255,255); }
.u-button-border.u-button-light.active, .u-button-border.u-button-light:active { .u-button-border.u-button-light.active, .u-button-border.u-button-light:active {
color: #fff; color: #fff;
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
@ -6352,7 +6404,7 @@ input.u-button[type="submit"] {
background-color: #fff; background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgb(165, 173, 186); border: 1px solid rgb(165, 173, 186);
border-radius: 6px; border-radius: 3px;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); } box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); }
.u-popconfirm-dark { .u-popconfirm-dark {
background-color: rgb(66,66,66); background-color: rgb(66,66,66);
@ -6583,7 +6635,11 @@ input.u-button[type="submit"] {
list-style-type: none; } list-style-type: none; }
.u-pagination-list > li > a:hover, .u-pagination-list > li > span:hover, .u-pagination-list > li > a:focus, .u-pagination-list > li > span:focus { .u-pagination-list > li > a:hover, .u-pagination-list > li > span:hover, .u-pagination-list > li > a:focus, .u-pagination-list > li > span:focus {
color: #666; color: #666;
<<<<<<< HEAD
background-color: #EBECF0; background-color: #EBECF0;
=======
background-color: rgb(235, 236, 240);
>>>>>>> 5c0c3b70aa3b33affbf43755c6d8059633c9bf6a
border-color: #d7d7d7; border-color: #d7d7d7;
cursor: pointer; } cursor: pointer; }
.u-pagination-list > li > a > i { .u-pagination-list > li > a > i {
@ -7313,7 +7369,8 @@ ul {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
max-width: 100%; max-width: 100%;
padding-right: 14px; } padding-right: 14px;
padding-left: 5px; }
.u-select-disabled { .u-select-disabled {
color: #ccc; } color: #ccc; }
@ -7340,16 +7397,16 @@ ul {
color: #ccc; } color: #ccc; }
.u-select-selection--single { .u-select-selection--single {
height: 30px; height: 32px;
position: relative; position: relative;
cursor: pointer; } cursor: pointer; }
.u-select-selection-rendered { .u-select-selection-rendered {
display: block; display: block;
margin-left: 8px; margin-left: 2px;
margin-right: 8px; margin-right: 2px;
position: relative; position: relative;
line-height: 28px; } line-height: 30px; }
.u-select-selection-rendered:after { .u-select-selection-rendered:after {
content: '.'; content: '.';
visibility: hidden; visibility: hidden;
@ -7358,29 +7415,29 @@ ul {
width: 0; } width: 0; }
.u-select-lg .u-select-selection--single { .u-select-lg .u-select-selection--single {
height: 38px; } height: 40px; }
.u-select-lg .u-select-selection-rendered { .u-select-lg .u-select-selection-rendered {
line-height: 36px; } line-height: 40px; }
.u-select-lg .u-select-selection--multiple { .u-select-lg .u-select-selection--multiple {
min-height: 32px; } min-height: 40px; }
.u-select-lg .u-select-selection--multiple .u-select-selection-rendered li { .u-select-lg .u-select-selection--multiple .u-select-selection-rendered li {
height: 24px; height: 24px;
line-height: 24px; } line-height: 24px; }
.u-select-sm .u-select-selection { .u-select-sm .u-select-selection {
border-radius: 2px; } border-radius: 3px; }
.u-select-sm .u-select-selection--single { .u-select-sm .u-select-selection--single {
height: 24px; } height: 26px; }
.u-select-sm .u-select-selection-rendered { .u-select-sm .u-select-selection-rendered {
line-height: 22px; } line-height: 24px; }
.u-select-sm .u-select-selection--multiple { .u-select-sm .u-select-selection--multiple {
min-height: 22px; } min-height: 24px; }
.u-select-sm .u-select-selection--multiple .u-select-selection-rendered li { .u-select-sm .u-select-selection--multiple .u-select-selection-rendered li {
height: 14px; height: 14px;
@ -7394,7 +7451,7 @@ ul {
.u-select-search-field-placeholder { .u-select-search-field-placeholder {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 0; left: 5px;
right: 9px; right: 9px;
color: #ccc; color: #ccc;
line-height: 20px; line-height: 20px;
@ -7422,7 +7479,7 @@ ul {
width: 100%; width: 100%;
background: transparent; background: transparent;
outline: 0; outline: 0;
border-radius: 4px; } border-radius: 3px; }
.u-select-search--inline .u-select-search-field-mirror { .u-select-search--inline .u-select-search-field-mirror {
position: absolute; position: absolute;
top: 0; top: 0;
@ -7435,7 +7492,6 @@ ul {
.u-select-selection--multiple { .u-select-selection--multiple {
min-height: 28px; min-height: 28px;
cursor: text; cursor: text;
padding-bottom: 3px;
zoom: 1; } zoom: 1; }
.u-select-selection--multiple:before, .u-select-selection--multiple:after { .u-select-selection--multiple:before, .u-select-selection--multiple:after {
content: " "; content: " ";
@ -7453,20 +7509,20 @@ ul {
.u-select-selection--multiple .u-select-search--inline .u-select-search-field { .u-select-selection--multiple .u-select-search--inline .u-select-search-field {
width: 0.75em; } width: 0.75em; }
.u-select-selection--multiple .u-select-selection-rendered { .u-select-selection--multiple .u-select-selection-rendered {
margin-left: 5px; margin-left: 4px;
margin-bottom: -3px;
height: auto; } height: auto; }
.u-select-selection--multiple > ul > li, .u-select-selection--multiple .u-select-selection-rendered > ul > li { .u-select-selection--multiple > ul > li, .u-select-selection--multiple .u-select-selection-rendered > ul > li {
margin-top: 3px; margin-top: 3px;
height: 20px; margin-bottom: 3px;
line-height: 20px; } height: 24px;
line-height: 24px; }
.u-select-selection--multiple .u-select-selection-choice { .u-select-selection--multiple .u-select-selection-choice {
background-color: #f3f3f3; background-color: #f3f3f3;
border-radius: 4px; border-radius: 3px;
cursor: default; cursor: default;
float: left; float: left;
padding: 0 16px; padding: 0 16px;
margin-right: 4px; margin-right: 3px;
max-width: 99%; max-width: 99%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@ -7506,7 +7562,7 @@ ul {
position: absolute; position: absolute;
right: 4px; right: 4px;
padding: 0 0 0 8px; padding: 0 0 0 8px;
top: -3px; } top: -4px; }
.u-select-selection--multiple .u-select-selection-choice-remove:before { .u-select-selection--multiple .u-select-selection-choice-remove:before {
display: block; display: block;
font-family: "uf"; } font-family: "uf"; }
@ -7551,12 +7607,13 @@ ul {
position: relative; position: relative;
z-index: 1; z-index: 1;
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
box-shadow: none; } box-shadow: none;
padding-left: 5px; }
.u-select-dropdown { .u-select-dropdown {
background-color: white; background-color: white;
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 3px;
box-sizing: border-box; box-sizing: border-box;
z-index: 1800; z-index: 1800;
left: -9999px; left: -9999px;
@ -7595,6 +7652,7 @@ ul {
position: relative; position: relative;
display: block; display: block;
padding: 7px 16px; padding: 7px 16px;
padding-left: 6px;
font-weight: normal; font-weight: normal;
color: #666; color: #666;
cursor: pointer; cursor: pointer;
@ -7606,7 +7664,8 @@ ul {
white-space: nowrap; } white-space: nowrap; }
.u-select-dropdown .u-select-dropdown-menu-item:hover, .u-select-dropdown .u-select-dropdown-menu-item:hover,
.u-select-dropdown .u-select-dropdown-menu-item-active { .u-select-dropdown .u-select-dropdown-menu-item-active {
background-color: rgb(235, 236, 240); } background-color: rgb(235, 236, 240);
color: rgb(245, 60, 50); }
.u-select-dropdown .u-select-dropdown-menu-item-disabled { .u-select-dropdown .u-select-dropdown-menu-item-disabled {
color: #ccc; color: #ccc;
cursor: not-allowed; } cursor: not-allowed; }
@ -7693,7 +7752,7 @@ ul {
vertical-align: middle; } vertical-align: middle; }
.u-search-input.u-input-group .u-input:first-child, .u-search-input.u-input-group .u-select:first-child { .u-search-input.u-input-group .u-input:first-child, .u-search-input.u-input-group .u-select:first-child {
border-radius: 4px; border-radius: 3px;
position: absolute; position: absolute;
top: -1px; top: -1px;
width: 100%; } width: 100%; }
@ -7986,7 +8045,7 @@ ul {
background-color: #fff; background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 6px; border-radius: 3px;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); } box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); }
.u-popover > .arrow, .u-popover > .arrow:after { .u-popover > .arrow, .u-popover > .arrow:after {
position: absolute; position: absolute;
@ -8115,7 +8174,7 @@ ul {
padding: 3px 8px; padding: 3px 8px;
color: #fff; color: #fff;
background-color: #000; background-color: #000;
border-radius: 4px; border-radius: 3px;
word-wrap: break-word; } word-wrap: break-word; }
.u-tooltip.right { .u-tooltip.right {
padding: 0 5px; } padding: 0 5px; }
@ -8181,7 +8240,7 @@ ul {
border-top-width: 0; border-top-width: 0;
border-bottom-color: #fff; } border-bottom-color: #fff; }
.u-tooltip.inverse.bottom .tooltip-arrow { .u-tooltip.inverse.bottom .tooltip-arrow {
border-bottom-color: #d9d9d9; } border-bottom-color: rgb(165, 173, 186); }
.u-tooltip.inverse-arrow.inverse.top .tooltip-arrow::after { .u-tooltip.inverse-arrow.inverse.top .tooltip-arrow::after {
top: 1px; top: 1px;
margin-left: -5px; margin-left: -5px;
@ -8189,14 +8248,14 @@ ul {
border-bottom-color: #fff; border-bottom-color: #fff;
border-bottom-width: inherit; } border-bottom-width: inherit; }
.u-tooltip.inverse-arrow.inverse.top .tooltip-arrow { .u-tooltip.inverse-arrow.inverse.top .tooltip-arrow {
border-bottom-color: #d9d9d9; } border-bottom-color: rgb(165, 173, 186); }
.u-tooltip.inverse.left .tooltip-arrow::after { .u-tooltip.inverse.left .tooltip-arrow::after {
border-right-width: 0; border-right-width: 0;
top: -5px; top: -5px;
margin-left: -6px; margin-left: -6px;
border-left-color: #fff; } border-left-color: #fff; }
.u-tooltip.inverse.left .tooltip-arrow { .u-tooltip.inverse.left .tooltip-arrow {
border-left-color: #d9d9d9; } border-left-color: rgb(165, 173, 186); }
.u-tooltip.inverse-arrow.inverse.right .tooltip-arrow::after { .u-tooltip.inverse-arrow.inverse.right .tooltip-arrow::after {
border-right-width: 0; border-right-width: 0;
top: -5px; top: -5px;
@ -8204,14 +8263,14 @@ ul {
border-left-color: #fff; border-left-color: #fff;
border-left-width: inherit; } border-left-width: inherit; }
.u-tooltip.inverse-arrow.inverse.right .tooltip-arrow { .u-tooltip.inverse-arrow.inverse.right .tooltip-arrow {
border-left-color: #d9d9d9; } border-left-color: rgb(165, 173, 186); }
.u-tooltip.inverse.right .tooltip-arrow::after { .u-tooltip.inverse.right .tooltip-arrow::after {
border-left-width: 0; border-left-width: 0;
top: -5px; top: -5px;
margin-left: 1px; margin-left: 1px;
border-right-color: #fff; } border-right-color: #fff; }
.u-tooltip.inverse.right .tooltip-arrow { .u-tooltip.inverse.right .tooltip-arrow {
border-right-color: #d9d9d9; } border-right-color: rgb(165, 173, 186); }
.u-tooltip.inverse-arrow.inverse.left .tooltip-arrow::after { .u-tooltip.inverse-arrow.inverse.left .tooltip-arrow::after {
border-left-width: 0; border-left-width: 0;
top: -5px; top: -5px;
@ -8219,7 +8278,7 @@ ul {
border-right-color: #fff; border-right-color: #fff;
border-right-width: inherit; } border-right-width: inherit; }
.u-tooltip.inverse-arrow.inverse.left .tooltip-arrow { .u-tooltip.inverse-arrow.inverse.left .tooltip-arrow {
border-right-color: #d9d9d9; } border-right-color: rgb(165, 173, 186); }
.u-tooltip.inverse.top .tooltip-arrow::after { .u-tooltip.inverse.top .tooltip-arrow::after {
top: -6px; top: -6px;
margin-left: -5px; margin-left: -5px;
@ -8227,7 +8286,7 @@ ul {
border-bottom-color: #d9d9d9; border-bottom-color: #d9d9d9;
border-top-color: #fff; } border-top-color: #fff; }
.u-tooltip.inverse.top .tooltip-arrow { .u-tooltip.inverse.top .tooltip-arrow {
border-top-color: #d9d9d9; } border-top-color: rgb(165, 173, 186); }
.u-tooltip.inverse-arrow.inverse.bottom .tooltip-arrow::after { .u-tooltip.inverse-arrow.inverse.bottom .tooltip-arrow::after {
top: -6px; top: -6px;
margin-left: -5px; margin-left: -5px;
@ -8236,11 +8295,11 @@ ul {
border-top-color: #fff; border-top-color: #fff;
border-top-width: inherit; } border-top-width: inherit; }
.u-tooltip.inverse-arrow.inverse.bottom .tooltip-arrow { .u-tooltip.inverse-arrow.inverse.bottom .tooltip-arrow {
border-top-color: #d9d9d9; } border-top-color: rgb(165, 173, 186); }
.u-tooltip.inverse .tooltip-inner { .u-tooltip.inverse .tooltip-inner {
background-color: #fff; background-color: #fff;
color: #333333; color: #333333;
border: 1px solid #d9d9d9; } border: 1px solid rgb(165, 173, 186); }
.u-tooltip.inverse .tooltip-arrow::after { .u-tooltip.inverse .tooltip-arrow::after {
position: absolute; position: absolute;
display: block; display: block;
@ -8803,6 +8862,12 @@ ul {
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding-right: 24px; } padding-right: 24px; }
.editable-cell-input-wrapper .u-form-item.formItem-style .u-label {
display: none; }
.editable-cell-input-wrapper .u-input-group .u-form-control {
height: 26px; }
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding: 5px 24px 5px 5px; padding: 5px 24px 5px 5px;
height: 30px; } height: 30px; }
@ -10451,10 +10516,17 @@ li.rc-time-picker-panel-select-option-disabled:hover {
top: -2px; } top: -2px; }
.datepicker-input-group.u-input-group:hover > input { .datepicker-input-group.u-input-group:hover > input {
<<<<<<< HEAD
border-color: rgb(245, 60, 50); } border-color: rgb(245, 60, 50); }
.calendar-picker.u-input-group:hover > input { .calendar-picker.u-input-group:hover > input {
border-color: rgb(245, 60, 50); } border-color: rgb(245, 60, 50); }
=======
border-color: #66afe9; }
.calendar-picker.u-input-group:hover > input {
border-color: #66afe9; }
>>>>>>> 5c0c3b70aa3b33affbf43755c6d8059633c9bf6a
.selected { .selected {
background: #e3f2fd; } background: #e3f2fd; }
@ -10484,4 +10556,15 @@ th:hover .uf {
color: #FFFFFF; color: #FFFFFF;
line-height: 26px; } line-height: 26px; }
.demo8 .u-table {
margin-bottom: 11px; }
.demo8 .u-pagination {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
-ms-flex-pack: center;
justify-content: center; }
/*# sourceMappingURL=demo.css.map */ /*# sourceMappingURL=demo.css.map */

4
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

67304
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

32
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bee-table", "name": "bee-table",
"version": "2.0.1-beta.2", "version": "2.0.3-beta.0",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",
@ -46,19 +46,19 @@
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0" "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
}, },
"dependencies": { "dependencies": {
"bee-button": "^2.0.4", "bee-button": "latest",
"bee-datepicker": "latest", "bee-datepicker": "^2.0.6",
"bee-dnd": "^1.0.2", "bee-dnd": "^1.0.2",
"bee-dropdown": "1.0.3", "bee-dropdown": "latest",
"bee-form-control": "latest", "bee-form-control": "latest",
"bee-icon": "^1.0.5", "bee-icon": "latest",
"bee-input-number": "^1.1.15", "bee-input-number": "latest",
"bee-loading": "^1.0.3", "bee-loading": "^1.0.6",
"bee-locale": "0.0.11", "bee-locale": "0.0.11",
"bee-menus": "1.0.7", "bee-menus": "^2.0.2",
"bee-modal": "^1.0.9", "bee-modal": "^2.0.0",
"bee-popover": "^1.0.2", "bee-popover": "^2.0.0",
"bee-select": "^1.0.21", "bee-select": "^2.0.4",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"component-classes": "^1.2.6", "component-classes": "^1.2.6",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
@ -76,15 +76,15 @@
"devDependencies": { "devDependencies": {
"babel-jest": "^22.0.4", "babel-jest": "^22.0.4",
"bee-animate": "latest", "bee-animate": "latest",
"bee-checkbox": "^2.0.1", "bee-checkbox": "latest",
"bee-form": "1.1.10", "bee-form": "1.1.10",
"bee-input-group": "latest", "bee-input-group": "latest",
"bee-layout": "latest", "bee-layout": "latest",
"bee-pagination": "latest", "bee-pagination": "^2.0.1",
"bee-panel": "^1.2.12", "bee-panel": "^2.0.1",
"bee-popconfirm": "^1.0.2", "bee-popconfirm": "^2.0.0",
"bee-tools": "latest", "bee-tools": "latest",
"bee-tooltip": "^1.0.2", "bee-tooltip": "^2.0.0",
"chai": "^3.5.0", "chai": "^3.5.0",
"console-polyfill": "~0.2.1", "console-polyfill": "~0.2.1",
"cz-conventional-changelog": "^2.1.0", "cz-conventional-changelog": "^2.1.0",

4
src/FilterType.js
View File

@ -1,10 +1,10 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import zhCN from "rc-calendar/lib/locale/zh_CN"; import DatePicker from 'bee-datepicker';
import zhCN from 'bee-datepicker/build/locale/zh_CN';
import FormControl from 'bee-form-control'; import FormControl from 'bee-form-control';
import Select from 'bee-select'; import Select from 'bee-select';
import InputNumber from 'bee-input-number'; import InputNumber from 'bee-input-number';
import DatePicker from 'bee-datepicker';
import FilterDropDown from './FilterDropDown'; import FilterDropDown from './FilterDropDown';
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;

1
src/Table.js
View File

@ -276,7 +276,6 @@ class Table extends Component {
if(y){ if(y){
const bodyH = this.refs.bodyTable.clientHeight; const bodyH = this.refs.bodyTable.clientHeight;
const bodyContentH = this.refs.bodyTable.querySelector('table').clientHeight; const bodyContentH = this.refs.bodyTable.querySelector('table').clientHeight;
console.log(bodyH,bodyContentH);
if(bodyContentH <= bodyH){ if(bodyContentH <= bodyH){
this.refs.bodyTable.style.overflowY='auto'; this.refs.bodyTable.style.overflowY='auto';
this.refs.headTable.style.overflowY='auto'; this.refs.headTable.style.overflowY='auto';

8
src/Table.scss
View File

@ -635,6 +635,14 @@ $checkbox-height:16px;
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding-right: 24px; padding-right: 24px;
} }
.editable-cell-input-wrapper {
.u-form-item.formItem-style .u-label{
display: none;
}
.u-input-group .u-form-control{
height: 26px;
}
}
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding: 5px 24px 5px 5px; padding: 5px 24px 5px 5px;