bkui-vue 2.0.2-beta.85 → 2.0.2-beta.86

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.0.2-beta.85";
+export const version = "2.0.2-beta.86";
 window.__bkui_vue_version__ = version;

package/lib/popover/index.js

@@ -4817,6 +4817,8 @@ var popContainerId = "id_".concat(esm_browser_v4());
     updateBoundary();
     updatePopover(null, props);
   };
+  // 监听父元素（Modal/Dialog）的可见性变化
+  var parentVisibilityObserver = null;
   var onMountedFn = function onMountedFn() {
     if (props.disabled) {
       return;
@@ -4831,20 +4833,78 @@ var popContainerId = "id_".concat(esm_browser_v4());
     initPopInstance();
     document.body.addEventListener('fullscreenchange', handleFullscreenChange);
     document.addEventListener('click', handleClickOutside);
+    // 监听父元素的可见性变化
+    var _resolvePopElements4 = resolvePopElements(),
+      elReference = _resolvePopElements4.elReference,
+      root = _resolvePopElements4.root;
+    var element = elReference || root;
+    if (element) {
+      var targetNode = element.closest('.bk-modal, .bk-dialog');
+      if (targetNode) {
+        parentVisibilityObserver = new MutationObserver(function () {
+          if (checkParentVisibility() && localIsShow.value) {
+            hideFn();
+          }
+        });
+        parentVisibilityObserver.observe(targetNode, {
+          attributes: true,
+          attributeFilter: ['style', 'class'],
+          subtree: true
+        });
+      }
+    }
   };
   var onUnmountedFn = function onUnmountedFn() {
     beforeInstanceUnmount();
     // 清理父节点上的 data-pnode-id 属性
-    var _resolvePopElements4 = resolvePopElements(),
-      root = _resolvePopElements4.root;
+    var _resolvePopElements5 = resolvePopElements(),
+      root = _resolvePopElements5.root;
     clearParentNodeId(root);
     document.body.removeEventListener('fullscreenchange', handleFullscreenChange);
     document.removeEventListener('click', handleClickOutside);
+    // 清理父元素可见性监听器
+    if (parentVisibilityObserver) {
+      parentVisibilityObserver.disconnect();
+      parentVisibilityObserver = null;
+    }
   };
   var isClickInside = function isClickInside(target) {
     var _refContent$value$$el, _refContent$value, _refContent$value$con;
     return (_refContent$value$$el = (_refContent$value = refContent.value) === null || _refContent$value === void 0 || (_refContent$value = _refContent$value.$el) === null || _refContent$value === void 0 || (_refContent$value$con = _refContent$value.contains) === null || _refContent$value$con === void 0 ? void 0 : _refContent$value$con.call(_refContent$value, target)) !== null && _refContent$value$$el !== void 0 ? _refContent$value$$el : false;
   };
+  /**
+   * 检查父元素（Modal/Dialog）是否被隐藏
+   * 如果父元素被隐藏，应该关闭 Popover
+   */
+  var checkParentVisibility = function checkParentVisibility() {
+    if (!localIsShow.value) return false;
+    var _resolvePopElements6 = resolvePopElements(),
+      elReference = _resolvePopElements6.elReference,
+      root = _resolvePopElements6.root;
+    var element = elReference || root;
+    if (!element) return false;
+    // 查找最近的 Modal 或 Dialog 父元素
+    var parent = element.parentElement;
+    while (parent && parent !== document.body) {
+      if (parent.classList.contains('bk-modal') || parent.classList.contains('bk-dialog')) {
+        // 检查 Modal wrapper 是否被隐藏（Dialog 关闭时 wrapper 会被 v-show 隐藏）
+        var wrapper = parent.querySelector('.bk-modal-wrapper');
+        if (wrapper) {
+          var wrapperStyle = window.getComputedStyle(wrapper);
+          if (wrapperStyle.display === 'none' || wrapperStyle.visibility === 'hidden') {
+            return true; // 父元素被隐藏
+          }
+        }
+        // 检查父元素本身是否被隐藏
+        var style = window.getComputedStyle(parent);
+        if (style.display === 'none' || style.visibility === 'hidden') {
+          return true; // 父元素被隐藏
+        }
+      }
+      parent = parent.parentElement;
+    }
+    return false;
+  };
   /**
    * 处理点击外部区域的事件
    * @param e - 事件对象
@@ -4859,6 +4919,13 @@ var popContainerId = "id_".concat(esm_browser_v4());
       e.stopImmediatePropagation();
       return;
     }
+    // 检查父元素（Modal/Dialog）是否被隐藏，如果隐藏则关闭 Popover
+    if (checkParentVisibility()) {
+      if (localIsShow.value) {
+        hideFn();
+      }
+      return;
+    }
     var commonFunc = function commonFunc() {
       ctx.emit(EMIT_EVENTS.CLICK_OUTSIDE, {
         isShow: localIsShow.value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.2-beta.85",
+  "version": "2.0.2-beta.86",
   "workspaces": [
     "packages/**",
     "scripts/cli",