diff --git a/package.json b/package.json index cd2f4fdc8..01c83cd5b 100644 --- a/package.json +++ b/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" diff --git a/packages/message-box/src/main.js b/packages/message-box/src/main.js index 86944d1b3..0a2de1ecd 100644 --- a/packages/message-box/src/main.js +++ b/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 }); diff --git a/packages/table/src/table-column.js b/packages/table/src/table-column.js index 8982b3bfd..22f75b376 100644 --- a/packages/table/src/table-column.js +++ b/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; diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js index 672dff994..071483a87 100644 --- a/packages/tree/src/model/node.js +++ b/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; diff --git a/src/utils/merge.js b/src/utils/merge.js new file mode 100644 index 000000000..4ad7f9111 --- /dev/null +++ b/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; +};