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
f9894799
Commit
f9894799
authored
Apr 27, 2017
by
baiyaaaaa
Committed by
cinwell.li
Apr 27, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support use transitiongroup in el-col (#4483)
parent
3655d0be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
packages/col/src/col.js
packages/col/src/col.js
+10
-12
packages/row/src/row.vue
packages/row/src/row.vue
+2
-0
No files found.
packages/col/src/col.js
View file @
f9894799
...
...
@@ -17,23 +17,21 @@ export default {
computed
:
{
gutter
()
{
return
this
.
$parent
.
gutter
;
},
style
()
{
var
ret
=
{};
if
(
this
.
gutter
)
{
ret
.
paddingLeft
=
this
.
gutter
/
2
+
'
px
'
;
ret
.
paddingRight
=
ret
.
paddingLeft
;
let
parent
=
this
.
$parent
;
while
(
parent
&&
parent
.
$options
.
componentName
!==
'
ElRow
'
)
{
parent
=
parent
.
$parent
;
}
return
ret
;
return
parent
?
parent
.
gutter
:
0
;
}
},
render
(
h
)
{
let
{
style
}
=
this
;
let
classList
=
[];
let
style
=
{};
if
(
this
.
gutter
)
{
style
.
paddingLeft
=
this
.
gutter
/
2
+
'
px
'
;
style
.
paddingRight
=
style
.
paddingLeft
;
}
[
'
span
'
,
'
offset
'
,
'
pull
'
,
'
push
'
].
forEach
(
prop
=>
{
if
(
this
[
prop
])
{
...
...
packages/row/src/row.vue
View file @
f9894799
...
...
@@ -17,6 +17,8 @@
export
default
{
name
:
'
ElRow
'
,
componentName
:
'
ElRow
'
,
props
:
{
gutter
:
Number
,
type
:
String
,
...
...
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