Merge branch 'master' of https://github.com/vueComponent/ant-design
						commit
						f758616eb9
					
				| 
						 | 
				
			
			@ -139,8 +139,7 @@
 | 
			
		|||
 | 
			
		||||
      let head
 | 
			
		||||
      const tabs = tabList && tabList.length ? (
 | 
			
		||||
        // size='large' Tabs组件暂时未支持
 | 
			
		||||
        <Tabs class={`${prefixCls}-head-tabs`} onChange={this.onHandleTabChange}>
 | 
			
		||||
        <Tabs class={`${prefixCls}-head-tabs`} size='large' onChange={this.onHandleTabChange}>
 | 
			
		||||
          {tabList.map(item => <TabPane tab={item.tab} key={item.key} />)}
 | 
			
		||||
        </Tabs>
 | 
			
		||||
      ) : null
 | 
			
		||||
| 
						 | 
				
			
			@ -169,7 +168,7 @@
 | 
			
		|||
      const actions = getComponentFromProp(this, 'actions')
 | 
			
		||||
      const actionDom = actions || null
 | 
			
		||||
      const divProps = omit(others, [
 | 
			
		||||
        'onTabChange',
 | 
			
		||||
        'tabChange',
 | 
			
		||||
      ])
 | 
			
		||||
      return (
 | 
			
		||||
        <div {...divProps} class={classString} ref='cardContainerRef'>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,7 @@
 | 
			
		|||
<md>
 | 
			
		||||
## 基本
 | 
			
		||||
</md>
 | 
			
		||||
<Card title="Card title" >
 | 
			
		||||
<Card title="Card title">
 | 
			
		||||
  <a href="#" slot="extra">More</a>
 | 
			
		||||
  <p>Card content</p>
 | 
			
		||||
  <p>Card content</p>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -44,7 +44,7 @@ Pagination  |  done|select完成后补全
 | 
			
		|||
Avatar  |  done
 | 
			
		||||
Badge  |  done
 | 
			
		||||
Breadcrumb |  done
 | 
			
		||||
Card
 | 
			
		||||
Card  | done
 | 
			
		||||
Collapse
 | 
			
		||||
LocaleProvider
 | 
			
		||||
Progress
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import Demo from './components/demo.vue'
 | 
			
		||||
const AsyncComp = () => {
 | 
			
		||||
  return {
 | 
			
		||||
    component: import(`../components/card/demo/basic.vue`),
 | 
			
		||||
    component: import(`../components/button/demo/index.vue`),
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
export default [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue