Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
012c0185
Commit
012c0185
authored
Nov 18, 2016
by
furybean
Committed by
Leopoldthecoder
Nov 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Table: fix select-all checkbox is selected when all rows are not selectable.
parent
402a9aba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
3 deletions
+55
-3
packages/table/src/table-store.js
packages/table/src/table-store.js
+13
-3
test/unit/specs/table.spec.js
test/unit/specs/table.spec.js
+42
-0
No files found.
packages/table/src/table-store.js
View file @
012c0185
...
@@ -313,21 +313,31 @@ TableStore.prototype.updateAllSelected = function() {
...
@@ -313,21 +313,31 @@ TableStore.prototype.updateAllSelected = function() {
};
};
let
isAllSelected
=
true
;
let
isAllSelected
=
true
;
let
selectedCount
=
0
;
for
(
let
i
=
0
,
j
=
data
.
length
;
i
<
j
;
i
++
)
{
for
(
let
i
=
0
,
j
=
data
.
length
;
i
<
j
;
i
++
)
{
const
item
=
data
[
i
];
const
item
=
data
[
i
];
if
(
selectable
)
{
if
(
selectable
)
{
if
(
selectable
.
call
(
null
,
item
,
i
)
&&
!
isSelected
(
item
))
{
const
isRowSelectable
=
selectable
.
call
(
null
,
item
,
i
);
isAllSelected
=
false
;
if
(
isRowSelectable
)
{
break
;
if
(
!
isSelected
(
item
))
{
isAllSelected
=
false
;
break
;
}
else
{
selectedCount
++
;
}
}
}
}
else
{
}
else
{
if
(
!
isSelected
(
item
))
{
if
(
!
isSelected
(
item
))
{
isAllSelected
=
false
;
isAllSelected
=
false
;
break
;
break
;
}
else
{
selectedCount
++
;
}
}
}
}
}
}
if
(
selectedCount
===
0
)
isAllSelected
=
false
;
states
.
isAllSelected
=
isAllSelected
;
states
.
isAllSelected
=
isAllSelected
;
};
};
...
...
test/unit/specs/table.spec.js
View file @
012c0185
...
@@ -623,6 +623,48 @@ describe('Table', () => {
...
@@ -623,6 +623,48 @@ describe('Table', () => {
},
DELAY
);
},
DELAY
);
});
});
it
(
'
selectable === false & check selectAll status
'
,
done
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData" @selection-change="change">
<el-table-column type="selection" :selectable="filterSelect" />
<el-table-column prop="name" label="name" />
<el-table-column prop="release" label="release" />
<el-table-column prop="director" label="director" />
<el-table-column prop="runtime" label="runtime" />
</el-table>
`
,
created
()
{
},
data
()
{
return
{
selected
:
[],
testData
:
null
};
},
methods
:
{
change
(
rows
)
{
this
.
selected
=
rows
;
},
filterSelect
(
row
,
index
)
{
return
false
;
}
}
},
true
);
vm
.
testData
=
getTestData
();
setTimeout
(
_
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-checkbox
'
).
__vue__
.
checked
).
to
.
be
.
false
;
setTimeout
(
_
=>
{
expect
(
vm
.
selected
).
to
.
length
(
0
);
destroyVM
(
vm
);
done
();
},
DELAY
);
},
DELAY
);
});
it
(
'
emit selection-change after row has been removed
'
,
done
=>
{
it
(
'
emit selection-change after row has been removed
'
,
done
=>
{
const
vm
=
createVue
({
const
vm
=
createVue
({
template
:
`
template
:
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment