From 92b116c071525185347107f39bc809f8f3d5d837 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 2 Mar 2018 14:39:26 +0800
Subject: [PATCH] [Improvement] optimize utils (#661)

---
 docs/src/doc.config.js           | 16 ++++++++--------
 packages/area/index.vue          |  4 ++--
 packages/picker/PickerColumn.vue |  6 +++---
 packages/toast/index.js          |  3 ++-
 packages/utils/create.js         |  4 ++--
 packages/utils/deep-assign.js    |  7 +------
 packages/utils/index.js          |  6 ++++++
 7 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index c268f5564..1cad7cce2 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -128,10 +128,6 @@ module.exports = {
                 path: '/progress',
                 title: 'Progress - 进度条'
               },
-              {
-                path: '/search',
-                title: 'Search - 搜索'
-              },
               {
                 path: '/stepper',
                 title: 'Stepper - 步进器'
@@ -185,6 +181,10 @@ module.exports = {
                 path: '/radio',
                 title: 'Radio - 单选框'
               },
+              {
+                path: '/search',
+                title: 'Search - 搜索'
+              },
               {
                 path: '/switch',
                 title: 'Switch - 开关'
@@ -414,10 +414,6 @@ module.exports = {
                 path: '/progress',
                 title: 'Progress'
               },
-              {
-                path: '/search',
-                title: 'Search'
-              },
               {
                 path: '/stepper',
                 title: 'Stepper'
@@ -471,6 +467,10 @@ module.exports = {
                 path: '/radio',
                 title: 'Radio'
               },
+              {
+                path: '/search',
+                title: 'Search'
+              },
               {
                 path: '/switch',
                 title: 'Switch'
diff --git a/packages/area/index.vue b/packages/area/index.vue
index 5a85a7b17..1a0f8983b 100644
--- a/packages/area/index.vue
+++ b/packages/area/index.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import { create, isObj } from '../utils';
 import Picker from '../picker';
 
 export default create({
@@ -42,7 +42,7 @@ export default create({
 
   computed: {
     listValid() {
-      return this.areaList && typeof this.areaList.province_list === 'object';
+      return this.areaList && isObj(this.areaList.province_list);
     },
 
     columns() {
diff --git a/packages/picker/PickerColumn.vue b/packages/picker/PickerColumn.vue
index 3ea162359..5ddae8406 100644
--- a/packages/picker/PickerColumn.vue
+++ b/packages/picker/PickerColumn.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import { create, isObj } from '../utils';
 
 const DEFAULT_DURATION = 200;
 const range = (num, arr) => Math.min(Math.max(num, arr[0]), arr[1]);
@@ -147,11 +147,11 @@ export default create({
     },
 
     isDisabled(option) {
-      return typeof option === 'object' && option.disabled;
+      return isObj(option) && option.disabled;
     },
 
     getOptionText(option) {
-      return typeof option === 'object' && this.valueKey in option ? option[this.valueKey] : option;
+      return isObj(option) && this.valueKey in option ? option[this.valueKey] : option;
     },
 
     setIndex(index, userAction) {
diff --git a/packages/toast/index.js b/packages/toast/index.js
index 9938fd87d..8df3e940d 100644
--- a/packages/toast/index.js
+++ b/packages/toast/index.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import VueToast from './toast';
+import { isObj } from '../utils';
 
 const defaultOptions = {
   type: 'text',
@@ -10,7 +11,7 @@ const defaultOptions = {
   position: 'middle',
   forbidClick: false
 };
-const parseOptions = message => typeof message === 'object' ? message : { message };
+const parseOptions = message => isObj(message) ? message : { message };
 
 let queue = [];
 let singleton = true;
diff --git a/packages/utils/create.js b/packages/utils/create.js
index 1bd3241cb..983e1b073 100644
--- a/packages/utils/create.js
+++ b/packages/utils/create.js
@@ -8,10 +8,10 @@ import install from './install';
 import Loading from '../loading';
 
 export default function(sfc) {
-  sfc.mixins = sfc.mixins || [];
-  sfc.components = sfc.components || {};
   sfc.install = sfc.install || install;
+  sfc.mixins = sfc.mixins || [];
   sfc.mixins.push(i18n);
+  sfc.components = sfc.components || {};
   sfc.components.icon = Icon;
   sfc.components.loading = Loading;
 
diff --git a/packages/utils/deep-assign.js b/packages/utils/deep-assign.js
index 133cd2c00..4c128d87e 100644
--- a/packages/utils/deep-assign.js
+++ b/packages/utils/deep-assign.js
@@ -1,12 +1,7 @@
-import { isDef } from './';
+import { isDef, isObj } from './';
 
 const { hasOwnProperty } = Object.prototype;
 
-function isObj(x) {
-  const type = typeof x;
-  return x !== null && (type === 'object' || type === 'function');
-}
-
 function assignKey(to, from, key) {
   const val = from[key];
 
diff --git a/packages/utils/index.js b/packages/utils/index.js
index c8cbe5847..3195fdbac 100644
--- a/packages/utils/index.js
+++ b/packages/utils/index.js
@@ -7,6 +7,11 @@ function isDef(value) {
   return value !== undefined && value !== null;
 }
 
+function isObj(x) {
+  const type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
 function get(object, path) {
   const keys = path.split('.');
   let result = object;
@@ -30,6 +35,7 @@ function isAndroid() {
 
 export {
   get,
+  isObj,
   isDef,
   create,
   isServer,