Restrict no-animation config only affect one layer of children

rijn · rijn · commit 2e7b3df426fb · 2017-07-21T11:26:48.000-05:00
diff --git a/examples/routers/tabs.vue b/examples/routers/tabs.vue
@@ -1,5 +1,12 @@
 <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">
             <Table :columns="columns1" :data="data1"></Table>
         </Tab-pane>
diff --git a/src/styles/components/tabs.less b/src/styles/components/tabs.less
@@ -198,7 +198,7 @@
 }
 
 .@{tabs-prefix-cls}-no-animation{
-    .@{tabs-prefix-cls}-content {
+    > .@{tabs-prefix-cls}-content {
         transform: none!important;
 
         > .@{tabs-prefix-cls}-tabpane-inactive {

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`.@{tabs-prefix-cls}-no-animation{`
`201`		`- .@{tabs-prefix-cls}-content {`
	`201`	`+ > .@{tabs-prefix-cls}-content {`
`202`	`202`	`transform: none!important;`
`203`	`203`
`204`	`204`	`> .@{tabs-prefix-cls}-tabpane-inactive {`