github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vueComponent/ant-design

pull/9/head
wangxueliang 2017-12-14 10:12:33 +08:00
parent 844c3043e3 55048539c5
commit 13d5f32bd8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/tabs/Tabs.vue
View File

@ -177,7 +177,6 @@ export default {
activeKey: stateActiveKey, activeKey: stateActiveKey,
destroyInactiveTabPane, destroyInactiveTabPane,
onChange: setActiveKey, onChange: setActiveKey,
key: 'tabContent',
}, },
} }
const tabBarProps = { const tabBarProps = {
@ -189,17 +188,22 @@ export default {
tabBarPosition: tabBarPosition, tabBarPosition: tabBarPosition,
onTabClick: handleTabClick, onTabClick: handleTabClick,
activeKey: stateActiveKey, activeKey: stateActiveKey,
key: 'tabBar',
}, },
style: this.tabBarProps.style || {}, style: this.tabBarProps.style || {},
} }
const contents = [ const contents = [
<ScrollableInkTabBar {...tabBarProps}> <ScrollableInkTabBar
{...tabBarProps}
key='tabBar'
>
{$slots.tabBarExtraContent ? <template slot='extraContent'> {$slots.tabBarExtraContent ? <template slot='extraContent'>
{$slots.tabBarExtraContent} {$slots.tabBarExtraContent}
</template> : null} </template> : null}
</ScrollableInkTabBar>, </ScrollableInkTabBar>,
<TabContent {...tabContentProps}> <TabContent
{...tabContentProps}
key='tabContent'
>
{$slots.default} {$slots.default}
</TabContent>, </TabContent>,
] ]