Table/MessageBox/Tree: remove object-assign

This commit is contained in:
qingwei.li
2016-11-04 18:44:19 +08:00
parent 9f945ad782
commit 4a224adaa3
5 changed files with 20 additions and 22 deletions

View File

@@ -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
});

View File

@@ -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;

View File

@@ -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;