Commit c110b728f6f98a3fad8ab468d21cb43c4423a097
Committed by
GitHub
Merge pull request #1432 from rijn/1427
Restrict no-animation config only affect one layer of children
Showing
2 changed files
with
9 additions
and
2 deletions
Show diff stats
examples/routers/tabs.vue
1 | <template> | 1 | <template> |
2 | - <Tabs value="name1" :animated="true"> | 2 | + <Tabs value="name1" :animated="false"> |
3 | + <Tab-pane label="test" name="test"> | ||
4 | + <Tabs type="card" v-bind:animated="true"> | ||
5 | + <Tab-pane label="标签2一">标签2一的内容</Tab-pane> | ||
6 | + <Tab-pane label="标签2二">标签2二的内容</Tab-pane> | ||
7 | + <Tab-pane label="标签2三">标签2三的内容</Tab-pane> | ||
8 | + </Tabs> | ||
9 | + </Tab-pane> | ||
3 | <Tab-pane :label="label1" name="name1"> | 10 | <Tab-pane :label="label1" name="name1"> |
4 | <Table :columns="columns1" :data="data1"></Table> | 11 | <Table :columns="columns1" :data="data1"></Table> |
5 | </Tab-pane> | 12 | </Tab-pane> |
src/styles/components/tabs.less
@@ -198,7 +198,7 @@ | @@ -198,7 +198,7 @@ | ||
198 | } | 198 | } |
199 | 199 | ||
200 | .@{tabs-prefix-cls}-no-animation{ | 200 | .@{tabs-prefix-cls}-no-animation{ |
201 | - .@{tabs-prefix-cls}-content { | 201 | + > .@{tabs-prefix-cls}-content { |
202 | transform: none!important; | 202 | transform: none!important; |
203 | 203 | ||
204 | > .@{tabs-prefix-cls}-tabpane-inactive { | 204 | > .@{tabs-prefix-cls}-tabpane-inactive { |