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
7539325e
Commit
7539325e
authored
Jan 06, 2017
by
baiyaaaaa
Committed by
GitHub
Jan 06, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2236 from Leopoldthecoder/select-fix
Select: fix filterable init value issue, fixed #2196
parents
10a9f948
3b5248ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
20 deletions
+30
-20
packages/select/src/select.vue
packages/select/src/select.vue
+1
-0
test/unit/specs/select.spec.js
test/unit/specs/select.spec.js
+29
-20
No files found.
packages/select/src/select.vue
View file @
7539325e
...
...
@@ -387,6 +387,7 @@
}
this
.
selectedLabel
=
option
.
currentLabel
;
this
.
selected
=
option
;
if
(
this
.
filterable
)
this
.
query
=
this
.
selectedLabel
;
return
;
}
let
result
=
[];
...
...
test/unit/specs/select.spec.js
View file @
7539325e
...
...
@@ -48,6 +48,7 @@ describe('Select', () => {
<el-option
v-for="item in options"
:label="item.label"
:key="item.value"
:disabled="item.disabled"
:value="item.value">
</el-option>
...
...
@@ -373,13 +374,15 @@ describe('Select', () => {
it
(
'
filterable
'
,
done
=>
{
vm
=
getSelectVm
({
filterable
:
true
});
const
select
=
vm
.
$children
[
0
];
select
.
selectedLabel
=
'
面
'
;
select
.
onInputChange
();
select
.
visible
=
true
;
setTimeout
(()
=>
{
expect
(
select
.
filteredOptionsCount
).
to
.
equal
(
1
);
done
();
},
100
);
select
.
selectedLabel
=
'
面
'
;
select
.
onInputChange
();
select
.
visible
=
true
;
setTimeout
(()
=>
{
expect
(
select
.
filteredOptionsCount
).
to
.
equal
(
1
);
done
();
},
10
);
},
10
);
});
it
(
'
filterable with custom filter-method
'
,
done
=>
{
...
...
@@ -390,28 +393,34 @@ describe('Select', () => {
};
vm
=
getSelectVm
({
filterable
:
true
,
filterMethod
});
const
select
=
vm
.
$children
[
0
];
select
.
query
=
'
面
'
;
select
.
$el
.
querySelector
(
'
input
'
).
focus
()
;
setTimeout
(()
=>
{
expect
(
select
.
filteredOptionsCount
).
to
.
equal
(
4
);
done
();
},
100
);
select
.
selectedLabel
=
'
面
'
;
select
.
onInputChange
();
setTimeout
(()
=>
{
expect
(
select
.
filteredOptionsCount
).
to
.
equal
(
4
);
done
();
},
10
);
},
10
);
});
it
(
'
allow create
'
,
done
=>
{
vm
=
getSelectVm
({
filterable
:
true
,
allowCreate
:
true
});
const
select
=
vm
.
$children
[
0
];
select
.
selectedLabel
=
'
new
'
;
select
.
onInputChange
();
select
.
visible
=
true
;
select
.
$el
.
querySelector
(
'
input
'
).
focus
();
setTimeout
(()
=>
{
const
options
=
document
.
querySelectorAll
(
'
.el-select-dropdown__item span
'
);
const
target
=
[].
filter
.
call
(
options
,
option
=>
option
.
innerText
===
'
new
'
);
target
[
0
].
click
();
select
.
selectedLabel
=
'
new
'
;
select
.
onInputChange
();
setTimeout
(()
=>
{
expect
(
select
.
value
.
indexOf
(
'
new
'
)
>
-
1
).
to
.
true
;
done
();
},
50
);
},
50
);
const
options
=
document
.
querySelectorAll
(
'
.el-select-dropdown__item span
'
);
const
target
=
[].
filter
.
call
(
options
,
option
=>
option
.
innerText
===
'
new
'
);
target
[
0
].
click
();
setTimeout
(()
=>
{
expect
(
select
.
value
.
indexOf
(
'
new
'
)
>
-
1
).
to
.
true
;
done
();
},
10
);
},
10
);
},
10
);
});
it
(
'
multiple select
'
,
done
=>
{
...
...
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