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
c058beb2
Commit
c058beb2
authored
Nov 28, 2016
by
Leopoldthecoder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Select: add multipleLimit
parent
2fc06cc3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
2 deletions
+35
-2
examples/docs/en-US/select.md
examples/docs/en-US/select.md
+1
-0
examples/docs/zh-CN/select.md
examples/docs/zh-CN/select.md
+1
-0
packages/select/src/option.vue
packages/select/src/option.vue
+11
-1
packages/select/src/select.vue
packages/select/src/select.vue
+5
-1
test/unit/specs/select.spec.js
test/unit/specs/select.spec.js
+17
-0
No files found.
examples/docs/en-US/select.md
View file @
c058beb2
...
@@ -575,6 +575,7 @@ Enter keywords and search data from server.
...
@@ -575,6 +575,7 @@ Enter keywords and search data from server.
| multiple | whether multiple-select is activated | boolean | — | false |
| multiple | whether multiple-select is activated | boolean | — | false |
| disabled | whether Select is disabled | boolean | — | false |
| disabled | whether Select is disabled | boolean | — | false |
| clearable | whether single select can be cleared | boolean | — | false |
| clearable | whether single select can be cleared | boolean | — | false |
| multiple-limit | maximum number of options user can select when
`multiple`
is
`true`
. No limit when set to 0 | number | — | 0 |
| name | the name attribute of select input | string | — | — |
| name | the name attribute of select input | string | — | — |
| placeholder | placeholder | string | — | Select |
| placeholder | placeholder | string | — | Select |
| filterable | whether Select is filterable | boolean | — | false |
| filterable | whether Select is filterable | boolean | — | false |
...
...
examples/docs/zh-CN/select.md
View file @
c058beb2
...
@@ -590,6 +590,7 @@
...
@@ -590,6 +590,7 @@
| multiple | 是否多选 | boolean | — | false |
| multiple | 是否多选 | boolean | — | false |
| disabled | 是否禁用 | boolean | — | false |
| disabled | 是否禁用 | boolean | — | false |
| clearable | 单选时是否可以清空选项 | boolean | — | false |
| clearable | 单选时是否可以清空选项 | boolean | — | false |
| multiple-limit | 多选时用户最多可以选择的项目数,为 0 则不限制 | number | — | 0 |
| name | select input 的 name 属性 | string | — | — |
| name | select input 的 name 属性 | string | — | — |
| placeholder | 占位符 | string | — | 请选择 |
| placeholder | 占位符 | string | — | 请选择 |
| filterable | 是否可搜索 | boolean | — | false |
| filterable | 是否可搜索 | boolean | — | false |
...
...
packages/select/src/option.vue
View file @
c058beb2
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
v-show=
"visible"
v-show=
"visible"
:class=
"
{
:class=
"
{
'selected': itemSelected,
'selected': itemSelected,
'is-disabled': disabled || groupDisabled,
'is-disabled': disabled || groupDisabled
|| limitReached
,
'hover': parent.hoverIndex === index
'hover': parent.hoverIndex === index
}">
}">
<slot>
<slot>
...
@@ -72,6 +72,16 @@
...
@@ -72,6 +72,16 @@
}
else
{
}
else
{
return
this
.
parent
.
value
.
indexOf
(
this
.
value
)
>
-
1
;
return
this
.
parent
.
value
.
indexOf
(
this
.
value
)
>
-
1
;
}
}
},
limitReached
()
{
if
(
this
.
parent
.
multiple
)
{
return
!
this
.
itemSelected
&&
this
.
parent
.
value
.
length
>=
this
.
parent
.
multipleLimit
&&
this
.
parent
.
multipleLimit
>
0
;
}
else
{
return
false
;
}
}
}
},
},
...
...
packages/select/src/select.vue
View file @
c058beb2
...
@@ -154,6 +154,10 @@
...
@@ -154,6 +154,10 @@
remoteMethod
:
Function
,
remoteMethod
:
Function
,
filterMethod
:
Function
,
filterMethod
:
Function
,
multiple
:
Boolean
,
multiple
:
Boolean
,
multipleLimit
:
{
type
:
Number
,
default
:
0
},
placeholder
:
{
placeholder
:
{
type
:
String
,
type
:
String
,
default
()
{
default
()
{
...
@@ -398,7 +402,7 @@
...
@@ -398,7 +402,7 @@
});
});
if
(
optionIndex
>
-
1
)
{
if
(
optionIndex
>
-
1
)
{
this
.
value
.
splice
(
optionIndex
,
1
);
this
.
value
.
splice
(
optionIndex
,
1
);
}
else
{
}
else
if
(
this
.
multipleLimit
<=
0
||
this
.
value
.
length
<
this
.
multipleLimit
)
{
this
.
value
.
push
(
option
.
value
);
this
.
value
.
push
(
option
.
value
);
}
}
}
}
...
...
test/unit/specs/select.spec.js
View file @
c058beb2
...
@@ -6,6 +6,7 @@ describe('Select', () => {
...
@@ -6,6 +6,7 @@ describe('Select', () => {
[
'
multiple
'
,
'
clearable
'
,
'
filterable
'
,
'
remote
'
].
forEach
(
config
=>
{
[
'
multiple
'
,
'
clearable
'
,
'
filterable
'
,
'
remote
'
].
forEach
(
config
=>
{
configs
[
config
]
=
configs
[
config
]
||
false
;
configs
[
config
]
=
configs
[
config
]
||
false
;
});
});
configs
.
multipleLimit
=
configs
.
multipleLimit
||
0
;
if
(
!
options
)
{
if
(
!
options
)
{
options
=
[{
options
=
[{
value
:
'
选项1
'
,
value
:
'
选项1
'
,
...
@@ -35,6 +36,7 @@ describe('Select', () => {
...
@@ -35,6 +36,7 @@ describe('Select', () => {
<el-select
<el-select
v-model="value"
v-model="value"
:multiple="multiple"
:multiple="multiple"
:multiple-limit="multipleLimit"
:clearable="clearable"
:clearable="clearable"
:filterable="filterable"
:filterable="filterable"
:filterMethod="filterMethod"
:filterMethod="filterMethod"
...
@@ -55,6 +57,7 @@ describe('Select', () => {
...
@@ -55,6 +57,7 @@ describe('Select', () => {
return
{
return
{
options
,
options
,
multiple
:
configs
.
multiple
,
multiple
:
configs
.
multiple
,
multipleLimit
:
configs
.
multipleLimit
,
clearable
:
configs
.
clearable
,
clearable
:
configs
.
clearable
,
filterable
:
configs
.
filterable
,
filterable
:
configs
.
filterable
,
loading
:
false
,
loading
:
false
,
...
@@ -368,6 +371,20 @@ describe('Select', () => {
...
@@ -368,6 +371,20 @@ describe('Select', () => {
},
100
);
},
100
);
});
});
it
(
'
multiple limit
'
,
done
=>
{
vm
=
getSelectVm
({
multiple
:
true
,
multipleLimit
:
1
});
const
options
=
vm
.
$el
.
querySelectorAll
(
'
.el-select-dropdown__item
'
);
options
[
1
].
click
();
setTimeout
(()
=>
{
expect
(
vm
.
value
.
indexOf
(
'
选项2
'
)
>
-
1
).
to
.
true
;
options
[
3
].
click
();
setTimeout
(()
=>
{
expect
(
vm
.
value
.
indexOf
(
'
选项4
'
)).
to
.
equal
(
-
1
);
done
();
},
50
);
},
50
);
});
it
(
'
multiple remote search
'
,
done
=>
{
it
(
'
multiple remote search
'
,
done
=>
{
const
remoteMethod
=
vm
=>
{
const
remoteMethod
=
vm
=>
{
return
query
=>
{
return
query
=>
{
...
...
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