This commit is contained in:
jonyshi 2018-08-01 22:34:26 +08:00
parent 62df601fbd
commit bc7bdb8993
9 changed files with 18569 additions and 2627 deletions

View File

@ -72,7 +72,6 @@ class Demo13 extends Component {
}; };
} }
getSelectedDataFunc = data => { getSelectedDataFunc = data => {
debugger;
console.log(data); console.log(data);
}; };
selectDisabled = (record, index) => { selectDisabled = (record, index) => {

File diff suppressed because one or more lines are too long

458
dist/demo.css vendored
View File

@ -6187,6 +6187,8 @@ input.u-button[type="submit"] {
.u-form-control:focus { .u-form-control:focus {
border-color: #66afe9; border-color: #66afe9;
outline: 0; } outline: 0; }
.u-form-control::-ms-clear, .u-form-control ::-ms-reveal {
display: none; }
.u-form-control[disabled] { .u-form-control[disabled] {
background: #eee; background: #eee;
@ -6242,77 +6244,382 @@ input.u-button[type="submit"] {
/* FormGroup */ /* FormGroup */
/* Navlayout */ /* Navlayout */
.u-pagination { /* FormGroup */
/* Navlayout */
.u-button {
background: rgb(224,224,224);
border: none;
border-radius: 4px;
color: rgb(0,0,0);
position: relative;
min-width: 72px;
padding: 5px 13px;
display: inline-block;
font-family: "Open Sans", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", sans-serif;
font-size: 14px; font-size: 14px;
margin: 5px; } font-weight: 500;
.u-pagination:after { line-height: 1;
clear: both; letter-spacing: 0;
display: table; overflow: hidden;
content: ''; } will-change: box-shadow, transform;
.u-pagination > li > a, .u-pagination > li > span { outline: none;
display: inline-block; cursor: pointer;
text-decoration: none; text-decoration: none;
border-top: 1px solid #d7d7d7; text-align: center;
border-bottom: 1px solid #d7d7d7; line-height: 1.57143;
border-left: 1px solid #d7d7d7; vertical-align: middle; }
background-color: white; .u-button::-moz-focus-inner {
text-align: center; border: 0; }
color: #666666; .u-button:hover {
padding: 6px 11px; background-color: rgb(238,238,238); }
line-height: 1.57142857; } .u-button:active {
.u-pagination > li:first-child > a, .u-pagination > li:first-child > span { background-color: rgb(189,189,189); }
margin-left: 0; .u-button.colored {
border-top-left-radius: 4px; color: rgb(30,136,229); }
border-bottom-left-radius: 4px; } .u-button.colored:focus:not(:active) {
.u-pagination > li:last-child > a, .u-pagination > li:last-child > span { background-color: rgb(189,189,189); }
border-top-right-radius: 4px; .u-button.disable {
border-bottom-right-radius: 4px; } -webkit-box-shadow: none;
.u-pagination > li[role="next"] > a { filter: alpha(opacity=65);
border-top-right-radius: 4px; box-shadow: none;
border-bottom-right-radius: 4px;
border-right: 1px solid #d7d7d7; }
.u-pagination > li {
float: left;
list-style-type: none; }
.u-pagination > li > a:hover, .u-pagination > li > span:hover, .u-pagination > li > a:focus, .u-pagination > li > span:focus {
color: #666;
background-color: #eee;
border-color: #d7d7d7;
cursor: pointer; }
.u-pagination > li > a > i {
color: #999999; }
.u-pagination > .active > a, .u-pagination > .active > span, .u-pagination > .active > a:hover, .u-pagination > .active > span:hover, .u-pagination > .active > a:focus, .u-pagination > .active > span:focus {
z-index: 2;
color: #fff;
cursor: default;
background-color: rgb(30,136,229);
border-color: rgb(30,136,229); }
.u-pagination > .disabled > a, .u-pagination > .disabled > span, .u-pagination > .disabled > a:hover, .u-pagination > .disabled > span:hover, .u-pagination > .disabled > a:focus, .u-pagination > .disabled > span:focus {
color: #777;
cursor: not-allowed; cursor: not-allowed;
background-color: #fff; opacity: .65; }
border-color: #ddd; }
.u-pagination > .disabled > a > i { input.u-button[type="submit"] {
color: #cccccc; } -webkit-appearance: none; }
.u-pagination > li[role="gap"] > a {
background-color: transparent; .u-button-floating {
border-bottom: 0px solid #d7d7d7; border-radius: 50%;
border-top: 0px solid #d7d7d7; font-size: 14px;
padding: 7px 11px; height: 38px;
line-height: 1.57142857; } margin: auto;
.u-pagination > li[role="gap"] > a:hover, .u-pagination > li[role="gap"] > a:focus { min-width: 38px;
background-color: transparent; } width: 38px;
.u-pagination input { padding: 0;
box-sizing: border-box; line-height: normal;
-moz-box-sizing: border-box; border: 1px solid rgb(224,224,224); }
-webkit-box-sizing: border-box; } .u-button-floating.colored {
.u-pagination li, .u-pagination a { background: rgb(67,160,71);
box-sizing: content-box; } color: rgb(255,255,255);
.u-pagination i.uf, .u-pagination i.fa { background: rgb(255,255,255); }
padding: 0px; .u-button-floating.colored:hover {
font-size: 12px; } background-color: rgb(102,187,106); }
.u-pagination > li:last-child > a, .u-pagination > li:last-child > span { .u-button-floating.colored:focus:not(:active) {
border-right: 1px solid #d7d7d7; } background-color: rgb(67,160,71); }
.u-button-floating.colored:active {
background-color: rgb(67,160,71); }
.u-button.disabled, .u-button[disabled] {
cursor: not-allowed;
opacity: .65;
filter: alpha(opacity=65);
box-shadow: none; }
.u-button-default {
color: #333;
background-color: #fff;
border-color: #ccc; }
.u-button-default:hover, .u-button-default:focus, .u-button-default:active {
background-color: #e6e6e6;
border-color: #adadad; }
.u-button-primary {
color: rgb(255,255,255);
background-color: rgb(30,136,229);
border: 1px rgb(30,136,229) solid; }
.u-button-primary.focus, .u-button-primary:focus, .u-button-primary:hover {
background-color: rgb(66,165,245);
border-color: rgb(66,165,245); }
.u-button-primary.active, .u-button-primary:active {
background-color: rgb(21,101,192);
border-color: rgb(21,101,192); }
.u-button-danger {
color: rgb(255,255,255);
background-color: rgb(244,67,54);
border: 1px rgb(244,67,54) solid; }
.u-button-danger.focus, .u-button-danger:focus, .u-button-danger:hover {
background-color: rgb(229,115,115);
border-color: rgb(229,115,115); }
.u-button-danger.active, .u-button-danger:active {
background-color: rgb(211,47,47);
border-color: rgb(211,47,47); }
.u-button-info {
color: rgb(255,255,255);
background-color: rgb(0,188,212);
border: 1px rgb(0,188,212) solid; }
.u-button-info.focus, .u-button-info:focus, .u-button-info:hover {
background-color: rgb(77,208,225);
border-color: rgb(77,208,225); }
.u-button-info.active, .u-button-info:active {
background-color: rgb(0,151,167);
border-color: rgb(0,151,167); }
.u-button-warning {
color: rgb(255,255,255);
background-color: rgb(255,152,0);
border: 1px rgb(255,152,0) solid; }
.u-button-warning.focus, .u-button-warning:focus, .u-button-warning:hover {
background-color: rgb(255,183,77);
border-color: rgb(255,183,77); }
.u-button-warning.active, .u-button-warning:active {
background-color: rgb(245,124,0);
border-color: rgb(245,124,0); }
.u-button-success {
color: rgb(255,255,255);
background-color: rgb(76,175,80);
border: 1px rgb(76,175,80) solid; }
.u-button-success.focus, .u-button-success:focus, .u-button-success:hover {
background-color: rgb(129,199,132);
border-color: rgb(129,199,132); }
.u-button-success.active, .u-button-success:active {
background-color: rgb(56,142,60);
border-color: rgb(56,142,60); }
.u-button-border.u-button-success {
color: rgb(76,175,80);
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 {
background-color: rgb(129,199,132);
border-color: rgb(129,199,132);
color: #fff; }
.u-button-border.u-button-success.active, .u-button-border.u-button-success:active {
color: #fff;
background-color: rgb(56,142,60);
border-color: rgb(56,142,60); }
.u-button-border.u-button-warning {
color: rgb(255,152,0);
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 {
background-color: rgb(255,183,77);
border-color: rgb(255,183,77);
color: #fff; }
.u-button-border.u-button-warning.active, .u-button-border.u-button-warning:active {
color: #fff;
background-color: rgb(245,124,0);
border-color: rgb(245,124,0); }
.u-button-border.u-button-danger {
color: rgb(244,67,54);
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 {
background-color: rgb(229,115,115);
border-color: rgb(229,115,115);
color: #fff; }
.u-button-border.u-button-danger.active, .u-button-border.u-button-danger:active {
color: #fff;
background-color: rgb(211,47,47);
border-color: rgb(211,47,47); }
.u-button-border.u-button-info {
color: rgb(0,188,212);
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 {
background-color: rgb(77,208,225);
border-color: rgb(77,208,225);
color: #fff; }
.u-button-border.u-button-info.active, .u-button-border.u-button-info:active {
color: #fff;
background-color: rgb(0,151,167);
border-color: rgb(0,151,167); }
.u-button-border.u-button-primary {
color: rgb(30,136,229);
border: 1px rgb(30,136,229) solid; }
.u-button-border.u-button-primary.focus, .u-button-border.u-button-primary:focus, .u-button-border.u-button-primary:hover {
background-color: rgb(66,165,245);
border-color: rgb(66,165,245);
color: #fff; }
.u-button-border.u-button-primary.active, .u-button-border.u-button-primary:active {
color: #fff;
background-color: rgb(21,101,192);
border-color: rgb(21,101,192); }
.u-button-border {
color: rgb(0,0,0);
border: 1px solid #d9d9d9;
background-color: #fff; }
.u-button-border:hover, .u-button-border:focus {
color: rgb(0,0,0);
background: rgb(238,238,238); }
.u-button-border:active {
color: #fff;
background: rgb(189,189,189); }
.u-button-icon {
border-radius: 50%;
font-size: 14px;
height: 32px;
margin: auto;
min-width: 32px;
width: 32px;
padding: 0;
line-height: normal;
border: 1px solid rgb(224,224,224); }
.u-button-lg {
padding: 8px 15px;
font-size: 14px; }
.u-button-xg {
padding: 10px 18px;
font-size: 16px; }
.u-button-sm {
padding: 3px 5px;
font-size: 12px; }
.u-button-squared {
border-radius: 0; }
.u-button-round {
border-radius: 1000px; }
.u-button-block {
white-space: normal;
display: block;
width: 100%; }
.u-button-pill-left {
border-radius: 500px 0 0 500px; }
.u-button-pill-right {
border-radius: 0 500px 500px 0; }
.u-pagination {
font-size: 14px; }
.u-pagination-list {
float: left;
margin: 5px; }
.u-pagination-list:after {
clear: both;
display: table;
content: ''; }
.u-pagination-list > li > a, .u-pagination-list > li > span {
display: inline-block;
text-decoration: none;
border-top: 1px solid #d7d7d7;
border-bottom: 1px solid #d7d7d7;
border-left: 1px solid #d7d7d7;
background-color: white;
text-align: center;
color: #666666;
padding: 6px 11px;
line-height: 1.57142857; }
.u-pagination-list > li:first-child > a, .u-pagination-list > li:first-child > span {
margin-left: 0;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px; }
.u-pagination-list > li:last-child > a, .u-pagination-list > li:last-child > span {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px; }
.u-pagination-list > li[role="next"] > a {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
border-right: 1px solid #d7d7d7; }
.u-pagination-list > li {
float: left;
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 {
color: #666;
background-color: #eee;
border-color: #d7d7d7;
cursor: pointer; }
.u-pagination-list > li > a > i {
color: #999999; }
.u-pagination-list > .active > a, .u-pagination-list > .active > span, .u-pagination-list > .active > a:hover, .u-pagination-list > .active > span:hover, .u-pagination-list > .active > a:focus, .u-pagination-list > .active > span:focus {
z-index: 2;
color: #fff;
cursor: default;
background-color: rgb(30,136,229);
border-color: rgb(30,136,229); }
.u-pagination-list > .disabled > a, .u-pagination-list > .disabled > span, .u-pagination-list > .disabled > a:hover, .u-pagination-list > .disabled > span:hover, .u-pagination-list > .disabled > a:focus, .u-pagination-list > .disabled > span:focus {
color: #777;
cursor: not-allowed;
background-color: #fff;
border-color: #ddd; }
.u-pagination-list > .disabled > a > i {
color: #cccccc; }
.u-pagination-list > li[role="gap"] > a {
background-color: transparent;
border-bottom: 0 solid #d7d7d7;
border-top: 0 solid #d7d7d7;
padding: 7px 11px;
line-height: 1.57142857; }
.u-pagination-list > li[role="gap"] > a:hover, .u-pagination-list > li[role="gap"] > a:focus {
background-color: transparent; }
.u-pagination-list input {
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box; }
.u-pagination-list li, .u-pagination-list a {
box-sizing: content-box; }
.u-pagination-list i.uf, .u-pagination-list i.fa {
padding: 0px;
font-size: 12px; }
.u-pagination-list > li:last-child > a, .u-pagination-list > li:last-child > span {
border-right: 1px solid #d7d7d7; }
.u-pagination .temp-main {
width: 100px;
height: 100px;
border: 1px solid #000; }
.u-pagination .enhanced_pagination {
display: -ms-flexbox;
display: flex;
-ms-flex-direction: row;
flex-direction: row;
-ms-flex-align: center;
align-items: center;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 700px;
overflow: auto;
-ms-flex-pack: center;
justify-content: center; }
.u-pagination .enhanced_pagination .u_float_pagination {
float: left; }
.u-pagination .data_per_select {
margin: 5px;
float: left; }
.u-pagination .data_select {
outline: none;
-webkit-appearance: none;
height: 36px;
background: #fff;
border-color: #d7d7d7;
border-radius: 4px;
line-height: 28px;
padding: 0 15px;
text-align: center;
font-size: 14px;
margin: 0 6px; }
.u-pagination .page_jump {
float: left;
margin: 5px; }
.u-pagination .page_jump_value {
outline: none;
-webkit-appearance: none;
background: #fff;
border-radius: 4px;
line-height: 32px;
width: 50px;
margin: 0 6px;
text-align: center;
border: 1px solid #d7d7d7; }
.u-pagination .page_jump_btn {
margin-top: -3px;
margin-left: 10px;
border-color: #d7d7d7; }
.u-pagination-total {
float: left;
height: 36px;
line-height: 36px;
margin: 5px; }
.pagination-state { .pagination-state {
float: left; float: left;
@ -6345,7 +6652,6 @@ input.u-button[type="submit"] {
border: 1px solid #ddd; border: 1px solid #ddd;
background-color: white; background-color: white;
font-size: 14px; font-size: 14px;
font-family: '微软雅黑';
cursor: pointer; cursor: pointer;
color: #333333; color: #333333;
height: 35px; } height: 35px; }
@ -6416,7 +6722,11 @@ input.u-button[type="submit"] {
/* Navlayout */ /* Navlayout */
.u-checkbox { .u-checkbox {
display: inline-block; display: inline-block;
position: relative; } position: relative;
margin: 0 5px;
height: 18px;
line-height: 18px;
font-size: 14px; }
.u-checkbox.disabled .u-checkbox-label { .u-checkbox.disabled .u-checkbox-label {
cursor: not-allowed; cursor: not-allowed;
opacity: 0.5; } opacity: 0.5; }
@ -6448,7 +6758,7 @@ input.u-button[type="submit"] {
width: 18px; width: 18px;
height: 18px; height: 18px;
left: 0; left: 0;
top: 4px; top: 0;
text-align: center; text-align: center;
position: absolute; } position: absolute; }
.u-checkbox .u-checkbox-label:after { .u-checkbox .u-checkbox-label:after {
@ -6458,7 +6768,7 @@ input.u-button[type="submit"] {
width: 18px; width: 18px;
height: 18px; height: 18px;
left: 0; left: 0;
top: 4px; top: 0;
text-align: center; text-align: center;
position: absolute; } position: absolute; }
@ -8301,6 +8611,8 @@ ul {
.u-form-control:focus { .u-form-control:focus {
border-color: #66afe9; border-color: #66afe9;
outline: 0; } outline: 0; }
.u-form-control::-ms-clear, .u-form-control ::-ms-reveal {
display: none; }
.u-form-control[disabled] { .u-form-control[disabled] {
background: #eee; background: #eee;

2
dist/demo.css.map vendored

File diff suppressed because one or more lines are too long

6119
dist/demo.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

14608
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -75,6 +75,7 @@
"bee-layout": "latest", "bee-layout": "latest",
"bee-pagination": "latest", "bee-pagination": "latest",
"bee-panel": "latest", "bee-panel": "latest",
"bee-popconfirm": "^1.0.2",
"bee-tools": "latest", "bee-tools": "latest",
"bee-tooltip": "^1.0.2", "bee-tooltip": "^1.0.2",
"chai": "^3.5.0", "chai": "^3.5.0",
@ -87,4 +88,4 @@
"react-addons-test-utils": "^15.5.0", "react-addons-test-utils": "^15.5.0",
"react-dom": "^15.5.0" "react-dom": "^15.5.0"
} }
} }

View File

@ -102,7 +102,6 @@ export default function newMultiSelect(Table, Checkbox) {
width: 50, width: 50,
render: (text, record, index) => { render: (text, record, index) => {
let attr = {}; let attr = {};
console.log("record._disabled---",record._disabled)
record._disabled?attr.disabled = record._disabled:""; record._disabled?attr.disabled = record._disabled:"";
return <Checkbox return <Checkbox
key={index} key={index}