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

publish 1.0.10

This commit is contained in:
huyueb 2018-01-03 16:14:01 +08:00
parent 60d951967d
commit 498c0a8ac0
6 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,5 +1,10 @@
<a name="1.0.10"></a>
## [1.0.10](https://github.com/tinper-bee/bee-table/compare/v1.0.9...v1.0.10) (2018-01-03)
<a name="1.0.9"></a> <a name="1.0.9"></a>
## [1.0.9](https://github.com/tinper-bee/bee-table/compare/1.0.8...1.0.9) (2018-01-03) ## [1.0.9](https://github.com/tinper-bee/bee-table/compare/1.0.9...v1.0.9) (2018-01-03)
### Bug Fixes ### Bug Fixes

8
build/lib/multiSelect.js
View File

@ -152,13 +152,9 @@ function multiSelect(Table) {
data = props.data; data = props.data;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var bool = selectDisabled(data[i], i); var bool = selectDisabled && selectDisabled(data[i], i) || false;
if (!bool) { if (!bool) {
if (selectedRow && selectedRow(data[i], i)) { checkedObj[data[i]["key"]] = selectedRow && selectedRow(data[i], i) || false;
checkedObj[data[i]["key"]] = true;
} else {
checkedObj[data[i]["key"]] = false;
}
} }
} }
return checkedObj; return checkedObj;

8
dist/demo.js vendored
View File

@ -11983,13 +11983,9 @@
data = props.data; data = props.data;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var bool = selectDisabled(data[i], i); var bool = selectDisabled && selectDisabled(data[i], i) || false;
if (!bool) { if (!bool) {
if (selectedRow && selectedRow(data[i], i)) { checkedObj[data[i]["key"]] = selectedRow && selectedRow(data[i], i) || false;
checkedObj[data[i]["key"]] = true;
} else {
checkedObj[data[i]["key"]] = false;
}
} }
} }
return checkedObj; return checkedObj;

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bee-table", "name": "bee-table",
"version": "1.0.9", "version": "1.0.10",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",

15
src/lib/multiSelect.js
View File

@ -37,7 +37,11 @@ export default function multiSelect(Table) {
let props = this.props, let props = this.props,
{ selectDisabled, selectedRow, data } = props, { selectDisabled, selectedRow, data } = props,
checkedObj = {}; checkedObj = {};
if (nextProps.data !== data || nextProps.selectDisabled !== selectDisabled || nextProps.selectedRow !== selectedRow) { if (
nextProps.data !== data ||
nextProps.selectDisabled !== selectDisabled ||
nextProps.selectedRow !== selectedRow
) {
checkedObj = this.initCheckedObj(nextProps); checkedObj = this.initCheckedObj(nextProps);
this.setState({ this.setState({
checkedAll: false, checkedAll: false,
@ -51,13 +55,10 @@ export default function multiSelect(Table) {
let checkedObj = {}, let checkedObj = {},
{ selectDisabled, selectedRow, data } = props; { selectDisabled, selectedRow, data } = props;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
let bool = selectDisabled(data[i], i); let bool = (selectDisabled && selectDisabled(data[i], i)) || false;
if (!bool) { if (!bool) {
if(selectedRow&&selectedRow(data[i], i)){ checkedObj[data[i]["key"]] =
checkedObj[data[i]["key"]] = true; (selectedRow && selectedRow(data[i], i)) || false;
}else{
checkedObj[data[i]["key"]] = false;
}
} }
} }
return checkedObj; return checkedObj;