bkui-vue 0.0.1-beta.450 → 0.0.1-beta.452

package/dist/index.esm.js

@@ -5811,12 +5811,13 @@ class BkMaskManager {
     };
     this.isInit = false;
     this.maskAttrTag = "auto";
-    const { multiInstance = false, maskAttrTag = "auto", parentNode = document.body, maskStyle = {}, onClick = null } = config || {};
+    const { multiInstance = false, maskAttrTag = "auto", parentNode = document.body, maskStyle = {}, onClick = null, popInstance = null } = config || {};
     this.parentNode = parentNode || document;
     this.maskAttrTag = maskAttrTag;
     this.onClick = onClick;
     this.activeInstance = void 0;
     this.multiInstance = multiInstance;
+    this.popInstance = popInstance;
     this.uniqueMaskAttrTag = this.getMaskAttrTag(maskAttrTag);
     bkMaskMaker.appendMaker(() => {
       this.initInstance(maskStyle);
@@ -5853,6 +5854,7 @@ class BkMaskManager {
       "pointer-events": "all"
     });
     this.initInstance(style2);
+    this.catchClickEvent();
     this.setMaskStyle(style2);
     bkMaskMaker.pushMaskStyle(this.parentNode, __spreadValues({}, style2));
     this.backupMask.style.setProperty("z-index", `${localZIndex - 1}`);
@@ -5874,6 +5876,7 @@ class BkMaskManager {
       content == null ? void 0 : content.remove();
       (_a = this.activeInstance) == null ? void 0 : _a.remove();
     }
+    this.removeClickEvent();
     this.activeInstance = void 0;
     this.popIndexStore(uid);
     const maskList = bkMaskMaker.getMaskStyles(this.parentNode);
@@ -5928,19 +5931,29 @@ class BkMaskManager {
     if (!div) {
       isExist = false;
       div = this.createMask();
-      div.addEventListener("click", (e) => {
-        if (e.target === div) {
-          if (typeof this.onClick === "function") {
-            Reflect.apply(this.onClick, this, [e]);
-          }
-        }
-      }, true);
     }
     return {
       instance: div,
       isExist
     };
   }
+  catchClickEvent() {
+    if (this.mask) {
+      this.mask.addEventListener("click", (e) => this.handleMaskClick(e), true);
+    }
+  }
+  removeClickEvent() {
+    if (this.mask) {
+      this.mask.removeEventListener("click", this.handleMaskClick);
+    }
+  }
+  handleMaskClick(e) {
+    if (e.target === this.mask) {
+      if (typeof this.onClick === "function") {
+        Reflect.apply(this.onClick, this.popInstance || this, [e]);
+      }
+    }
+  }
   getBackupMask() {
     const attrName = "data-bk-backup-uid";
     let div = this.parentNode.querySelector(`[${attrName}]`);
@@ -5976,21 +5989,13 @@ class BkMaskManager {
 new BkMaskManager({});
 class BKPopIndexManager {
   constructor(options) {
-    this.getActiveClickFnIndex = (match2) => {
-      const filterFn = (target) => typeof match2 === "string" ? target.getAttribute(this.uuidAttrName) === match2 : target === match2;
-      return this.clickFn.findIndex(({ target }) => filterFn(target));
-    };
-    this.getActiveClickFn = (match2) => {
-      var _a;
-      return (_a = this.clickFn[this.getActiveClickFnIndex(match2)]) == null ? void 0 : _a.fn;
-    };
     this.popInstanceList = [];
-    this.clickFn = [];
+    this.clickFn = void 0;
     this.uuidAttrName = "data-bk-pop-uuid";
-    this.activePopId = null;
     this.bKMaskManagerInstance = new BkMaskManager({
       parentNode: this.getParentNode(options == null ? void 0 : options.transfer),
-      onClick: this.onMaskClickFn.bind(this)
+      popInstance: this,
+      onClick: this.onMaskClickFn
     });
   }
   getParentNode(transfer2) {
@@ -6006,7 +6011,7 @@ class BKPopIndexManager {
     return document.body;
   }
   onMaskClick(callFn, target) {
-    this.clickFn.push({ fn: callFn, target });
+    this.clickFn = { fn: callFn, target };
   }
   show(content, showMask = true, appendStyle = {}, transfer2 = false, zindex = void 0) {
     if (!content) {
@@ -6019,14 +6024,9 @@ class BKPopIndexManager {
     this.popInstanceList.push({ uuid: uuid2, zIndex, content, showMask, appendStyle });
     showMask && this.bKMaskManagerInstance.backupActiveInstance();
     this.bKMaskManagerInstance.show(content, zIndex, showMask, appendStyle, uuid2, transfer2);
-    this.activePopId = uuid2;
   }
   destroy(content, transfer2 = false) {
-    var _a;
-    const index2 = this.getActiveClickFnIndex(content);
-    if (index2 >= 0) {
-      (_a = this.clickFn) == null ? void 0 : _a.splice(index2, 1);
-    }
+    this.clickFn = void 0;
     this.hide(content, transfer2);
   }
   popHide(removeLastContent = true) {
@@ -6035,17 +6035,13 @@ class BKPopIndexManager {
         const lastItem = this.popInstanceList.pop();
         this.bKMaskManagerInstance.popIndexStore(lastItem.uuid);
         lastItem.remove();
-        this.activePopId = null;
       }
       if (this.popInstanceList.length) {
         const activeItem = this.popInstanceList.slice(-1)[0];
         const { zIndex, content, showMask, appendStyle, uuid: uuid2 } = activeItem;
         this.bKMaskManagerInstance.show(content, zIndex, showMask, appendStyle, uuid2);
-        this.activePopId = uuid2;
       } else {
         this.bKMaskManagerInstance.hide();
-        this.activePopId = null;
-        this.clickFn.length = 0;
       }
     }
   }
@@ -6060,8 +6056,6 @@ class BKPopIndexManager {
         this.bKMaskManagerInstance.popIndexStore(uuid2);
         if (!this.popInstanceList.length) {
           this.bKMaskManagerInstance.hide(transfer2);
-          this.activePopId = null;
-          this.clickFn.length = 0;
         } else {
           this.popHide(false);
         }
@@ -6071,7 +6065,7 @@ class BKPopIndexManager {
     }
   }
   onMaskClickFn(e) {
-    const fn2 = this.getActiveClickFn(this.activePopId);
+    const { fn: fn2 } = this.clickFn;
     if (fn2) {
       Reflect.apply(fn2, this, [e]);
     }
@@ -11157,7 +11151,7 @@ var Component$u = defineComponent({
     return {
       visible: false,
       closeTimer: null,
-      bkPopIndexManager: new BKPopIndexManager(__spreadValues({}, this.$props))
+      bkPopIndexManager: null
     };
   },
   computed: {
@@ -11224,6 +11218,13 @@ var Component$u = defineComponent({
   },
   created() {
   },
+  mounted() {
+    var _a;
+    const popConfig = __spreadValues(__spreadValues({}, this.$props), {
+      transfer: this.transfer === "parent" ? (_a = this.$el) == null ? void 0 : _a.parentElement : this.transfer
+    });
+    this.bkPopIndexManager = new BKPopIndexManager(popConfig);
+  },
   beforeUnmount() {
     var _a, _b;
     if (this.visible) {