From 8612331300a4e3063f7d7f47edb966b1b58a176c Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Fri, 12 Jan 2018 17:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20tabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabs/index.js                      |  4 +--
 components/tabs/index.vue                     | 35 ++++++++++---------
 .../tabs/{index.zh-CN => index.zh-CN.md}      |  0
 components/tabs/{ => src}/InkTabBar.vue       |  0
 components/tabs/{ => src}/InkTabBarMixin.js   |  0
 components/tabs/{ => src}/KeyCode.js          |  0
 .../tabs/{ => src}/ScrollableInkTabBar.vue    |  3 +-
 .../tabs/{ => src}/ScrollableTabBar.vue       |  3 +-
 .../tabs/{ => src}/ScrollableTabBarMixin.js   |  6 ++--
 components/tabs/{ => src}/TabBar.vue          | 13 ++-----
 components/tabs/{ => src}/TabBarMixin.js      | 15 +++-----
 components/tabs/{ => src}/TabContent.vue      |  0
 components/tabs/{ => src}/TabPane.vue         |  0
 components/tabs/{ => src}/Tabs.vue            | 31 +++++++++-------
 components/tabs/{ => src}/utils.js            |  0
 15 files changed, 51 insertions(+), 59 deletions(-)
 rename components/tabs/{index.zh-CN => index.zh-CN.md} (100%)
 rename components/tabs/{ => src}/InkTabBar.vue (100%)
 rename components/tabs/{ => src}/InkTabBarMixin.js (100%)
 rename components/tabs/{ => src}/KeyCode.js (100%)
 rename components/tabs/{ => src}/ScrollableInkTabBar.vue (77%)
 rename components/tabs/{ => src}/ScrollableTabBar.vue (78%)
 rename components/tabs/{ => src}/ScrollableTabBarMixin.js (97%)
 rename components/tabs/{ => src}/TabBar.vue (69%)
 rename components/tabs/{ => src}/TabBarMixin.js (94%)
 rename components/tabs/{ => src}/TabContent.vue (100%)
 rename components/tabs/{ => src}/TabPane.vue (100%)
 rename components/tabs/{ => src}/Tabs.vue (91%)
 rename components/tabs/{ => src}/utils.js (100%)

diff --git a/components/tabs/index.js b/components/tabs/index.js
index 087cc67eb..b91a2b6fb 100644
--- a/components/tabs/index.js
+++ b/components/tabs/index.js
@@ -1,6 +1,6 @@
 import Tabs from './index.vue'
-import TabPane from './TabPane'
-import TabContent from './TabContent'
+import TabPane from './src/TabPane'
+import TabContent from './src/TabContent'
 Tabs.TabPane = TabPane
 export default Tabs
 export { TabPane, TabContent }
diff --git a/components/tabs/index.vue b/components/tabs/index.vue
index a4a82045c..aed9aa73b 100644
--- a/components/tabs/index.vue
+++ b/components/tabs/index.vue
@@ -1,5 +1,5 @@
 <script>
-import Tabs from './Tabs'
+import Tabs from './src/Tabs'
 import isFlexSupported from '../_util/isFlexSupported'
 import hasProp from '../_util/props-util'
 export default {
@@ -75,7 +75,6 @@ export default {
       tabPosition,
       tabBarStyle,
       hideAdd,
-      onTabClick,
       onPrevClick,
       onNextClick,
       animated,
@@ -114,36 +113,38 @@ export default {
       }
     })
     const tabBarProps = {
-      inkBarAnimated,
-      onTabClick,
-      onPrevClick,
-      onNextClick,
+      props: {
+        hideAdd,
+        removeTab: this.removeTab,
+        createNewTab: this.createNewTab,
+        inkBarAnimated,
+      },
+      on: {
+        // tabClick: onTabClick,
+        prevClick: onPrevClick,
+        nextClick: onNextClick,
+      },
       style: tabBarStyle,
-      hideAdd,
-      removeTab: this.removeTab,
-      createNewTab: this.createNewTab,
     }
     const tabContentProps = {
-      animated: tabPaneAnimated,
-      animatedWithMargin: true,
+      props: {
+        animated: tabPaneAnimated,
+        animatedWithMargin: true,
+      },
     }
