Merge pull request #1432 from rijn/1427

Restrict no-animation config only affect one layer of children
This commit is contained in:
Aresn 2017-07-24 10:41:51 +08:00 committed by GitHub
commit c110b728f6
2 changed files with 9 additions and 2 deletions

View file

@ -1,5 +1,12 @@
<template> <template>
<Tabs value="name1" :animated="true"> <Tabs value="name1" :animated="false">
<Tab-pane label="test" name="test">
<Tabs type="card" v-bind:animated="true">
<Tab-pane label="标签2一">标签2一的内容</Tab-pane>
<Tab-pane label="标签2二">标签2二的内容</Tab-pane>
<Tab-pane label="标签2三">标签2三的内容</Tab-pane>
</Tabs>
</Tab-pane>
<Tab-pane :label="label1" name="name1"> <Tab-pane :label="label1" name="name1">
<Table :columns="columns1" :data="data1"></Table> <Table :columns="columns1" :data="data1"></Table>
</Tab-pane> </Tab-pane>

View file

@ -198,7 +198,7 @@
} }
.@{tabs-prefix-cls}-no-animation{ .@{tabs-prefix-cls}-no-animation{
.@{tabs-prefix-cls}-content { > .@{tabs-prefix-cls}-content {
transform: none!important; transform: none!important;
> .@{tabs-prefix-cls}-tabpane-inactive { > .@{tabs-prefix-cls}-tabpane-inactive {