bkui-vue 0.0.2-beta.17 → 0.0.2-beta.18

package/dist/index.cjs.source.js

@@ -5857,6 +5857,21 @@ class BKZIndexManager {
 }
 const bkZIndexManager = new BKZIndexManager();
 `__bk_mask_${random(16)}`;
+const MaskEventMap = /* @__PURE__ */ new WeakMap();
+const getMaskEvent = (mask) => {
+  if (MaskEventMap.has(mask)) {
+    return MaskEventMap.get(mask);
+  }
+  return [];
+};
+const setMaskEvent = (mask, event, args, content, instanceId) => {
+  const maskEvent = getMaskEvent(mask);
+  if (maskEvent.some((evet) => evet.instanceId === instanceId)) {
+    return;
+  }
+  maskEvent.push({ event, args, content, instanceId });
+  MaskEventMap.set(mask, maskEvent);
+};
 class MaskQueueMaker {
   constructor() {
     __publicField(this, "timer", null);
@@ -5940,26 +5955,30 @@ class BkMaskManager {
       display: "none",
       "background-color": "rgba(0,0,0,.6)"
     });
-    __publicField(this, "onClick");
     // 用于判定是否已经初始化过当前实例
     __publicField(this, "isInit", false);
     __publicField(this, "maskAttrTag", "auto");
-    __publicField(this, "popInstance");
-    const { multiInstance = false, maskAttrTag = "auto", parentNode = document.body, maskStyle = {}, onClick = null, popInstance = null } = config || {};
+    const {
+      multiInstance = false,
+      maskAttrTag = "auto",
+      parentNode = document.body,
+      maskStyle = {}
+    } = 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);
     });
   }
   setOption(option) {
-    const { parentNode = document.body, maskStyle = {}, onClick = null, maskAttrTag = this.maskAttrTag } = option || {};
-    this.onClick = onClick;
+    const {
+      parentNode = document.body,
+      maskStyle = {},
+      maskAttrTag = this.maskAttrTag
+    } = option || {};
     this.parentNode = parentNode || document;
     this.setMaskStyle(Object.assign({}, this.maskStyle, maskStyle));
     this.uniqueMaskAttrTag = this.getMaskAttrTag(maskAttrTag);
@@ -5972,7 +5991,7 @@ class BkMaskManager {
    * @param appendStyle 追加样式
    * @param transfer 是否显示将内容加入遮罩下
    */
-  show(content, zIndex, showMask = true, appendStyle = {}, uuid2 = null, transfer2 = false) {
+  show(content, zIndex, showMask = true, appendStyle = {}, uuid2 = null, transfer2 = false, onMaskClick, instanceId) {
     const uid = uuid2 ?? random(16);
     const localZIndex = /-?\d+/.test(`${zIndex}`) ? zIndex : bkZIndexManager.getModalNextIndex();
     let style2 = Object.assign({}, this.maskStyle, appendStyle || {});
@@ -5996,7 +6015,9 @@ class BkMaskManager {
       "pointer-events": "all"
     });
     this.initInstance(style2);
-    this.catchClickEvent();
+    if (onMaskClick) {
+      this.catchClickEvent(content, onMaskClick, instanceId);
+    }
     this.setMaskStyle(style2);
     bkMaskMaker.pushMaskStyle(this.parentNode, { ...style2 });
     this.backupMask.style.setProperty("z-index", `${localZIndex - 1}`);
@@ -6053,11 +6074,14 @@ class BkMaskManager {
     }
   }
   backupContentElement(content) {
-    content && this.backupMask.append(content);
+    var _a;
+    content && ((_a = this.backupMask) == null ? void 0 : _a.append(content));
   }
   getActiveContentInstance() {
     return this.activeInstance;
   }
+  removeClickEvent() {
+  }
   initInstance(maskStyle) {
     if (!this.isInit) {
       this.isInit = true;
@@ -6080,26 +6104,31 @@ class BkMaskManager {
     if (!div) {
       isExist = false;
       div = this.createMask();
+      div.addEventListener(
+        "click",
+        (e3) => this.handleMaskClick(e3),
+        true
+      );
     }
     return {
       instance: div,
       isExist
     };
   }
-  catchClickEvent() {
+  catchClickEvent(content, onMaskClick, instanceId) {
     if (this.mask) {
-      this.mask.addEventListener("click", (e3) => this.handleMaskClick(e3), true);
-    }
-  }
-  removeClickEvent() {
-    if (this.mask) {
-      this.mask.removeEventListener("click", this.handleMaskClick);
+      setMaskEvent(this.mask, onMaskClick, [], content, instanceId);
     }
   }
   handleMaskClick(e3) {
-    if (e3.target === this.mask) {
-      if (typeof this.onClick === "function") {
-        Reflect.apply(this.onClick, this.popInstance || this, [e3]);
+    if (e3.target !== this.mask) {
+      return;
+    }
+    const events = getMaskEvent(this.mask);
+    if (events.length) {
+      const { event } = events.pop();
+      if (typeof event === "function") {
+        event(e3);
       }
     }
   }
@@ -6153,8 +6182,10 @@ class BKPopIndexManager {
     __publicField(this, "clickFn");
     __publicField(this, "bKMaskManagerInstance");
     __publicField(this, "transfer");
+    __publicField(this, "uniqId");
     this.clickFn = void 0;
     this.uuidAttrName = "data-bk-pop-uuid";
+    this.uniqId = random(16);
     this.transfer = this.getParentNode(options == null ? void 0 : options.transfer);
     this.bKMaskManagerInstance = new BkMaskManager({
       parentNode: this.getParentNode(options == null ? void 0 : options.transfer),
@@ -6194,7 +6225,7 @@ class BKPopIndexManager {
    * @param transfer 是否显示在body内（即是否显示在div#app内，默认为false）
    * @returns
    */
-  show(content, showMask = true, appendStyle = {}, transfer2 = false, zindex = void 0) {
+  show(content, showMask = true, appendStyle = {}, transfer2 = false, zindex = void 0, onMaskClick) {
     if (!content) {
       console.warn("pop show error: content is null or undefined");
       return;
@@ -6206,7 +6237,16 @@ class BKPopIndexManager {
       showMask && this.bKMaskManagerInstance.backupContentElement(this.popInstanceList.slice(-1)[0].content);
     }
     this.popInstanceList.push({ uuid: uuid2, zIndex, content, showMask, appendStyle });
-    this.bKMaskManagerInstance.show(content, zIndex, showMask, appendStyle, uuid2, transfer2);
+    this.bKMaskManagerInstance.show(
+      content,
+      zIndex,
+      showMask,
+      appendStyle,
+      uuid2,
+      transfer2,
+      onMaskClick,
+      this.uniqId
+    );
   }
   /**
    * 销毁指定实例
@@ -6231,7 +6271,13 @@ class BKPopIndexManager {
       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.bKMaskManagerInstance.show(
+          content,
+          zIndex,
+          showMask,
+          appendStyle,
+          uuid2
+        );
       } else {
         this.bKMaskManagerInstance.hide();
       }
@@ -6259,6 +6305,7 @@ class BKPopIndexManager {
     } else {
       content == null ? void 0 : content.remove();
     }
+    this.bKMaskManagerInstance.removeClickEvent();
   }
   onMaskClickFn(e3) {
     if (this.clickFn) {
@@ -15497,14 +15544,13 @@ const Component$t = /* @__PURE__ */ vue.defineComponent({
         var _a, _b;
         if (val) {
           this.$nextTick(() => {
-            this.bkPopIndexManager.onMaskClick((_e) => {
-              this.handleClickOutSide();
-            }, this.$el);
             const hideMaskStyle = {
               "background-color": "rgba(0,0,0,0)"
             };
             const appendStyle = this.showMask ? {} : hideMaskStyle;
-            this.bkPopIndexManager.show(this.$el, this.showMask, appendStyle, !!this.transfer, this.zIndex);
+            this.bkPopIndexManager.show(this.$el, this.showMask, appendStyle, !!this.transfer, this.zIndex, (_e) => {
+              this.handleClickOutSide();
+            });
             this.$emit("shown");
           });
         } else {
@@ -18646,6 +18692,7 @@ const Component$j = /* @__PURE__ */ vue.defineComponent({
     emit
   }) {
     const handleClose = async () => {
+      console.log("slider handleClose");
       let shouldClose = true;
       if (typeof props2.beforeClose === "function") {
         shouldClose = await props2.beforeClose();