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

Merge branch 'master' of github.com:tinper-bee/bee-table

This commit is contained in:
izbz wh 2019-03-13 14:07:58 +08:00
parent fdd51bb06e 0f5eea9a37
commit d09b156205
18 changed files with 1086 additions and 1147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/Table.css
View File

@ -187,7 +187,7 @@
.u-table td { .u-table td {
border-bottom: 1px solid rgb(233,233,233); } border-bottom: 1px solid rgb(233,233,233); }
.u-table td a { .u-table td a {
color: rgb(245, 60, 50); } color: #2196F3; }
.u-table td a:hover { .u-table td a:hover {
color: rgb(230, 0, 18); } color: rgb(230, 0, 18); }
.u-table td a:active { .u-table td a:active {
@ -569,7 +569,8 @@
display: none; } display: none; }
.editable-cell-input-wrapper .u-input-group .u-form-control { .editable-cell-input-wrapper .u-input-group .u-form-control {
height: 26px; } height: 26px;
font-size: 12px; }
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding: 5px 24px 5px 5px; padding: 5px 24px 5px 5px;
@ -673,7 +674,7 @@
display: none; display: none;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: #E7F2FC; } background: transparent; }
.u-row-hover2 { .u-row-hover2 {
position: absolute; position: absolute;

18
build/lib/multiSelect.js
View File

@ -1,4 +1,4 @@
'use strict'; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
@ -8,15 +8,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
exports["default"] = multiSelect; exports["default"] = multiSelect;
var _react = require('react'); var _react = require("react");
var _react2 = _interopRequireDefault(_react); var _react2 = _interopRequireDefault(_react);
var _beeCheckbox = require('bee-checkbox'); var _util = require("./util");
var _beeCheckbox2 = _interopRequireDefault(_beeCheckbox);
var _util = require('./util');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@ -27,6 +23,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); } function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
// import Checkbox from 'bee-checkbox';
/** /**
* 参数: 过滤表头 * 参数: 过滤表头
@ -218,7 +216,7 @@ function multiSelect(Table, Checkbox) {
var _defaultColumns = [{ var _defaultColumns = [{
title: _react2["default"].createElement(Checkbox, _extends({ title: _react2["default"].createElement(Checkbox, _extends({
className: 'table-checkbox' className: "table-checkbox"
}, checkAttr, { }, checkAttr, {
disabled: disabledCount == dataLength ? true : false, disabled: disabledCount == dataLength ? true : false,
onChange: _this2.onAllCheckChange onChange: _this2.onAllCheckChange
@ -232,7 +230,7 @@ function multiSelect(Table, Checkbox) {
record._disabled ? attr.disabled = record._disabled : ""; record._disabled ? attr.disabled = record._disabled : "";
return _react2["default"].createElement(Checkbox, _extends({ return _react2["default"].createElement(Checkbox, _extends({
key: index, key: index,
className: 'table-checkbox' className: "table-checkbox"
}, attr, { }, attr, {
checked: record._checked, checked: record._checked,
onClick: _this2.handleClick, onClick: _this2.handleClick,
@ -244,4 +242,4 @@ function multiSelect(Table, Checkbox) {
}; };
}, _temp; }, _temp;
} }
module.exports = exports['default']; module.exports = exports["default"];

18
build/lib/newMultiSelect.js
View File

@ -1,4 +1,4 @@
'use strict'; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
@ -8,15 +8,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
exports["default"] = newMultiSelect; exports["default"] = newMultiSelect;
var _react = require('react'); var _react = require("react");
var _react2 = _interopRequireDefault(_react); var _react2 = _interopRequireDefault(_react);
var _beeCheckbox = require('bee-checkbox'); var _util = require("./util");
var _beeCheckbox2 = _interopRequireDefault(_beeCheckbox);
var _util = require('./util');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@ -27,6 +23,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); } function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
// import Checkbox from 'bee-checkbox';
/** /**
* 参数: 过滤表头 * 参数: 过滤表头
@ -166,7 +164,7 @@ function newMultiSelect(Table, Checkbox) {
var _defaultColumns = [{ var _defaultColumns = [{
title: _react2["default"].createElement(Checkbox, { title: _react2["default"].createElement(Checkbox, {
className: 'table-checkbox', className: "table-checkbox",
checked: checkedAll checked: checkedAll
// indeterminate={indeterminate_bool && !this.state.checkedAll} // indeterminate={indeterminate_bool && !this.state.checkedAll}
, onChange: _this2.onAllCheckChange , onChange: _this2.onAllCheckChange
@ -180,7 +178,7 @@ function newMultiSelect(Table, Checkbox) {
record._disabled ? attr.disabled = record._disabled : ""; record._disabled ? attr.disabled = record._disabled : "";
return _react2["default"].createElement(Checkbox, _extends({ return _react2["default"].createElement(Checkbox, _extends({
key: index, key: index,
className: 'table-checkbox' className: "table-checkbox"
}, attr, { }, attr, {
checked: record._checked, checked: record._checked,
onClick: _this2.handleClick, onClick: _this2.handleClick,
@ -192,4 +190,4 @@ function newMultiSelect(Table, Checkbox) {
}; };
}, _temp; }, _temp;
} }
module.exports = exports['default']; module.exports = exports["default"];

1
demo/TableDemo.scss
View File

@ -26,7 +26,6 @@
} }
.demo25{ .demo25{
width: 700px;
height: 100%; height: 100%;
.u-table-filter-column-filter-icon{ .u-table-filter-column-filter-icon{

1
demo/demolist/Demo14.js
View File

@ -161,6 +161,7 @@ class Demo14 extends React.Component {
isclickTrigger={true} isclickTrigger={true}
value={text} value={text}
onChange={this.onSelectChange(index, "address")} onChange={this.onSelectChange(index, "address")}
size="sm"
> >
<Option value="jack">boyuzhou</Option> <Option value="jack">boyuzhou</Option>
<Option value="lucy">renhualiu</Option> <Option value="lucy">renhualiu</Option>

1
demo/demolist/Demo19.js
View File

@ -121,6 +121,7 @@ class Demo19 extends React.Component {
onChange={this.onSelectChange(index, "address")} onChange={this.onSelectChange(index, "address")}
onFocus={this.handFocus} onFocus={this.handFocus}
onBlur={this.onBlur} onBlur={this.onBlur}
size="sm"
autofocus autofocus
> >
<Option value="jack">boyuzhou</Option> <Option value="jack">boyuzhou</Option>

2
demo/demolist/Demo35.js
View File

@ -81,7 +81,7 @@ class Demo35 extends Component {
this.currentRecord = record; this.currentRecord = record;
} }
getHoverContent=()=>{ getHoverContent=()=>{
return <div className="opt-btns"><button onClick={this.delFun}>删除</button> </div> return <div className="opt-btns"><Button size="sm" onClick={this.delFun}>删除</Button> </div>
} }
render() { render() {
return ( return (

13
demo/demolist/Demo35.scss
View File

@ -1,8 +1,11 @@
.opt-btns{ .opt-btns{
button{ .u-button{
background: #505F79 ; background-color: #505F79;
height: 26px; border-color: #505F79;
color:#FFFFFF; color: #fff;
line-height: 26px; &:hover, &:active{
background-color: #344563;
border-color: #344563;
}
} }
} }

2
demo/index.js
View File

File diff suppressed because one or more lines are too long

204
dist/demo.css vendored
View File

@ -6081,12 +6081,9 @@ input.u-button[type="submit"] {
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:hover { .u-button.u-button-primary.focus, .u-button.u-button-primary:focus, .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: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); }
@ -6095,12 +6092,9 @@ input.u-button[type="submit"] {
color: rgb(33,33,33); color: rgb(33,33,33);
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:hover { .u-button.u-button-secondary.focus, .u-button.u-button-secondary:focus, .u-button.u-button-secondary:hover {
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(189,189,189); } border-color: rgb(189,189,189); }
.u-button.u-button-secondary.focus, .u-button.u-button-secondary:focus: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); }
@ -6109,12 +6103,9 @@ 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:hover { .u-button.u-button-danger.focus, .u-button.u-button-danger:focus, .u-button.u-button-danger:hover {
background-color: rgb(211,47,47); background-color: rgb(211,47,47);
border-color: rgb(211,47,47); } border-color: rgb(211,47,47); }
.u-button.u-button-danger.focus, .u-button.u-button-danger:focus: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); }
@ -6123,12 +6114,9 @@ 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:hover { .u-button.u-button-info.focus, .u-button.u-button-info:focus, .u-button.u-button-info:hover {
background-color: rgb(0,151,167); background-color: rgb(0,151,167);
border-color: rgb(0,151,167); } border-color: rgb(0,151,167); }
.u-button.u-button-info.focus, .u-button.u-button-info:focus: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); }
@ -6137,12 +6125,9 @@ 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:hover { .u-button.u-button-warning.focus, .u-button.u-button-warning:focus, .u-button.u-button-warning:hover {
background-color: rgb(245,124,0); background-color: rgb(245,124,0);
border-color: rgb(245,124,0); } border-color: rgb(245,124,0); }
.u-button.u-button-warning.focus, .u-button.u-button-warning:focus: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); }
@ -6151,12 +6136,9 @@ 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:hover { .u-button.u-button-success.focus, .u-button.u-button-success:focus, .u-button.u-button-success:hover {
background-color: rgb(56,142,60); background-color: rgb(56,142,60);
border-color: rgb(56,142,60); } border-color: rgb(56,142,60); }
.u-button.u-button-success.focus, .u-button.u-button-success:focus: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); }
@ -6165,12 +6147,9 @@ 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:hover { .u-button.u-button-dark.focus, .u-button.u-button-dark:focus, .u-button.u-button-dark:hover {
background-color: rgb(66,66,66); background-color: rgb(66,66,66);
border-color: rgb(66,66,66); } border-color: rgb(66,66,66); }
.u-button.u-button-dark.focus, .u-button.u-button-dark:focus: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); }
@ -6179,12 +6158,9 @@ 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:hover { .u-button.u-button-light.focus, .u-button.u-button-light:focus, .u-button.u-button-light:hover {
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(189,189,189); } border-color: rgb(189,189,189); }
.u-button.u-button-light.focus, .u-button.u-button-light:focus: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); }
@ -6193,14 +6169,10 @@ 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:hover { .u-button-border.u-button-success.focus, .u-button-border.u-button-success:focus, .u-button-border.u-button-success:hover {
background-color: rgb(56,142,60); background-color: rgb(56,142,60);
border-color: rgb(56,142,60); border-color: rgb(56,142,60);
color: #fff; } color: #fff; }
.u-button-border.u-button-success.focus, .u-button-border.u-button-success:focus: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);
@ -6210,14 +6182,10 @@ 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:hover { .u-button-border.u-button-warning.focus, .u-button-border.u-button-warning:focus, .u-button-border.u-button-warning:hover {
background-color: rgb(245,124,0); background-color: rgb(245,124,0);
border-color: rgb(245,124,0); border-color: rgb(245,124,0);
color: #fff; } color: #fff; }
.u-button-border.u-button-warning.focus, .u-button-border.u-button-warning:focus: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);
@ -6227,14 +6195,10 @@ 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:hover { .u-button-border.u-button-danger.focus, .u-button-border.u-button-danger:focus, .u-button-border.u-button-danger:hover {
background-color: rgb(211,47,47); background-color: rgb(211,47,47);
border-color: rgb(211,47,47); border-color: rgb(211,47,47);
color: #fff; } color: #fff; }
.u-button-border.u-button-danger.focus, .u-button-border.u-button-danger:focus: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);
@ -6244,14 +6208,10 @@ 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:hover { .u-button-border.u-button-info.focus, .u-button-border.u-button-info:focus, .u-button-border.u-button-info:hover {
background-color: rgb(0,151,167); background-color: rgb(0,151,167);
border-color: rgb(0,151,167); border-color: rgb(0,151,167);
color: #fff; } color: #fff; }
.u-button-border.u-button-info.focus, .u-button-border.u-button-info:focus: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);
@ -6261,14 +6221,10 @@ 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:hover { .u-button-border.u-button-primary.focus, .u-button-border.u-button-primary:focus, .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: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);
@ -6278,14 +6234,10 @@ 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:hover { .u-button-border.u-button-secondary.focus, .u-button-border.u-button-secondary:focus, .u-button-border.u-button-secondary:hover {
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(189,189,189); border-color: rgb(189,189,189);
color: #fff; } color: #fff; }
.u-button-border.u-button-secondary.focus, .u-button-border.u-button-secondary:focus: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);
@ -6295,14 +6247,10 @@ 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:hover { .u-button-border.u-button-dark.focus, .u-button-border.u-button-dark:focus, .u-button-border.u-button-dark:hover {
background-color: rgb(66,66,66); background-color: rgb(66,66,66);
border-color: rgb(66,66,66); border-color: rgb(66,66,66);
color: #fff; } color: #fff; }
.u-button-border.u-button-dark.focus, .u-button-border.u-button-dark:focus: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);
@ -6312,14 +6260,10 @@ 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:hover { .u-button-border.u-button-light.focus, .u-button-border.u-button-light:focus, .u-button-border.u-button-light:hover {
background-color: rgb(189,189,189); background-color: rgb(189,189,189);
border-color: rgb(189,189,189); border-color: rgb(189,189,189);
color: #fff; } color: #fff; }
.u-button-border.u-button-light.focus, .u-button-border.u-button-light:focus: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);
@ -6529,14 +6473,14 @@ input.u-button[type="submit"] {
display: inline-block; display: inline-block;
padding: 0 12px; padding: 0 12px;
width: 100%; width: 100%;
height: 32px; height: 30px;
cursor: text; cursor: text;
font-size: 14px; font-size: 14px;
line-height: 1.5; line-height: 1.5;
color: #424242; color: #424242;
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: 1px solid rgb(165, 173, 186); border: 1px solid #bdbdbd;
border-radius: 3px; border-radius: 3px;
transition: all .3s; } transition: all .3s; }
.u-form-control:focus { .u-form-control:focus {
@ -6546,18 +6490,18 @@ input.u-button[type="submit"] {
display: none; } display: none; }
.u-form-control[disabled] { .u-form-control[disabled] {
background: #F7F9FB; background: #eee;
border-color: #DFE1E6; border-color: #e0e0e0;
color: #909090; color: #BDBDBD;
cursor: not-allowed; } cursor: not-allowed; }
.u-form-control.lg { .u-form-control.lg {
height: 40px; height: 38px;
font-size: 14px; } font-size: 14px; }
.u-form-control.sm { .u-form-control.sm {
font-size: 12px; font-size: 12px;
height: 26px; } height: 24px; }
.u-form-control-search-wrapper { .u-form-control-search-wrapper {
position: absolute; position: absolute;
@ -6615,9 +6559,9 @@ input.u-button[type="submit"] {
.u-pagination-list > li > a, .u-pagination-list > li > span { .u-pagination-list > li > a, .u-pagination-list > li > span {
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
border-top: 1px solid rgb(165, 173, 186); border-top: 1px solid #d7d7d7;
border-bottom: 1px solid rgb(165, 173, 186); border-bottom: 1px solid #d7d7d7;
border-left: 1px solid rgb(165, 173, 186); border-left: 1px solid #d7d7d7;
background-color: transparent; background-color: transparent;
text-align: center; text-align: center;
color: #666666; color: #666666;
@ -6635,14 +6579,14 @@ input.u-button[type="submit"] {
.u-pagination-list > li[role="next"] > a { .u-pagination-list > li[role="next"] > a {
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-right: 1px solid rgb(165, 173, 186); } border-right: 1px solid #d7d7d7; }
.u-pagination-list > li { .u-pagination-list > li {
float: left; float: left;
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;
background-color: rgb(235, 236, 240); background-color: rgb(235, 236, 240);
border-color: rgb(165, 173, 186); border-color: #d7d7d7;
cursor: pointer; } cursor: pointer; }
.u-pagination-list > li > a > i { .u-pagination-list > li > a > i {
color: #7a869a; } color: #7a869a; }
@ -6656,13 +6600,13 @@ input.u-button[type="submit"] {
color: #777; color: #777;
cursor: not-allowed; cursor: not-allowed;
background-color: transparent; background-color: transparent;
border-color: rgb(165, 173, 186); } border-color: #ddd; }
.u-pagination-list > .disabled > a > i { .u-pagination-list > .disabled > a > i {
color: #C1C7D0; } color: #C1C7D0; }
.u-pagination-list > li[role="gap"] > a { .u-pagination-list > li[role="gap"] > a {
background-color: transparent; background-color: transparent;
border-bottom: 0 solid rgb(165, 173, 186); border-bottom: 0 solid #d7d7d7;
border-top: 0 solid rgb(165, 173, 186); border-top: 0 solid #d7d7d7;
padding: 7px 11px; padding: 7px 11px;
line-height: 1.57142857; } line-height: 1.57142857; }
.u-pagination-list > li[role="gap"] > a:hover, .u-pagination-list > li[role="gap"] > a:focus { .u-pagination-list > li[role="gap"] > a:hover, .u-pagination-list > li[role="gap"] > a:focus {
@ -6677,7 +6621,7 @@ input.u-button[type="submit"] {
padding: 0px; padding: 0px;
font-size: 14px; } font-size: 14px; }
.u-pagination-list > li:last-child > a, .u-pagination-list > li:last-child > span { .u-pagination-list > li:last-child > a, .u-pagination-list > li:last-child > span {
border-right: 1px solid rgb(165, 173, 186); } border-right: 1px solid #d7d7d7; }
.u-pagination .temp-main { .u-pagination .temp-main {
width: 100px; width: 100px;
height: 100px; height: 100px;
@ -6740,7 +6684,7 @@ input.u-button[type="submit"] {
border-radius: 3px; border-radius: 3px;
width: 50px; width: 50px;
text-align: center; text-align: center;
border: 1px solid rgb(165, 173, 186); } border: 1px solid #d7d7d7; }
.u-pagination .page_jump_btn, .u-pagination .page_jump_btn,
.u-pagination .page_jump_value { .u-pagination .page_jump_value {
margin: 0 8px; margin: 0 8px;
@ -6902,16 +6846,16 @@ input.u-button[type="submit"] {
.u-pagination-gap > li > a { .u-pagination-gap > li > a {
margin: 0 5px; margin: 0 5px;
border-radius: 5px; border-radius: 5px;
border: 1px solid rgb(165, 173, 186); } border: 1px solid #d7d7d7; }
.u-pagination-gap > li > a:hover { .u-pagination-gap > li > a:hover {
background-color: rgb(235, 236, 240); background-color: transparent;
border-color: rgb(165, 173, 186); } border-color: #7A869A; }
.u-pagination-gap > li:first-child > a, .u-pagination-gap > li:last-child > a { .u-pagination-gap > li:first-child > a, .u-pagination-gap > li:last-child > a {
border-radius: 5px; } border-radius: 5px; }
.u-pagination-gap > li[role="gap"] > a { .u-pagination-gap > li[role="gap"] > a {
border: 0 solid rgb(165, 173, 186); } border: 0 solid #d7d7d7; }
/* FormGroup */ /* FormGroup */
/* Navlayout */ /* Navlayout */
@ -7312,8 +7256,8 @@ ul {
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
background-color: #fff; background-color: #fff;
border-radius: 3px; border-radius: 4px;
border: 1px solid rgb(165, 173, 186); border: 1px solid #d9d9d9;
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); }
.u-select .u-select-selection :hover { .u-select .u-select-selection :hover {
border-color: #40a5ed; } border-color: #40a5ed; }
@ -7430,7 +7374,7 @@ ul {
line-height: 24px; } line-height: 24px; }
.u-select-sm .u-select-selection { .u-select-sm .u-select-selection {
border-radius: 3px; } border-radius: 4px; }
.u-select-sm .u-select-selection--single { .u-select-sm .u-select-selection--single {
height: 26px; } height: 26px; }
@ -7481,7 +7425,7 @@ ul {
width: 100%; width: 100%;
background: transparent; background: transparent;
outline: 0; outline: 0;
border-radius: 3px; } border-radius: 4px; }
.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;
@ -7520,7 +7464,7 @@ ul {
line-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: 3px; border-radius: 4px;
cursor: default; cursor: default;
float: left; float: left;
padding: 0 16px; padding: 0 16px;
@ -7615,7 +7559,7 @@ ul {
.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: 3px; border-radius: 4px;
box-sizing: border-box; box-sizing: border-box;
z-index: 1800; z-index: 1800;
left: -9999px; left: -9999px;
@ -7754,7 +7698,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: 3px; border-radius: 4px;
position: absolute; position: absolute;
top: -1px; top: -1px;
width: 100%; } width: 100%; }
@ -8242,7 +8186,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: rgb(165, 173, 186); } border-bottom-color: rgb(224,224,224); }
.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;
@ -8250,14 +8194,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: rgb(165, 173, 186); } border-bottom-color: rgb(224,224,224); }
.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: rgb(165, 173, 186); } border-left-color: rgb(224,224,224); }
.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;
@ -8265,14 +8209,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: rgb(165, 173, 186); } border-left-color: rgb(224,224,224); }
.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: rgb(165, 173, 186); } border-right-color: rgb(224,224,224); }
.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;
@ -8280,7 +8224,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: rgb(165, 173, 186); } border-right-color: rgb(224,224,224); }
.u-tooltip.inverse.top .tooltip-arrow::after { .u-tooltip.inverse.top .tooltip-arrow::after {
top: -6px; top: -6px;
margin-left: -5px; margin-left: -5px;
@ -8288,7 +8232,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: rgb(165, 173, 186); } border-top-color: rgb(224,224,224); }
.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;
@ -8297,11 +8241,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: rgb(165, 173, 186); } border-top-color: rgb(224,224,224); }
.u-tooltip.inverse .tooltip-inner { .u-tooltip.inverse .tooltip-inner {
background-color: #fff; background-color: #fff;
color: #333333; color: #333333;
border: 1px solid rgb(165, 173, 186); } border: 1px solid rgb(224,224,224); }
.u-tooltip.inverse .tooltip-arrow::after { .u-tooltip.inverse .tooltip-arrow::after {
position: absolute; position: absolute;
display: block; display: block;
@ -8484,7 +8428,7 @@ ul {
.u-table td { .u-table td {
border-bottom: 1px solid rgb(233,233,233); } border-bottom: 1px solid rgb(233,233,233); }
.u-table td a { .u-table td a {
color: rgb(245, 60, 50); } color: #2196F3; }
.u-table td a:hover { .u-table td a:hover {
color: rgb(230, 0, 18); } color: rgb(230, 0, 18); }
.u-table td a:active { .u-table td a:active {
@ -8868,7 +8812,8 @@ ul {
display: none; } display: none; }
.editable-cell-input-wrapper .u-input-group .u-form-control { .editable-cell-input-wrapper .u-input-group .u-form-control {
height: 26px; } height: 26px;
font-size: 12px; }
.editable-cell-text-wrapper { .editable-cell-text-wrapper {
padding: 5px 24px 5px 5px; padding: 5px 24px 5px 5px;
@ -8974,7 +8919,7 @@ ul {
align-items: center; align-items: center;
-ms-flex-pack: center; -ms-flex-pack: center;
justify-content: center; justify-content: center;
background: #E7F2FC; } background: transparent; }
.u-row-hover2 { .u-row-hover2 {
position: absolute; position: absolute;
@ -9011,14 +8956,14 @@ ul {
display: inline-block; display: inline-block;
padding: 0 12px; padding: 0 12px;
width: 100%; width: 100%;
height: 32px; height: 30px;
cursor: text; cursor: text;
font-size: 14px; font-size: 14px;
line-height: 1.5; line-height: 1.5;
color: #424242; color: #424242;
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: 1px solid rgb(165, 173, 186); border: 1px solid #bdbdbd;
border-radius: 3px; border-radius: 3px;
transition: all .3s; } transition: all .3s; }
.u-form-control:focus { .u-form-control:focus {
@ -9028,18 +8973,18 @@ ul {
display: none; } display: none; }
.u-form-control[disabled] { .u-form-control[disabled] {
background: #F7F9FB; background: #eee;
border-color: #DFE1E6; border-color: #e0e0e0;
color: #909090; color: #BDBDBD;
cursor: not-allowed; } cursor: not-allowed; }
.u-form-control.lg { .u-form-control.lg {
height: 40px; height: 38px;
font-size: 14px; } font-size: 14px; }
.u-form-control.sm { .u-form-control.sm {
font-size: 12px; font-size: 12px;
height: 26px; } height: 24px; }
.u-form-control-search-wrapper { .u-form-control-search-wrapper {
position: absolute; position: absolute;
@ -9138,7 +9083,7 @@ ul {
border-collapse: separate; } border-collapse: separate; }
.u-input-group .u-input-group-btn .u-button { .u-input-group .u-input-group-btn .u-button {
border: 1px solid #ccc; border: 1px solid #ccc;
height: 32px; height: 30px;
line-height: 1.3; } line-height: 1.3; }
.u-input-group .u-form-control { .u-input-group .u-form-control {
position: relative; position: relative;
@ -9158,9 +9103,9 @@ ul {
border-radius: 3px; } border-radius: 3px; }
.u-input-group.simple .u-input-group-btn { .u-input-group.simple .u-input-group-btn {
position: absolute; position: absolute;
top: 4px; top: 2px;
bottom: 0; bottom: 0;
right: 6px; right: 5px;
min-width: 20px; } min-width: 20px; }
.u-input-group.simple .u-form-control:not(:last-child) { .u-input-group.simple .u-form-control:not(:last-child) {
padding-right: 23px; } padding-right: 23px; }
@ -9382,7 +9327,7 @@ ul {
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 5px #ccc; box-shadow: 0 1px 5px #ccc;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgb(165, 173, 186); border: 1px solid rgb(224,224,224);
line-height: 1.5; } line-height: 1.5; }
.rc-calendar-date-panel, .rc-calendar-date-panel,
@ -10527,7 +10472,6 @@ li.rc-time-picker-panel-select-option-disabled:hover {
background: #e3f2fd; } background: #e3f2fd; }
.demo25 { .demo25 {
width: 700px;
height: 100%; } height: 100%; }
.demo25 .u-table-filter-column-filter-icon { .demo25 .u-table-filter-column-filter-icon {
right: 15px; } right: 15px; }
@ -10545,11 +10489,13 @@ th:hover .uf {
padding-bottom: 0px; } padding-bottom: 0px; }
.opt-btns button { .opt-btns .u-button {
background: #505F79; background-color: #505F79;
height: 26px; border-color: #505F79;
color: #FFFFFF; color: #fff; }
line-height: 26px; } .opt-btns .u-button:hover, .opt-btns .u-button:active {
background-color: #344563;
border-color: #344563; }
.demo8 .u-table { .demo8 .u-table {
margin-bottom: 11px; } margin-bottom: 11px; }

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

57
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

5
src/Table.scss
View File

@ -58,7 +58,7 @@ $checkbox-height:16px;
td { td {
border-bottom: 1px solid $table-border-color; border-bottom: 1px solid $table-border-color;
a{ a{
color: $brand-primary; color: #2196F3;
&:hover{ &:hover{
color: $brand-primary-hover; color: $brand-primary-hover;
} }
@ -642,6 +642,7 @@ $checkbox-height:16px;
} }
.u-input-group .u-form-control{ .u-input-group .u-form-control{
height: 26px; height: 26px;
font-size: 12px;
} }
} }
@ -787,7 +788,7 @@ $checkbox-height:16px;
display: none; display: none;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: $table-hover-color background: transparent;
} }
.u-row-hover2{ .u-row-hover2{

2
src/lib/multiSelect.js
View File

@ -1,5 +1,5 @@
import React, { Component } from "react"; import React, { Component } from "react";
import Checkbox from 'bee-checkbox'; // import Checkbox from 'bee-checkbox';
import {ObjectAssign} from './util'; import {ObjectAssign} from './util';
/** /**
* 参数: 过滤表头 * 参数: 过滤表头

2
src/lib/newMultiSelect.js
View File

@ -1,5 +1,5 @@
import React, { Component } from "react"; import React, { Component } from "react";
import Checkbox from 'bee-checkbox'; // import Checkbox from 'bee-checkbox';
import {ObjectAssign} from './util'; import {ObjectAssign} from './util';
/** /**
* 参数: 过滤表头 * 参数: 过滤表头