From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/layer/src/layer.js | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/src/components/layer/src/layer.js b/src/components/layer/src/layer.js
index 2d2db28..6620ed9 100644
--- a/src/components/layer/src/layer.js
+++ b/src/components/layer/src/layer.js
@@ -20,16 +20,12 @@
* @return {[type]} [description]
*/
self.open = function (opt) {
- /* let option = {
- type: 1,
- content: opt.content,
- area: opt.area
- } */
+ self.closeAll()
var options = mergeJson(opt, defOptions)
const id = `notification_${new Date().getTime()}_${seed++}`
options.id = id
options.layer = self
- options.content.content = Vue.extend(options.content.content)
+ options.content.comp = Vue.extend(options.content.comp)
const instance = new LayerVueExtend({
data: options
})
@@ -55,7 +51,6 @@
* @return {[type]} [description]
*/
self.close = function (id) {
- console.log(id)
const oElm = document.getElementById(id).parentElement
if (oElm) {
document.body.removeChild(oElm)
@@ -111,22 +106,9 @@
* @param {[type]} id [description]
* @return {[type]} [description]
*/
- self.closeAll = function (type = -1) {
- const types = {
- page: 0,
- iframe: 1
- }
- if (type === -1) {
- for (const k in self.instances) {
- self.close(k)
- }
- } else {
- const targetType = types[type]
- for (const k in self.instances) {
- if (self.instances[k].type === targetType) {
- self.close(k)
- }
- }
+ self.closeAll = function () {
+ for (const k in self.instances) {
+ self.close(k)
}
}
/**
--
Gitblit v1.8.0