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
6ecf925d
Commit
6ecf925d
authored
Apr 23, 2019
by
luckyCao
Committed by
hetech
Apr 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Select: fix slice of value when value is undefined or null (#15022)
parent
0e0a5061
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
4 deletions
+41
-4
packages/select/src/option.vue
packages/select/src/option.vue
+2
-2
packages/select/src/select.vue
packages/select/src/select.vue
+2
-2
test/unit/specs/select.spec.js
test/unit/specs/select.spec.js
+37
-0
No files found.
packages/select/src/option.vue
View file @
6ecf925d
...
...
@@ -109,10 +109,10 @@
contains
(
arr
=
[],
target
)
{
if
(
!
this
.
isObject
)
{
return
arr
.
indexOf
(
target
)
>
-
1
;
return
arr
&&
arr
.
indexOf
(
target
)
>
-
1
;
}
else
{
const
valueKey
=
this
.
select
.
valueKey
;
return
arr
.
some
(
item
=>
{
return
arr
&&
arr
.
some
(
item
=>
{
return
getValueByPath
(
item
,
valueKey
)
===
getValueByPath
(
target
,
valueKey
);
});
}
...
...
packages/select/src/select.vue
View file @
6ecf925d
...
...
@@ -346,7 +346,7 @@
value
(
val
,
oldVal
)
{
if
(
this
.
multiple
)
{
this
.
resetInputHeight
();
if
(
val
.
length
>
0
||
(
this
.
$refs
.
input
&&
this
.
query
!==
''
))
{
if
(
(
val
&&
val
.
length
>
0
)
||
(
this
.
$refs
.
input
&&
this
.
query
!==
''
))
{
this
.
currentPlaceholder
=
''
;
}
else
{
this
.
currentPlaceholder
=
this
.
cachedPlaceHolder
;
...
...
@@ -671,7 +671,7 @@
handleOptionSelect
(
option
,
byClick
)
{
if
(
this
.
multiple
)
{
const
value
=
this
.
value
.
slice
();
const
value
=
(
this
.
value
||
[])
.
slice
();
const
optionIndex
=
this
.
getValueIndex
(
value
,
option
.
value
);
if
(
optionIndex
>
-
1
)
{
value
.
splice
(
optionIndex
,
1
);
...
...
test/unit/specs/select.spec.js
View file @
6ecf925d
...
...
@@ -843,6 +843,43 @@ describe('Select', () => {
expect
(
vm
.
value
).
to
.
be
.
equal
(
'
test
'
);
});
it
(
'
default value is null or undefined
'
,
async
()
=>
{
vm
=
createVue
({
template
:
`
<div>
<el-select v-model="value">
<el-option
v-for="item in options"
:label="item.label"
:key="item.value"
:value="item.value">
</el-option>
</el-select>
</div>
`
,
data
()
{
return
{
options
:
[{
value
:
'
选项1
'
,
label
:
'
黄金糕
'
},
{
value
:
'
选项2
'
,
label
:
'
双皮奶
'
}],
value
:
undefined
};
}
},
true
);
vm
.
value
=
null
;
await
waitImmediate
();
expect
(
vm
.
$el
.
querySelector
(
'
.el-input__inner
'
).
value
).
to
.
equal
(
''
);
vm
.
value
=
'
选项1
'
;
await
waitImmediate
();
expect
(
vm
.
$el
.
querySelector
(
'
.el-input__inner
'
).
value
).
to
.
equal
(
'
黄金糕
'
);
});
describe
(
'
resetInputHeight
'
,
()
=>
{
const
getSelectComponentVm
=
(
configs
)
=>
{
vm
=
getSelectVm
(
configs
||
{});
...
...
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