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
eb1479d3
Commit
eb1479d3
authored
Jun 01, 2018
by
Jikkai Xiao
Committed by
杨奕
Jun 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tabs: fix lazy loading (#11461)
* Tabs: fix lazy tab-pane order * Tabs: fix lazy loading
parent
08193fdb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
packages/tabs/src/tab-pane.vue
packages/tabs/src/tab-pane.vue
+8
-3
packages/tabs/src/tabs.vue
packages/tabs/src/tabs.vue
+1
-3
test/unit/specs/tabs.spec.js
test/unit/specs/tabs.spec.js
+2
-2
No files found.
packages/tabs/src/tab-pane.vue
View file @
eb1479d3
<
template
>
<div
class=
"el-tab-pane"
v-if=
"
!lazy
|| active"
v-if=
"
(!lazy || loaded)
|| active"
v-show=
"active"
role=
"tabpanel"
:aria-hidden=
"!active"
...
...
@@ -28,7 +28,8 @@
data
()
{
return
{
index
:
null
index
:
null
,
loaded
:
false
};
},
...
...
@@ -37,7 +38,11 @@
return
this
.
closable
||
this
.
$parent
.
closable
;
},
active
()
{
return
this
.
$parent
.
currentName
===
(
this
.
name
||
this
.
index
);
const
active
=
this
.
$parent
.
currentName
===
(
this
.
name
||
this
.
index
);
if
(
active
)
{
this
.
loaded
=
true
;
}
return
active
;
},
paneName
()
{
return
this
.
name
||
this
.
index
;
...
...
packages/tabs/src/tabs.vue
View file @
eb1479d3
...
...
@@ -88,9 +88,7 @@
}
},
addPanes
(
item
)
{
const
index
=
this
.
$slots
.
default
.
filter
(
item
=>
{
return
item
.
elm
.
nodeType
===
1
&&
/
\b
el-tab-pane
\b
/
.
test
(
item
.
elm
.
className
);
}).
indexOf
(
item
.
$vnode
);
const
index
=
this
.
$slots
.
default
.
indexOf
(
item
.
$vnode
);
this
.
panes
.
splice
(
index
,
0
,
item
);
},
removePanes
(
item
)
{
...
...
test/unit/specs/tabs.spec.js
View file @
eb1479d3
...
...
@@ -494,8 +494,8 @@ describe('Tabs', () => {
vm
.
$el
.
querySelector
(
'
.el-tabs__nav > #tab-A
'
).
click
();
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-tabs__content
'
).
children
.
length
).
to
.
be
.
equal
(
3
);
expect
(
vm
.
$el
.
querySelector
(
'
.el-tabs__content > #pane-D
'
)).
to
.
be
.
equal
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.el-tabs__content
'
).
children
.
length
).
to
.
be
.
equal
(
4
);
expect
(
vm
.
$el
.
querySelector
(
'
.el-tabs__content > #pane-D
'
)).
not
.
to
.
be
.
equal
(
null
);
done
();
});
});
...
...
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