-    const self = this
     const tabsProps = {
       props: {
         prefixCls,
         tabBarPosition: tabPosition,
-        onChange: this.handleChange,
         tabBarProps: tabBarProps,
         tabContentProps: tabContentProps,
         destroyInactiveTabPane,
         defaultActiveKey,
         type,
-        onTabClick: this.onTabClick,
       },
       on: {
-        change (val) {
-          self.handleChange(val)
-        },
+        change: this.handleChange,
+        tabClick: this.onTabClick,
       },
     }
     if (hasProp(this, 'activeKey')) {
diff --git a/components/tabs/index.zh-CN b/components/tabs/index.zh-CN.md
similarity index 100%
rename from components/tabs/index.zh-CN
rename to components/tabs/index.zh-CN.md
diff --git a/components/tabs/InkTabBar.vue b/components/tabs/src/InkTabBar.vue
similarity index 100%
rename from components/tabs/InkTabBar.vue
rename to components/tabs/src/InkTabBar.vue
diff --git a/components/tabs/InkTabBarMixin.js b/components/tabs/src/InkTabBarMixin.js
similarity index 100%
rename from components/tabs/InkTabBarMixin.js
rename to components/tabs/src/InkTabBarMixin.js
diff --git a/components/tabs/KeyCode.js b/components/tabs/src/KeyCode.js
similarity index 100%
rename from components/tabs/KeyCode.js
rename to components/tabs/src/KeyCode.js
diff --git a/components/tabs/ScrollableInkTabBar.vue b/components/tabs/src/ScrollableInkTabBar.vue
similarity index 77%
rename from components/tabs/ScrollableInkTabBar.vue
rename to components/tabs/src/ScrollableInkTabBar.vue
index f04450b9f..5a65407d0 100644
--- a/components/tabs/ScrollableInkTabBar.vue
+++ b/components/tabs/src/ScrollableInkTabBar.vue
@@ -2,10 +2,11 @@
 import InkTabBarMixin from './InkTabBarMixin'
 import ScrollableTabBarMixin from './ScrollableTabBarMixin'
 import TabBarMixin from './TabBarMixin'
+import BaseMixin from '../../_util/BaseMixin'
 
 export default {
   name: 'ScrollableInkTabBar',
-  mixins: [TabBarMixin, InkTabBarMixin, ScrollableTabBarMixin],
+  mixins: [TabBarMixin, InkTabBarMixin, ScrollableTabBarMixin, BaseMixin],
   render (h) {
     const inkBarNode = this.getInkBarNode()
     const tabs = this.getTabs(h)
diff --git a/components/tabs/ScrollableTabBar.vue b/components/tabs/src/ScrollableTabBar.vue
similarity index 78%
rename from components/tabs/ScrollableTabBar.vue
rename to components/tabs/src/ScrollableTabBar.vue
index 7abc2d748..7b38d9637 100644
--- a/components/tabs/ScrollableTabBar.vue
+++ b/components/tabs/src/ScrollableTabBar.vue
@@ -1,10 +1,11 @@
 <script>
 import ScrollableTabBarMixin from './ScrollableTabBarMixin'
 import TabBarMixin from './TabBarMixin'
+import BaseMixin from '../../_util/BaseMixin'
 
 export default {
   name: 'ScrollableTabBar',
-  mixins: [TabBarMixin, ScrollableTabBarMixin],
+  mixins: [TabBarMixin, ScrollableTabBarMixin, BaseMixin],
   render (h) {
     const inkBarNode = this.getInkBarNode()
     const tabs = this.getTabs(h)
diff --git a/components/tabs/ScrollableTabBarMixin.js b/components/tabs/src/ScrollableTabBarMixin.js
similarity index 97%
rename from components/tabs/ScrollableTabBarMixin.js
rename to components/tabs/src/ScrollableTabBarMixin.js
index 6df86318b..d872ad5aa 100644
--- a/components/tabs/ScrollableTabBarMixin.js
+++ b/components/tabs/src/ScrollableTabBarMixin.js
@@ -6,8 +6,6 @@ function noop () {
 export default {
   props: {
     scrollAnimated: { type: Boolean, default: true },
-    onPrevClick: { type: Function, default: noop },
-    onNextClick: { type: Function, default: noop },
   },
 
   data () {
@@ -201,7 +199,7 @@ export default {
     },
 
     prevClick (e) {
-      this.$props.onPrevClick(e)
+      this.__emit('prevClick', e)
       const navWrapNode = this.$refs.navWrap
       const navWrapNodeWH = this.getOffsetWH(navWrapNode)
       const { offset } = this
@@ -209,7 +207,7 @@ export default {
     },
 
     nextClick (e) {
-      this.$props.onNextClick(e)
+      this.__emit('nextClick', e)
       const navWrapNode = this.$refs.navWrap
       const navWrapNodeWH = this.getOffsetWH(navWrapNode)
       const { offset } = this
diff --git a/components/tabs/TabBar.vue b/components/tabs/src/TabBar.vue
similarity index 69%
rename from components/tabs/TabBar.vue
rename to components/tabs/src/TabBar.vue
index 423f97cc7..8e65f6a7d 100644
--- a/components/tabs/TabBar.vue
+++ b/components/tabs/src/TabBar.vue
@@ -1,9 +1,8 @@
 <script>
 import TabBarMixin from './TabBarMixin'
-function noop () {
-}
+import BaseMixin from '../../_util/BaseMixin'
 export default {
-  mixins: [TabBarMixin],
+  mixins: [TabBarMixin, BaseMixin],
   name: 'TabBar',
   props: {
     prefixCls: {
@@ -15,14 +14,6 @@ export default {
       type: String,
     },
     disabled: Boolean,
-    onKeyDown: {
-      default: noop,
-      type: Function,
-    },
-    onTabClick: {
-      default: noop,
-      type: Function,
-    },
     activeKey: String,
     panels: Array,
   },
diff --git a/components/tabs/TabBarMixin.js b/components/tabs/src/TabBarMixin.js
similarity index 94%
rename from components/tabs/TabBarMixin.js
rename to components/tabs/src/TabBarMixin.js
index 5ebb0028d..56fc9b9cb 100644
--- a/components/tabs/TabBarMixin.js
+++ b/components/tabs/src/TabBarMixin.js
@@ -1,4 +1,4 @@
-import Icon from '../icon'
+import Icon from '../../icon'
 function noop () {
 }
 export default {
@@ -12,14 +12,6 @@ export default {
       type: String,
     },
     disabled: Boolean,
-    onKeyDown: {
-      default: noop,
-      type: Function,
-    },
-    onTabClick: {
-      default: noop,
-      type: Function,
-    },
     activeKey: String,
     panels: Array,
     hideAdd: Boolean,
@@ -51,7 +43,7 @@ export default {
         } else {
         }
         const onClick = () => {
-          !disabled && this.onTabClick(tabKey)
+          !disabled && this.__emit('tabClick', tabKey)
         }
 
         let tabC = typeof tab === 'function' ? child.tab(h, tabKey) : tab
@@ -86,6 +78,9 @@ export default {
 
       return rst
     },
+    onKeyDown (e) {
+      this.__emit('keydown', e)
+    },
     getRootNode (contents, createElement) {
       const {
         prefixCls, onKeyDown, tabBarPosition, hideAdd,
diff --git a/components/tabs/TabContent.vue b/components/tabs/src/TabContent.vue
similarity index 100%
rename from components/tabs/TabContent.vue
rename to components/tabs/src/TabContent.vue
diff --git a/components/tabs/TabPane.vue b/components/tabs/src/TabPane.vue
similarity index 100%
rename from components/tabs/TabPane.vue
rename to components/tabs/src/TabPane.vue
diff --git a/components/tabs/Tabs.vue b/components/tabs/src/Tabs.vue
similarity index 91%
rename from components/tabs/Tabs.vue
rename to components/tabs/src/Tabs.vue
index 5690a3e08..babb0f479 100644
--- a/components/tabs/Tabs.vue
+++ b/components/tabs/src/Tabs.vue
@@ -1,9 +1,10 @@
 <script>
-import Icon from '../icon'
+import Icon from '../../icon'
 import KeyCode from './KeyCode'
 import TabContent from './TabContent'
 import ScrollableInkTabBar from './ScrollableInkTabBar'
-import hasProp from '../_util/props-util'
+import hasProp from '../../_util/props-util'
+import BaseMixin from '../../_util/BaseMixin'
 function getDefaultActiveKey (t) {
   let activeKey
   t.$slots.default && t.$slots.default.forEach(({ componentOptions = {}, key: tabKey }) => {
@@ -23,8 +24,7 @@ function activeKeyIsValid (t, key) {
   })
   return key !== undefined && keys.indexOf(key) >= 0
 }
-function noop () {
-}
+
 export default {
   name: 'Tabs',
   components: { Icon },
@@ -32,6 +32,7 @@ export default {
     prop: 'activeKey',
     event: 'change',
   },
+  mixins: [BaseMixin],
   props: {
     prefixCls: {
       default: 'ant-tabs',
@@ -53,8 +54,6 @@ export default {
         return ['line', 'card', 'editable-card'].includes(value)
       },
     },
-    onChange: { type: Function, default: noop },
-    onTabClick: { type: Function, default: noop },
   },
   data () {
     return {
@@ -90,7 +89,7 @@ export default {
       return activeKey
     },
     handleTabClick (activeKey) {
-      this.onTabClick(activeKey)
+      this.__emit('tabClick', activeKey)
       this.setActiveKey(activeKey)
     },
 
@@ -112,7 +111,7 @@ export default {
         if (!hasProp(this, 'activeKey')) {
           this.stateActiveKey = activeKey
         }
-        this.onChange(activeKey)
+        this.__emit('change', activeKey)
       }
     },
 
@@ -172,25 +171,31 @@ export default {
     })
     const tabContentProps = {
       props: {
-        ...this.tabContentProps,
+        ...this.tabContentProps.props,
         prefixCls,
         tabBarPosition,
         activeKey: stateActiveKey,
         destroyInactiveTabPane,
-        onChange: setActiveKey,
+        // onChange: setActiveKey,
+      },
+      on: {
+        change: setActiveKey,
       },
     }
     const tabBarProps = {
       props: {
-        ...this.tabBarProps,
+        ...this.tabBarProps.props,
         panels: panels,
         prefixCls: prefixCls,
-        onKeyDown: onNavKeyDown,
         tabBarPosition: tabBarPosition,
-        onTabClick: handleTabClick,
         activeKey: stateActiveKey,
       },
       style: this.tabBarProps.style || {},
+      on: {
+        ...this.tabBarProps.on,
+        keydown: onNavKeyDown,
+        tabClick: handleTabClick,
+      },
     }
     const contents = [
       <ScrollableInkTabBar
diff --git a/components/tabs/utils.js b/components/tabs/src/utils.js
similarity index 100%
rename from components/tabs/utils.js
rename to components/tabs/src/utils.js