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
27398103
Commit
27398103
authored
Aug 14, 2019
by
Inside
Committed by
luckyCao
Aug 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cascader: Fix disable status and close button issue (#16209)
parent
0bff072f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
packages/cascader/src/cascader.vue
packages/cascader/src/cascader.vue
+3
-0
test/unit/specs/cascader.spec.js
test/unit/specs/cascader.spec.js
+8
-0
No files found.
packages/cascader/src/cascader.vue
View file @
27398103
...
@@ -300,6 +300,9 @@ export default {
...
@@ -300,6 +300,9 @@ export default {
},
},
watch
:
{
watch
:
{
disabled
()
{
this
.
computePresentContent
();
},
value
(
val
)
{
value
(
val
)
{
if
(
!
isEqual
(
val
,
this
.
checkedValue
))
{
if
(
!
isEqual
(
val
,
this
.
checkedValue
))
{
this
.
checkedValue
=
val
;
this
.
checkedValue
=
val
;
...
...
test/unit/specs/cascader.spec.js
View file @
27398103
...
@@ -50,6 +50,7 @@ const options = [{
...
@@ -50,6 +50,7 @@ const options = [{
const
getMenus
=
el
=>
el
.
querySelectorAll
(
'
.el-cascader-menu
'
);
const
getMenus
=
el
=>
el
.
querySelectorAll
(
'
.el-cascader-menu
'
);
const
getOptions
=
(
el
,
menuIndex
)
=>
getMenus
(
el
)[
menuIndex
].
querySelectorAll
(
'
.el-cascader-node
'
);
const
getOptions
=
(
el
,
menuIndex
)
=>
getMenus
(
el
)[
menuIndex
].
querySelectorAll
(
'
.el-cascader-node
'
);
const
selectedValue
=
[
'
zhejiang
'
,
'
hangzhou
'
,
'
xihu
'
];
const
selectedValue
=
[
'
zhejiang
'
,
'
hangzhou
'
,
'
xihu
'
];
const
getCloseButton
=
el
=>
el
.
querySelectorAll
(
'
i.el-tag__close
'
);
describe
(
'
Cascader
'
,
()
=>
{
describe
(
'
Cascader
'
,
()
=>
{
let
vm
;
let
vm
;
...
@@ -242,12 +243,14 @@ describe('Cascader', () => {
...
@@ -242,12 +243,14 @@ describe('Cascader', () => {
<el-cascader
<el-cascader
v-model="value"
v-model="value"
:options="options"
:options="options"
:disabled="disabled"
:props="props"></el-cascader>
:props="props"></el-cascader>
`
,
`
,
data
()
{
data
()
{
return
{
return
{
value
:
[],
value
:
[],
options
,
options
,
disabled
:
false
,
props
:
{
props
:
{
multiple
:
true
multiple
:
true
}
}
...
@@ -258,6 +261,7 @@ describe('Cascader', () => {
...
@@ -258,6 +261,7 @@ describe('Cascader', () => {
getOptions
(
document
.
body
,
0
)[
0
].
querySelector
(
'
.el-checkbox input
'
).
click
();
getOptions
(
document
.
body
,
0
)[
0
].
querySelector
(
'
.el-checkbox input
'
).
click
();
await
waitImmediate
();
await
waitImmediate
();
expect
(
vm
.
value
.
length
).
to
.
equal
(
3
);
expect
(
vm
.
value
.
length
).
to
.
equal
(
3
);
expect
(
getCloseButton
(
vm
.
$el
).
length
).
to
.
equal
(
3
);
const
tags
=
vm
.
$el
.
querySelectorAll
(
'
.el-tag
'
);
const
tags
=
vm
.
$el
.
querySelectorAll
(
'
.el-tag
'
);
const
closeBtn
=
tags
[
0
].
querySelector
(
'
.el-tag__close
'
);
const
closeBtn
=
tags
[
0
].
querySelector
(
'
.el-tag__close
'
);
...
@@ -267,6 +271,10 @@ describe('Cascader', () => {
...
@@ -267,6 +271,10 @@ describe('Cascader', () => {
await
waitImmediate
();
await
waitImmediate
();
expect
(
vm
.
value
.
length
).
to
.
equal
(
2
);
expect
(
vm
.
value
.
length
).
to
.
equal
(
2
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-tag
'
).
length
).
to
.
equal
(
2
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-tag
'
).
length
).
to
.
equal
(
2
);
vm
.
disabled
=
true
;
await
waitImmediate
();
expect
(
getCloseButton
(
vm
.
$el
).
length
).
to
.
equal
(
0
);
});
});
it
(
'
clearable in multiple mode
'
,
async
()
=>
{
it
(
'
clearable in multiple mode
'
,
async
()
=>
{
...
...
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