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
9c7786b2
Commit
9c7786b2
authored
Dec 13, 2016
by
杨奕
Committed by
baiyaaaaa
Dec 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Select: add size property (#1715)
parent
07b796f8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
3 deletions
+28
-3
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/select.vue
packages/select/src/select.vue
+19
-1
packages/theme-default/src/select.css
packages/theme-default/src/select.css
+7
-2
No files found.
examples/docs/en-US/select.md
View file @
9c7786b2
...
@@ -626,6 +626,7 @@ Create and select new items that are not included in select options
...
@@ -626,6 +626,7 @@ Create and select new items that are not included in select options
|---------- |-------------- |---------- |-------------------------------- |-------- |
|---------- |-------------- |---------- |-------------------------------- |-------- |
| 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 |
| size | size of Input | string | large/small/mini | — |
| 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 |
| 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 | — | — |
...
...
examples/docs/zh-CN/select.md
View file @
9c7786b2
...
@@ -628,6 +628,7 @@
...
@@ -628,6 +628,7 @@
|---------- |-------------- |---------- |-------------------------------- |-------- |
|---------- |-------------- |---------- |-------------------------------- |-------- |
| multiple | 是否多选 | boolean | — | false |
| multiple | 是否多选 | boolean | — | false |
| disabled | 是否禁用 | boolean | — | false |
| disabled | 是否禁用 | boolean | — | false |
| size | 输入框尺寸 | string | large/small/mini | — |
| clearable | 单选时是否可以清空选项 | boolean | — | false |
| clearable | 单选时是否可以清空选项 | boolean | — | false |
| multiple-limit | 多选时用户最多可以选择的项目数,为 0 则不限制 | number | — | 0 |
| multiple-limit | 多选时用户最多可以选择的项目数,为 0 则不限制 | number | — | 0 |
| name | select input 的 name 属性 | string | — | — |
| name | select input 的 name 属性 | string | — | — |
...
...
packages/select/src/select.vue
View file @
9c7786b2
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
<input
<input
type=
"text"
type=
"text"
class=
"el-select__input"
class=
"el-select__input"
:class=
"`is-$
{ size }`"
@focus="visible = true"
@focus="visible = true"
@keyup="managePlaceholder"
@keyup="managePlaceholder"
@keydown="resetInputState"
@keydown="resetInputState"
...
@@ -44,6 +45,7 @@
...
@@ -44,6 +45,7 @@
type=
"text"
type=
"text"
:placeholder=
"currentPlaceholder"
:placeholder=
"currentPlaceholder"
:name=
"name"
:name=
"name"
:size=
"size"
:disabled=
"disabled"
:disabled=
"disabled"
:readonly=
"!filterable || multiple"
:readonly=
"!filterable || multiple"
@
focus=
"toggleMenu"
@
focus=
"toggleMenu"
...
@@ -92,6 +94,11 @@
...
@@ -92,6 +94,11 @@
import
{
addClass
,
removeClass
,
hasClass
}
from
'
wind-dom/src/class
'
;
import
{
addClass
,
removeClass
,
hasClass
}
from
'
wind-dom/src/class
'
;
import
{
addResizeListener
,
removeResizeListener
}
from
'
element-ui/src/utils/resize-event
'
;
import
{
addResizeListener
,
removeResizeListener
}
from
'
element-ui/src/utils/resize-event
'
;
import
{
t
}
from
'
element-ui/src/locale
'
;
import
{
t
}
from
'
element-ui/src/locale
'
;
const
sizeMap
=
{
'
large
'
:
42
,
'
small
'
:
30
,
'
mini
'
:
22
};
export
default
{
export
default
{
mixins
:
[
Emitter
,
Locale
],
mixins
:
[
Emitter
,
Locale
],
...
@@ -149,6 +156,7 @@
...
@@ -149,6 +156,7 @@
props
:
{
props
:
{
name
:
String
,
name
:
String
,
value
:
{},
value
:
{},
size
:
String
,
disabled
:
Boolean
,
disabled
:
Boolean
,
clearable
:
Boolean
,
clearable
:
Boolean
,
filterable
:
Boolean
,
filterable
:
Boolean
,
...
@@ -186,6 +194,7 @@
...
@@ -186,6 +194,7 @@
selectedLabel
:
''
,
selectedLabel
:
''
,
hoverIndex
:
-
1
,
hoverIndex
:
-
1
,
query
:
''
,
query
:
''
,
isForcedVisible
:
false
,
bottomOverflowBeforeHidden
:
0
,
bottomOverflowBeforeHidden
:
0
,
topOverflowBeforeHidden
:
0
,
topOverflowBeforeHidden
:
0
,
optionsAllDisabled
:
false
,
optionsAllDisabled
:
false
,
...
@@ -222,6 +231,10 @@
...
@@ -222,6 +231,10 @@
if
(
this
.
multiple
&&
this
.
filterable
)
{
if
(
this
.
multiple
&&
this
.
filterable
)
{
this
.
resetInputHeight
();
this
.
resetInputHeight
();
}
}
if
(
this
.
isForcedVisible
)
{
this
.
isForcedVisible
=
false
;
return
;
}
if
(
this
.
remote
&&
typeof
this
.
remoteMethod
===
'
function
'
)
{
if
(
this
.
remote
&&
typeof
this
.
remoteMethod
===
'
function
'
)
{
this
.
hoverIndex
=
-
1
;
this
.
hoverIndex
=
-
1
;
this
.
remoteMethod
(
val
);
this
.
remoteMethod
(
val
);
...
@@ -268,6 +281,10 @@
...
@@ -268,6 +281,10 @@
if
(
this
.
multiple
)
{
if
(
this
.
multiple
)
{
this
.
$refs
.
input
.
focus
();
this
.
$refs
.
input
.
focus
();
}
else
{
}
else
{
if
(
!
this
.
remote
)
{
this
.
isForcedVisible
=
true
;
this
.
broadcast
(
'
ElOption
'
,
'
queryChange
'
,
''
);
}
this
.
broadcast
(
'
ElInput
'
,
'
inputSelect
'
);
this
.
broadcast
(
'
ElInput
'
,
'
inputSelect
'
);
}
}
}
}
...
@@ -413,13 +430,14 @@
...
@@ -413,13 +430,14 @@
resetInputState
(
e
)
{
resetInputState
(
e
)
{
if
(
e
.
keyCode
!==
8
)
this
.
toggleLastOptionHitState
(
false
);
if
(
e
.
keyCode
!==
8
)
this
.
toggleLastOptionHitState
(
false
);
this
.
inputLength
=
this
.
$refs
.
input
.
value
.
length
*
15
+
20
;
this
.
inputLength
=
this
.
$refs
.
input
.
value
.
length
*
15
+
20
;
this
.
resetInputHeight
();
},
},
resetInputHeight
()
{
resetInputHeight
()
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
let
inputChildNodes
=
this
.
$refs
.
reference
.
$el
.
childNodes
;
let
inputChildNodes
=
this
.
$refs
.
reference
.
$el
.
childNodes
;
let
input
=
[].
filter
.
call
(
inputChildNodes
,
item
=>
item
.
tagName
===
'
INPUT
'
)[
0
];
let
input
=
[].
filter
.
call
(
inputChildNodes
,
item
=>
item
.
tagName
===
'
INPUT
'
)[
0
];
input
.
style
.
height
=
Math
.
max
(
this
.
$refs
.
tags
.
clientHeight
+
6
,
this
.
size
===
'
small
'
?
28
:
36
)
+
'
px
'
;
input
.
style
.
height
=
Math
.
max
(
this
.
$refs
.
tags
.
clientHeight
+
6
,
sizeMap
[
this
.
size
]
||
36
)
+
'
px
'
;
this
.
broadcast
(
'
ElSelectDropdown
'
,
'
updatePopper
'
);
this
.
broadcast
(
'
ElSelectDropdown
'
,
'
updatePopper
'
);
});
});
},
},
...
...
packages/theme-default/src/select.css
View file @
9c7786b2
...
@@ -71,13 +71,16 @@
...
@@ -71,13 +71,16 @@
border
:
none
;
border
:
none
;
outline
:
none
;
outline
:
none
;
padding
:
0
;
padding
:
0
;
margin
:
4px
0
-3px
10px
;
margin
-left
:
10px
;
color
:
var
(
--select-multiple-input-color
);
color
:
var
(
--select-multiple-input-color
);
font-size
:
var
(
--select-font-size
);
font-size
:
var
(
--select-font-size
);
vertical-align
:
baseline
;
vertical-align
:
baseline
;
appearance
:
none
;
appearance
:
none
;
height
:
28px
;
height
:
28px
;
background-color
:
transparent
;
background-color
:
transparent
;
@when
mini
{
height
:
14px
;
}
}
}
@e
close
{
@e
close
{
...
@@ -100,6 +103,8 @@
...
@@ -100,6 +103,8 @@
line-height
:
normal
;
line-height
:
normal
;
white-space
:
normal
;
white-space
:
normal
;
z-index
:
var
(
--index-top
);
z-index
:
var
(
--index-top
);
top
:
50%
;
transform
:
translateY
(
-50%
);
}
}
&
.el-tag__close
{
&
.el-tag__close
{
...
@@ -110,7 +115,7 @@
...
@@ -110,7 +115,7 @@
height
:
var
(
--select-tag-height
);
height
:
var
(
--select-tag-height
);
line-height
:
var
(
--select-tag-height
);
line-height
:
var
(
--select-tag-height
);
box-sizing
:
border-box
;
box-sizing
:
border-box
;
margin
:
6px
0
0
6px
;
margin
:
3px
0
3px
6px
;
}
}
@e
tag
{
@e
tag
{
...
...
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