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
e56ae9ab
Commit
e56ae9ab
authored
Jan 26, 2018
by
杨奕
Committed by
Hi-Linlin
Jan 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Select: keep input height if not expanded (#9452)
parent
34df2e63
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
8 deletions
+14
-8
README.md
README.md
+1
-1
examples/components/footer.vue
examples/components/footer.vue
+1
-1
examples/nav.config.json
examples/nav.config.json
+1
-1
packages/select/src/select.vue
packages/select/src/select.vue
+7
-3
packages/theme-chalk/src/select.scss
packages/theme-chalk/src/select.scss
+4
-2
No files found.
README.md
View file @
e56ae9ab
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
-
[
Customize theme
](
http://element.eleme.io/#/en-US/component/custom-theme
)
-
[
Customize theme
](
http://element.eleme.io/#/en-US/component/custom-theme
)
-
[
Preview and generate theme online
](
https://elementui.github.io/theme-chalk-preview
)
-
[
Preview and generate theme online
](
https://elementui.github.io/theme-chalk-preview
)
-
[
Element for React
](
https://github.com/eleme/element-react
)
-
[
Element for React
](
https://github.com/eleme/element-react
)
-
[
Element for Angular
](
https://github.com/
eleme
/element-angular
)
-
[
Element for Angular
](
https://github.com/
ElemeFE
/element-angular
)
-
[
Atom helper
](
https://github.com/ElemeFE/element-helper
)
-
[
Atom helper
](
https://github.com/ElemeFE/element-helper
)
-
Starter kit
-
Starter kit
-
[
element-starter
](
https://github.com/ElementUI/element-starter
)
-
[
element-starter
](
https://github.com/ElementUI/element-starter
)
...
...
examples/components/footer.vue
View file @
e56ae9ab
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a
href=
"https://github.com/ElementUI/element-theme"
class=
"footer-main-link"
target=
"_blank"
>
{{
langConfig
.
theme
}}
</a>
<a
href=
"https://github.com/ElementUI/element-theme"
class=
"footer-main-link"
target=
"_blank"
>
{{
langConfig
.
theme
}}
</a>
<a
href=
"https://github.com/ElementUI/theme-chalk-preview"
class=
"footer-main-link"
target=
"_blank"
>
{{
langConfig
.
preview
}}
</a>
<a
href=
"https://github.com/ElementUI/theme-chalk-preview"
class=
"footer-main-link"
target=
"_blank"
>
{{
langConfig
.
preview
}}
</a>
<a
href=
"https://github.com/eleme/element-react"
class=
"footer-main-link"
target=
"_blank"
>
Element-React
</a>
<a
href=
"https://github.com/eleme/element-react"
class=
"footer-main-link"
target=
"_blank"
>
Element-React
</a>
<a
href=
"https://github.com/
eleme
/element-angular"
class=
"footer-main-link"
target=
"_blank"
>
Element-Angular
</a>
<a
href=
"https://github.com/
ElemeFE
/element-angular"
class=
"footer-main-link"
target=
"_blank"
>
Element-Angular
</a>
</div>
</div>
<div
class=
"footer-main"
>
<div
class=
"footer-main"
>
<h4>
{{
langConfig
.
community
}}
</h4>
<h4>
{{
langConfig
.
community
}}
</h4>
...
...
examples/nav.config.json
View file @
e56ae9ab
...
@@ -510,7 +510,7 @@
...
@@ -510,7 +510,7 @@
},
},
{
{
"name"
:
"Element Angular"
,
"name"
:
"Element Angular"
,
"href"
:
"https://eleme
.github.io/element-angular
/"
"href"
:
"https://eleme
nt-angular.faas.ele.me
/"
},
},
{
{
"name"
:
"Development"
,
"name"
:
"Development"
,
...
...
packages/select/src/select.vue
View file @
e56ae9ab
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
v-for=
"item in selected"
v-for=
"item in selected"
:key=
"getValueKey(item)"
:key=
"getValueKey(item)"
:closable=
"!disabled"
:closable=
"!disabled"
size=
"small
"
:size=
"collapseTagSize
"
:hit=
"item.hitState"
:hit=
"item.hitState"
type=
"info"
type=
"info"
@
close=
"deleteTag($event, item)"
@
close=
"deleteTag($event, item)"
...
@@ -581,9 +581,13 @@
...
@@ -581,9 +581,13 @@
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
];
const
tags
=
this
.
$refs
.
tags
;
const
tags
=
this
.
$refs
.
tags
;
const
sizeInMap
=
sizeMap
[
this
.
selectSize
]
||
40
;
input
.
style
.
height
=
this
.
selected
.
length
===
0
input
.
style
.
height
=
this
.
selected
.
length
===
0
?
(
sizeMap
[
this
.
selectSize
]
||
40
)
+
'
px
'
?
sizeInMap
+
'
px
'
:
Math
.
max
(
tags
?
(
tags
.
clientHeight
+
10
)
:
0
,
sizeMap
[
this
.
selectSize
]
||
40
)
+
'
px
'
;
:
Math
.
max
(
tags
?
(
tags
.
clientHeight
+
(
tags
.
clientHeight
>
sizeInMap
?
6
:
0
))
:
0
,
sizeInMap
)
+
'
px
'
;
if
(
this
.
visible
&&
this
.
emptyText
!==
false
)
{
if
(
this
.
visible
&&
this
.
emptyText
!==
false
)
{
this
.
broadcast
(
'
ElSelectDropdown
'
,
'
updatePopper
'
);
this
.
broadcast
(
'
ElSelectDropdown
'
,
'
updatePopper
'
);
}
}
...
...
packages/theme-chalk/src/select.scss
View file @
e56ae9ab
...
@@ -80,7 +80,6 @@
...
@@ -80,7 +80,6 @@
margin-left
:
15px
;
margin-left
:
15px
;
color
:
$--select-multiple-input-color
;
color
:
$--select-multiple-input-color
;
font-size
:
$--select-font-size
;
font-size
:
$--select-font-size
;
vertical-align
:
middle
;
appearance
:
none
;
appearance
:
none
;
height
:
28px
;
height
:
28px
;
background-color
:
transparent
;
background-color
:
transparent
;
...
@@ -111,6 +110,9 @@
...
@@ -111,6 +110,9 @@
z-index
:
$--index-normal
;
z-index
:
$--index-normal
;
top
:
50%
;
top
:
50%
;
transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
display
:
flex
;
align-items
:
center
;
flex-wrap
:
wrap
;
}
}
.el-tag__close
{
.el-tag__close
{
...
@@ -120,7 +122,7 @@
...
@@ -120,7 +122,7 @@
.el-tag
{
.el-tag
{
box-sizing
:
border-box
;
box-sizing
:
border-box
;
border-color
:
transparent
;
border-color
:
transparent
;
margin
:
3px
0
3
px
6px
;
margin
:
2px
0
2
px
6px
;
background-color
:
#f0f2f5
;
background-color
:
#f0f2f5
;
&
__close
.el-icon-close
{
&
__close
.el-icon-close
{
...
...
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