|
@@ -5,6 +5,7 @@ let ToastConstructor = Vue.extend(settings);
|
|
|
let instance;
|
|
let instance;
|
|
|
let instanceArr = [];
|
|
let instanceArr = [];
|
|
|
let defaultOptionsMap = {};
|
|
let defaultOptionsMap = {};
|
|
|
|
|
+const id = '0';
|
|
|
const defaultOptions = {
|
|
const defaultOptions = {
|
|
|
msg: '',
|
|
msg: '',
|
|
|
visible: false,
|
|
visible: false,
|
|
@@ -39,10 +40,8 @@ function _showToast() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function _getInstance(obj) {
|
|
function _getInstance(obj) {
|
|
|
- let opt = {id: '0'};
|
|
|
|
|
|
|
+ let opt = {id};
|
|
|
Object.assign(opt,currentOptions,defaultOptionsMap[obj.type],obj)
|
|
Object.assign(opt,currentOptions,defaultOptionsMap[obj.type],obj)
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
//有相同id者共用一个实例,否则新增实例
|
|
//有相同id者共用一个实例,否则新增实例
|
|
|
if (opt['id'] && instanceArr[opt['id']]) {
|
|
if (opt['id'] && instanceArr[opt['id']]) {
|
|
|
instance = instanceArr[opt['id']];
|
|
instance = instanceArr[opt['id']];
|
|
@@ -84,7 +83,7 @@ let Toast = {
|
|
|
return _getInstance({ ...obj, msg, type: 'warn' });
|
|
return _getInstance({ ...obj, msg, type: 'warn' });
|
|
|
},
|
|
},
|
|
|
loading(msg, obj = {}) {
|
|
loading(msg, obj = {}) {
|
|
|
- obj = { ...obj, id: obj.id || 'loading', msg, type: 'loading' };
|
|
|
|
|
|
|
+ obj = { ...obj, id: obj.id|| id , msg, type: 'loading' };
|
|
|
obj.cover = typeof obj.cover !== 'undefined' ? obj.cover : true; //loading类型默认打开遮罩层
|
|
obj.cover = typeof obj.cover !== 'undefined' ? obj.cover : true; //loading类型默认打开遮罩层
|
|
|
obj.duration = obj.duration || 0; //loading类型默认不自动关闭
|
|
obj.duration = obj.duration || 0; //loading类型默认不自动关闭
|
|
|
return _getInstance(obj);
|
|
return _getInstance(obj);
|