From d15efd756e8b999253e1df2a1e3ba2cb039caa19 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Sat, 19 May 2018 18:43:44 +0800
Subject: [PATCH] [Improvement] optimize isDef (#1109)

---
 packages/badge/index.vue         | 3 ---
 packages/card/index.vue          | 5 -----
 packages/cell/index.vue          | 3 ---
 packages/checkbox/index.vue      | 3 +--
 packages/collapse-item/index.vue | 3 +--
 packages/icon/index.vue          | 5 -----
 packages/tabbar-item/index.vue   | 3 ---
 packages/toast/toast.vue         | 5 -----
 packages/utils/create-basic.js   | 3 +++
 9 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/packages/badge/index.vue b/packages/badge/index.vue
index d0d122ad0..b8455066b 100644
--- a/packages/badge/index.vue
+++ b/packages/badge/index.vue
@@ -11,7 +11,6 @@
 
 <script>
 import create from '../utils/create';
-import { isDef } from '../utils';
 
 export default create({
   name: 'badge',
@@ -33,8 +32,6 @@ export default create({
   },
 
   methods: {
-    isDef,
-
     onClick() {
       this.$emit('click', this.$parent.badges.indexOf(this));
     }
diff --git a/packages/card/index.vue b/packages/card/index.vue
index b7b73ffb6..4f99ce234 100644
--- a/packages/card/index.vue
+++ b/packages/card/index.vue
@@ -27,7 +27,6 @@
 </template>
 
 <script>
-import { isDef } from '../utils';
 import create from '../utils/create';
 
 export default create({
@@ -44,10 +43,6 @@ export default create({
       type: String,
       default: '¥'
     }
-  },
-
-  methods: {
-    isDef
   }
 });
 </script>
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index 21e952ca9..ed6df3275 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -36,7 +36,6 @@
 
 <script>
 import Icon from '../icon';
-import { isDef } from '../utils';
 import RouterLink from '../mixins/router-link';
 import create from '../utils/create-basic';
 
@@ -65,8 +64,6 @@ export default create({
   },
 
   methods: {
-    isDef,
-
     onClick() {
       this.$emit('click');
       this.routerLink();
diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 834acc99b..7fbd95ad1 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -18,7 +18,6 @@
 
 <script>
 import create from '../utils/create';
-import { isDef } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
@@ -79,7 +78,7 @@ export default create({
       const { currentValue } = this;
       if ({}.toString.call(currentValue) === '[object Boolean]') {
         return currentValue;
-      } else if (isDef(currentValue)) {
+      } else if (this.isDef(currentValue)) {
         return currentValue === this.name;
       }
     },
diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue
index 1572837dd..ac9276c05 100644
--- a/packages/collapse-item/index.vue
+++ b/packages/collapse-item/index.vue
@@ -17,7 +17,6 @@
 <script>
 import findParent from '../mixins/find-parent';
 import create from '../utils/create';
-import { isDef } from '../utils';
 
 export default create({
   name: 'collapse-item',
@@ -39,7 +38,7 @@ export default create({
     },
 
     currentName() {
-      return isDef(this.name) ? this.name : this.index;
+      return this.isDef(this.name) ? this.name : this.index;
     },
 
     expanded() {
diff --git a/packages/icon/index.vue b/packages/icon/index.vue
index a38e947b2..4cbc3312d 100644
--- a/packages/icon/index.vue
+++ b/packages/icon/index.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import { isDef } from '../utils';
 import create from '../utils/create-basic';
 
 export default create({
@@ -16,10 +15,6 @@ export default create({
     name: String,
     info: [String, Number],
     color: String
-  },
-
-  methods: {
-    isDef
   }
 });
 </script>
diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index 259e9eafd..e6bfcbc47 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -13,7 +13,6 @@
 </template>
 
 <script>
-import { isDef } from '../utils';
 import create from '../utils/create';
 import RouterLink from '../mixins/router-link';
 
@@ -43,8 +42,6 @@ export default create({
   },
 
   methods: {
-    isDef,
-
     onClick(event) {
       this.$parent.onChange(this.$parent.items.indexOf(this));
       this.$emit('click', event);
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index 354a3b1be..86ff81310 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -18,7 +18,6 @@
 <script>
 import create from '../utils/create';
 import Popup from '../mixins/popup';
-import { isDef } from '../utils';
 
 const STYLE_LIST = ['success', 'fail', 'loading'];
 
@@ -51,10 +50,6 @@ export default create({
     displayStyle() {
       return STYLE_LIST.indexOf(this.type) !== -1 ? 'default' : this.type;
     }
-  },
-
-  methods: {
-    isDef
   }
 });
 </script>
diff --git a/packages/utils/create-basic.js b/packages/utils/create-basic.js
index 490fb654b..1d5ff155a 100644
--- a/packages/utils/create-basic.js
+++ b/packages/utils/create-basic.js
@@ -4,6 +4,7 @@
 import '../locale';
 import bem from '../mixins/bem';
 import i18n from '../mixins/i18n';
+import { isDef } from './';
 
 const install = function(Vue) {
   Vue.component(this.name, this);
@@ -14,6 +15,8 @@ export default function(sfc) {
   sfc.install = sfc.install || install;
   sfc.mixins = sfc.mixins || [];
   sfc.mixins.push(i18n, bem);
+  sfc.methods = sfc.methods || {};
+  sfc.methods.isDef = isDef;
 
   return sfc;
 };