diff --git a/src/components/tabs/pane.vue b/src/components/tabs/pane.vue
index f67cf44d..0fda47b4 100644
--- a/src/components/tabs/pane.vue
+++ b/src/components/tabs/pane.vue
@@ -1,13 +1,51 @@
 <template>
-
+    <div :class="prefixCls"><slot></slot></div>
 </template>
 <script>
+    const prefixCls = 'ivu-tabs-tabpane';
+
     export default {
-        props: {},
-        data () {
-            return {}
+        name: 'TabPane',
+        props: {
+            key: {
+                type: String
+            },
+            label: {
+                type: String,
+                default: ''
+            },
+            icon: {
+                type: String
+            },
+            disabled: {
+                type: Boolean,
+                default: false
+            }
         },
-        computed: {},
-        methods: {}
+        data () {
+            return {
+                prefixCls: prefixCls,
+                show: true
+            }
+        },
+        computed: {
+
+        },
+        methods: {
+            updateNav () {
+                this.$parent.updateNav();
+            }
+        },
+        watch: {
+            label () {
+                this.updateNav();
+            },
+            icon () {
+                this.updateNav();
+            },
+            disabled () {
+                this.updateNav();
+            }
+        }
     }
 </script>
\ No newline at end of file
diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue
index f67cf44d..b0255af7 100644
--- a/src/components/tabs/tabs.vue
+++ b/src/components/tabs/tabs.vue
@@ -1,13 +1,200 @@
 <template>
-
+    <div :class="classes">
+        <div :class="[prefixCls + '-bar']">
+            <div :class="[prefixCls + '-nav-container']">
+                <div :class="[prefixCls + '-nav-wrap']">
+                    <div :class="[prefixCls + '-nav-scroll']">
+                        <div :class="[prefixCls + '-nav']" v-el:nav>
+                            <div :class="barClasses" :style="barStyle"></div>
+                            <div :class="tabCls(item)" v-for="item in navList" @click="handleChange($index)">
+                                <Icon v-if="item.icon !== ''" :type="item.icon"></Icon>
+                                {{ item.label }}
+                                <Icon v-if="closable && type === 'card'" type="ios-close-empty" @click.stop="handleRemove($index)"></Icon>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div :class="contentClasses" :style="contentStyle"><slot></slot></div>
+    </div>
 </template>
 <script>
+    import Icon from '../icon/icon.vue';
+    import { oneOf, getStyle } from '../../utils/assist';
+
+    const prefixCls = 'ivu-tabs';
+
     export default {
-        props: {},
-        data () {
-            return {}
+        components: { Icon },
+        props: {
+            activeKey: {
+                type: [String, Number]
+            },
+            type: {
+                validator (value) {
+                    return oneOf(value, ['line', 'card']);
+                },
+                default: 'line'
+            },
+            size: {
+                validator (value) {
+                    return oneOf(value, ['small', 'default']);
+                },
+                default: 'default'
+            },
+            animated: {
+                type: Boolean,
+                default: true
+            },
+            closable: {
+                type: Boolean,
+                default: false
+            }
         },
-        computed: {},
-        methods: {}
+        data () {
+            return {
+                prefixCls: prefixCls,
+                navList: [],
+                barWidth: 0,
+                barOffset: 0
+            }
+        },
+        computed: {
+            classes () {
+                return [
+                    `${prefixCls}`,
+                    {
+                        [`${prefixCls}-card`]: this.type === 'card',
+                        [`${prefixCls}-mini`]: this.size === 'small' && this.type === 'line',
+                        [`${prefixCls}-no-animation`]: !this.animated
+                    }
+                ]
+            },
+            contentClasses () {
+                return [
+                    `${prefixCls}-content`,
+                    `${prefixCls}-content-animated`
+                ]
+            },
+            barClasses () {
+                return [
+                    `${prefixCls}-ink-bar`,
+                    `${prefixCls}-ink-bar-animated`
+                ]
+            },
+            contentStyle () {
+                const x = this.navList.findIndex((nav, index) => nav.key === this.activeKey);
+                const p = x === 0 ? '0%' : `-${x}00%`;
+
+                let style = {};
+                if (x > -1) {
+                    style = {
+                        transform: `translateX(${p}) translateZ(0px)`
+                    }
+                }
+                return style;
+            },
+            barStyle () {
+                let style = {
+                    display: 'none',
+                    width: `${this.barWidth}px`,
+                    transform: `translate3d(${this.barOffset}px, 0px, 0px)`
+                };
+                if (this.type === 'line') style.display = 'block';
+
+                return style;
+            }
+        },
+        methods: {
+            getTabs () {
+                return this.$children.filter(item => item.$options.name === 'TabPane');
+            },
+            updateNav () {
+                this.navList = [];
+                this.getTabs().forEach((pane, index) => {
+                    this.navList.push({
+                        label: pane.label,
+                        icon: pane.icon || '',
+                        key: pane.key || index,
+                        disabled: pane.disabled
+                    });
+                    if (!pane.key) pane.key = index;
+                    if (index === 0) {
+                        if (!this.activeKey) this.activeKey = pane.key || index;
+                    }
+                });
+                this.updateBar();
+            },
+            updateBar () {
+                this.$nextTick(() => {
+                    const index = this.navList.findIndex((nav, index) => nav.key === this.activeKey);
+                    const prevTabs = this.$els.nav.querySelectorAll(`.${prefixCls}-tab`);
+                    const tab = prevTabs[index];
+                    this.barWidth = parseFloat(getStyle(tab, 'width'));
+
+                    if (index > 0) {
+                        let offset = 0;
+                        const gutter = this.size === 'small' ? 0 : 16;
+                        for (let i = 0; i < index; i++) {
+                            offset += parseFloat(getStyle(prevTabs[i], 'width')) + gutter;
+                        }
+
+                        this.barOffset = offset;
+                    } else {
+                        this.barOffset = 0;
+                    }
+                });
+            },
+            tabCls (item) {
+                return [
+                    `${prefixCls}-tab`,
+                    {
+                        [`${prefixCls}-tab-disabled`]: item.disabled,
+                        [`${prefixCls}-tab-active`]: item.key === this.activeKey
+                    }
+                ]
+            },
+            handleChange (index) {
+                const nav = this.navList[index];
+                if (nav.disabled) return;
+                this.activeKey = nav.key;
+                this.$emit('on-click', nav.key);
+            },
+            handleRemove (index) {
+                const tabs = this.getTabs();
+                const tab = tabs[index];
+                tab.$destroy(true);
+
+                if (tab.key === this.activeKey) {
+                    const newTabs = this.getTabs();
+                    let activeKey = -1;
+
+                    if (newTabs.length) {
+                        const leftNoDisabledTabs = tabs.filter((item, itemIndex) => !item.disabled && itemIndex < index);
+                        const rightNoDisabledTabs = tabs.filter((item, itemIndex) => !item.disabled && itemIndex > index);
+
+                        if (rightNoDisabledTabs.length) {
+                            activeKey = rightNoDisabledTabs[0].key;
+                        } else if (leftNoDisabledTabs.length) {
+                            activeKey = leftNoDisabledTabs[leftNoDisabledTabs.length - 1].key;
+                        } else {
+                            activeKey = newTabs[0].key;
+                        }
+                    }
+                    this.activeKey = activeKey;
+                }
+                this.$emit('on-tab-remove', tab.key);
+                this.updateNav();
+            }
+        },
+        compiled () {
+            this.updateNav();
+        },
+        watch: {
+            activeKey () {
+                this.updateBar();
+            }
+        }
     }
 </script>
\ No newline at end of file
diff --git a/src/styles/components/tabs.less b/src/styles/components/tabs.less
index c5b0489d..0e5ceb49 100644
--- a/src/styles/components/tabs.less
+++ b/src/styles/components/tabs.less
@@ -1 +1,205 @@
-@tabs-prefix-cls: ~"@{css-prefix}tabs";
\ No newline at end of file
+@tabs-prefix-cls: ~"@{css-prefix}tabs";
+
+.@{tabs-prefix-cls} {
+    box-sizing: border-box;
+    position: relative;
+    overflow: hidden;
+    color: @text-color;
+    .clearfix;
+
+    &-bar {
+        outline: none;
+    }
+
+    &-ink-bar {
+        height: 2px;
+        box-sizing: border-box;
+        background-color: @primary-color;
+        position: absolute;
+        left: 0;
+        bottom: 1px;
+        z-index: 1;
+        transition: transform .3s @ease-in-out;
+        transform-origin: 0 0;
+    }
+
+    &-bar {
+        border-bottom: 1px solid @border-color-base;
+        margin-bottom: 16px;
+    }
+
+    &-nav-container {
+        margin-bottom: -1px;
+        line-height: @line-height-base;
+        font-size: @font-size-base;
+        box-sizing: border-box;
+        white-space: nowrap;
+        overflow: hidden;
+        position: relative;
+        .clearfix;
+    }
+
+    &-nav-container-scrolling {
+        padding-left: 32px;
+        padding-right: 32px;
+    }
+
+    &-nav-wrap {
+        overflow: hidden;
+        margin-bottom: -1px;
+    }
+
+    &-nav-scroll {
+        overflow: hidden;
+        white-space: nowrap;
+    }
+
+    &-nav {
+        padding-left: 0;
+        margin: 0;
+        float: left;
+        list-style: none;
+        box-sizing: border-box;
+        position: relative;
+        transition: transform 0.5s @ease-in-out;
+
+        &:before,
+        &:after {
+            display: table;
+            content: " ";
+        }
+
+        &:after {
+            clear: both;
+        }
+
+        .@{tabs-prefix-cls}-tab-disabled {
+            pointer-events: none;
+            cursor: default;
+            color: #ccc;
+        }
+
+        .@{tabs-prefix-cls}-tab {
+            display: inline-block;
+            height: 100%;
+            padding: 8px 16px;
+            margin-right: 16px;
+            box-sizing: border-box;
+            cursor: pointer;
+            text-decoration: none;
+            position: relative;
+            transition: color .3s @ease-in-out;
+
+            &:hover {
+                color: @link-hover-color;
+            }
+
+            &:active {
+                color: @link-active-color;
+            }
+            .@{css-prefix-iconfont} {
+                width: 14px;
+                height: 14px;
+                margin-right: 8px;
+            }
+        }
+
+        .@{tabs-prefix-cls}-tab-active {
+            color: @primary-color;
+        }
+    }
+    &-mini &-nav-container {
+        font-size: @font-size-base;
+    }
+
+    &-mini &-tab {
+        margin-right: 0;
+        padding: 8px 16px;
+    }
+
+    & {
+        .@{tabs-prefix-cls}-content-animated {
+            display: flex;
+            flex-direction: row;
+            will-change: transform;
+            transition: transform .3s @ease-in-out;
+        }
+
+        .@{tabs-prefix-cls}-tabpane {
+            flex-shrink: 0;
+            width: 100%;
+            transition: opacity .3s;
+            opacity: 1;
+        }
+
+        .@{tabs-prefix-cls}-tabpane-inactive {
+            opacity: 0;
+            height: 0;
+        }
+    }
+
+    // card style
+    &&-card > &-bar &-nav-container {
+        height: 32px;
+    }
+    &&-card > &-bar &-ink-bar {
+        visibility: hidden;
+    }
+    &&-card > &-bar &-tab {
+        margin: 0;
+        margin-right: 4px;
+        height: 31px;
+        padding: 5px 16px 4px;
+        border: 1px solid @border-color-base;
+        border-bottom: 0;
+        border-radius: @btn-border-radius @btn-border-radius 0 0;
+        transition: all 0.3s @ease-in-out;
+        background: @table-thead-bg;
+    }
+    &&-card > &-bar &-tab-active {
+        height: 32px;
+        padding-bottom: 5px;
+        background: #fff;
+        transform: translateZ(0);
+        border-color: @border-color-base;
+        color: @primary-color;
+    }
+    &&-card > &-bar &-nav-wrap {
+        margin-bottom: 0;
+    }
+    &&-card > &-bar &-tab .@{css-prefix-iconfont}-ios-close-empty {
+        width: 0;
+        height: 22px;
+        font-size: 22px;
+        margin-right: 0;
+        color: @legend-color;
+        text-align: right;
+        vertical-align: middle;
+        overflow: hidden;
+        position: relative;
+        top: -1px;
+        transform-origin: 100% 50%;
+        transition: all 0.3s @ease-in-out;
+        &:hover {
+            color: #444;
+        }
+    }
+
+    &&-card > &-bar &-tab-active .@{css-prefix-iconfont}-ios-close-empty,
+    &&-card > &-bar &-tab:hover .@{css-prefix-iconfont}-ios-close-empty {
+        width: 14px;
+        transform: translateZ(0);
+    }
+}
+
+.@{tabs-prefix-cls}-no-animation{
+    .@{tabs-prefix-cls}-content {
+        &-animated {
+            transform: none!important;
+        }
+
+        > .@{tabs-prefix-cls}-tabpane-inactive {
+            display: none;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/app.vue b/test/app.vue
index 3d6a6a99..fc1611ae 100644
--- a/test/app.vue
+++ b/test/app.vue
@@ -43,6 +43,7 @@ li + li {
                 <li><a v-link="'/transfer'">Transfer</a></li>
                 <li><a v-link="'/table'">Table</a></li>
                 <li><a v-link="'/dropdown'">Dropdown</a></li>
+                <li><a v-link="'/tabs'">Tabs</a></li>
             </ul>
         </nav>
         <router-view></router-view>
diff --git a/test/main.js b/test/main.js
index c572d57d..1b1729f0 100644
--- a/test/main.js
+++ b/test/main.js
@@ -112,6 +112,11 @@ router.map({
         component: function (resolve) {
             require(['./routers/dropdown.vue'], resolve);
         }
+    },
+    '/tabs': {
+        component: function (resolve) {
+            require(['./routers/tabs.vue'], resolve);
+        }
     }
 });
 
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 48ef8759..4d7b389d 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -1,17 +1,18 @@
 <template>
-    <i-table border :columns="columns1" :data="data1">
-        <div slot="header">表格标题</div>
-        <div slot="footer">表格页脚</div>
-    </i-table>
+    <i-table border :content="self" :columns="columns7" :data="data6"></i-table>
 </template>
 <script>
     export default {
         data () {
             return {
-                columns1: [
+                self: this,
+                columns7: [
                     {
                         title: '姓名',
-                        key: 'name'
+                        key: 'name',
+                        render (row, column, index) {
+                            return `<Icon type="person"></Icon> <strong>${row.name}</strong>`;
+                        }
                     },
                     {
                         title: '年龄',
@@ -20,9 +21,18 @@
                     {
                         title: '地址',
                         key: 'address'
+                    },
+                    {
+                        title: '操作',
+                        key: 'action',
+                        width: 150,
+                        align: 'center',
+                        render (row, column, index) {
+                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
+                        }
                     }
                 ],
-                data1: [
+                data6: [
                     {
                         name: '王小明',
                         age: 18,
@@ -45,6 +55,17 @@
                     }
                 ]
             }
+        },
+        methods: {
+            show (index) {
+                this.$Modal.info({
+                    title: '用户信息',
+                    content: `姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`
+                })
+            },
+            remove (index) {
+                this.data6.splice(index, 1);
+            }
         }
     }
 </script>
diff --git a/test/routers/tabs.vue b/test/routers/tabs.vue
new file mode 100644
index 00000000..44e4ba94
--- /dev/null
+++ b/test/routers/tabs.vue
@@ -0,0 +1,34 @@
+<template>
+    <i-button @click="toggleClose" :animated="false">closable</i-button>
+
+    <Tabs type="line" :closable="closable" :animated="false">
+        <Tab-pane label="Tab 1">Tab1 content</Tab-pane>
+        <Tab-pane label="Tab 2" icon="ionic">Tab2 content</Tab-pane>
+        <Tab-pane label="Tab 3" disabled>Tab3 content</Tab-pane>
+        <Tab-pane label="Tab 4">Tab4 content</Tab-pane>
+        <Tab-pane label="Tab 5">Tab5 content</Tab-pane>
+        <Tab-pane label="Tab 6" icon="ionic">Tab6 content</Tab-pane>
+        <Tab-pane label="Tab 7" disabled>Tab7 content</Tab-pane>
+        <Tab-pane label="Tab 888888888">Tab8 content</Tab-pane>
+    </Tabs>
+</template>
+<script>
+    export default {
+        props: {
+
+        },
+        data () {
+            return {
+                closable: true
+            }
+        },
+        computed: {
+
+        },
+        methods: {
+            toggleClose () {
+                this.closable = !this.closable;
+            }
+        }
+    }
+</script>
\ No newline at end of file