Merge pull request #832 from QingWei-Li/fix/object-assign

Table/MessageBox/Tree: remove object-assign

package.json

@@ -40,8 +40,6 @@
   },
   "dependencies": {
     "async-validator": "^1.6.6",
-    "object-assign": "^4.1.0",
-    "object-equal": "^1.0.0",
     "throttle-debounce": "^1.0.1",
     "vue-popup": "^0.2.9",
     "wind-dom": "0.0.3"

packages/message-box/src/main.js

@@ -30,22 +30,7 @@ const defaults = {
 
 import Vue from 'vue';
 import msgboxVue from './main.vue';
-
-const merge = function(target) {
-  for (let i = 1, j = arguments.length; i < j; i++) {
-    let source = arguments[i];
-    for (let prop in source) {
-      if (source.hasOwnProperty(prop)) {
-        let value = source[prop];
-        if (value !== undefined) {
-          target[prop] = value;
-        }
-      }
-    }
-  }
-
-  return target;
-};
+import merge from 'element-ui/src/utils/merge';
 
 const MessageBoxConstructor = Vue.extend(msgboxVue);
 
@@ -139,7 +124,7 @@ const MessageBox = function(options, callback) {
   if (typeof Promise !== 'undefined') {
     return new Promise((resolve, reject) => { // eslint-disable-line
       msgQueue.push({
-        options: merge({}, defaults, MessageBox.defaults || {}, options),
+        options: merge({}, defaults, MessageBox.defaults, options),
         callback: callback,
         resolve: resolve,
         reject: reject
@@ -149,7 +134,7 @@ const MessageBox = function(options, callback) {
     });
   } else {
     msgQueue.push({
-      options: merge({}, defaults, MessageBox.defaults || {}, options),
+      options: merge({}, defaults, MessageBox.defaults, options),
       callback: callback
     });
 

packages/table/src/table-column.js

@@ -1,6 +1,6 @@
 import ElCheckbox from 'element-ui/packages/checkbox';
 import ElTag from 'element-ui/packages/tag';
-import objectAssign from 'object-assign';
+import objectAssign from 'element-ui/src/utils/merge';
 
 let columnIdSeed = 1;
 

packages/tree/src/model/node.js

@@ -1,5 +1,5 @@
 let nodeIdSeed = 0;
-import objectAssign from 'object-assign';
+import objectAssign from 'element-ui/src/utils/merge';
 
 const reInitChecked = function(node) {
   const siblings = node.childNodes;

src/utils/merge.js

@@ -0,0 +1,15 @@
+export default function(target) {
+  for (let i = 1, j = arguments.length; i < j; i++) {
+    let source = arguments[i] || {};
+    for (let prop in source) {
+      if (source.hasOwnProperty(prop)) {
+        let value = source[prop];
+        if (value !== undefined) {
+          target[prop] = value;
+        }
+      }
+    }
+  }
+
+  return target;
+};