github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Message: fix message[type] (#21088)

pull/21185/head
好多大米 2021-07-23 17:22:18 +08:00 committed by GitHub
parent 09e789bad2
commit 1ef72a3283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/message/src/main.js
View File

@ -2,6 +2,7 @@ import Vue from 'vue';
import Main from './main.vue'; import Main from './main.vue';
import { PopupManager } from 'element-ui/src/utils/popup'; import { PopupManager } from 'element-ui/src/utils/popup';
import { isVNode } from 'element-ui/src/utils/vdom'; import { isVNode } from 'element-ui/src/utils/vdom';
import { isObject } from 'element-ui/src/utils/types';
let MessageConstructor = Vue.extend(Main); let MessageConstructor = Vue.extend(Main);
let instance; let instance;
@ -44,14 +45,17 @@ const Message = function(options) {
}; };
['success', 'warning', 'info', 'error'].forEach(type => { ['success', 'warning', 'info', 'error'].forEach(type => {
Message[type] = options => { Message[type] = (options) => {
if (typeof options === 'string') { if (isObject(options) && !isVNode(options)) {
options = { return Message({
message: options ...options,
}; type
});
} }
options.type = type; return Message({
return Message(options); type,
message: options
});
}; };
}); });