bkui-vue 2.0.2-beta.70 → 2.0.2-beta.72

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.70";
+export const version = "2.0.2-beta.72";
 window.__bkui_vue_version__ = version;

package/lib/popover/index.d.ts

@@ -168,7 +168,6 @@ declare const BkPopover: {
         isRenderModeShow: import("vue").ComputedRef<boolean>;
         transBoundary: import("vue").ComputedRef<boolean>;
         handleClickContent: () => void;
-        handleClickOutside: (_e: MouseEvent, hideIgnoreReference?: boolean) => void;
         updatePopover: (virtualEl?: any, props?: {}, callFn?: any) => void;
         resetPopover: () => void;
         hide: () => void;
@@ -561,7 +560,6 @@ declare const BkPopover: {
         isRenderModeShow: import("vue").ComputedRef<boolean>;
         transBoundary: import("vue").ComputedRef<boolean>;
         handleClickContent: () => void;
-        handleClickOutside: (_e: MouseEvent, hideIgnoreReference?: boolean) => void;
         updatePopover: (virtualEl?: any, props?: {}, callFn?: any) => void;
         resetPopover: () => void;
         hide: () => void;
@@ -780,7 +778,6 @@ declare const BkPopover: {
     isRenderModeShow: import("vue").ComputedRef<boolean>;
     transBoundary: import("vue").ComputedRef<boolean>;
     handleClickContent: () => void;
-    handleClickOutside: (_e: MouseEvent, hideIgnoreReference?: boolean) => void;
     updatePopover: (virtualEl?: any, props?: {}, callFn?: any) => void;
     resetPopover: () => void;
     hide: () => void;

package/lib/popover/index.js

@@ -692,7 +692,7 @@ const shared_namespaceObject = x({ ["PlacementEnum"]: () => __WEBPACK_EXTERNAL_M
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["Teleport"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Teleport, ["Text"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Text, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createApp"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createApp, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["render"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.render, ["resolveDirective"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.resolveDirective, ["toRefs"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRefs, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["withDirectives"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["Teleport"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Teleport, ["Text"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Text, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createApp"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createApp, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["render"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.render, ["toRefs"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRefs, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
 ;// CONCATENATED MODULE: ../../packages/directives/src/clickoutside.ts
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -1545,7 +1545,7 @@ var EMIT_EVENT_TYPES = _defineProperty(_defineProperty(_defineProperty(_definePr
     var refContent = (0,external_vue_namespaceObject.ref)(null);
     var refTimer = (0,external_vue_namespaceObject.ref)(null);
     var handleClick = function handleClick(evt) {
-      evt.stopPropagation();
+      // evt.stopPropagation();
       emit('click', evt);
     };
     var resetPointerEvent = function resetPointerEvent() {
@@ -4440,10 +4440,11 @@ function use_floating_objectSpread(e) { for (var r = 1; r < arguments.length; r+
  */
 
 
-var popContainerId = null;
-var parentNodeReferId = null;
+var popContainerId = "id_".concat(esm_browser_v4());
 /* harmony default export */ const use_popper_id = (function (props) {
   var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#';
+  // 为每个 popover 实例生成独立的 parentNodeReferId，避免嵌套时 ID 冲突
+  var parentNodeReferId = "id_".concat(esm_browser_v4());
   var getPrefixId = function getPrefixId(root) {
     var resolvedBoundary = null;
     var resolveBoundary = function resolveBoundary(fn) {
@@ -4452,8 +4453,7 @@ var parentNodeReferId = null;
       }
     };
     var resolveParentBoundary = function resolveParentBoundary() {
-      if (/^parent$/i.test(props.boundary)) {
-        resolvedBoundary = "".concat(prefix).concat(popContainerId);
+      if (/^parent$/i.test(props.boundary) || !props.boundary) {
         var _ref = root || {},
           parentNode = _ref.parentNode;
         if (parentNode !== null && parentNode !== void 0 && parentNode.parentNode) {
@@ -4463,43 +4463,62 @@ var parentNodeReferId = null;
       }
     };
     var resolveCommonBoundary = function resolveCommonBoundary() {
-      if (!/^body$/i.test(props.boundary)) {
-        if (typeof props.boundary === 'string') {
-          if (!isAvailableId(props.boundary)) {
-            // console.error('props.boundary is not available selector');
-            resolvedBoundary = 'body';
-            return;
-          }
-          resolvedBoundary = props.boundary;
-          return;
-        }
-        if (utils_isElement(props.boundary)) {
-          resolvedBoundary = props.boundary;
-          return;
-        }
+      // 如果 boundary 是字符串 'body'，使用动态创建的 popContainer
+      if (typeof props.boundary === 'string' && /^body$/i.test(props.boundary)) {
+        resolvedBoundary = "".concat(prefix).concat(popContainerId);
+        return;
+      }
+      // 如果 boundary 是 document.body 对象，使用动态创建的 popContainer
+      if (props.boundary === document.body) {
+        resolvedBoundary = "".concat(prefix).concat(popContainerId);
+        return;
+      }
+      // 处理其他字符串选择器，直接使用
+      if (typeof props.boundary === 'string') {
+        resolvedBoundary = props.boundary;
+        return;
+      }
+      // 处理其他 HTMLElement 对象，直接使用
+      if (utils_isElement(props.boundary)) {
+        resolvedBoundary = props.boundary;
+        return;
       }
     };
     resolveBoundary(resolveParentBoundary);
     resolveBoundary(resolveCommonBoundary);
+    // 默认降级逻辑
     resolveBoundary(function () {
-      resolvedBoundary = typeof props.boundary === 'string' ? props.boundary : "".concat(prefix).concat(popContainerId);
+      resolvedBoundary = "".concat(prefix).concat(popContainerId);
     });
     return resolvedBoundary;
   };
-  if (popContainerId === null || !isAvailableId("#".concat(popContainerId))) {
-    popContainerId = "id_".concat(esm_browser_v4());
+  // 确保全局 popContainer 容器存在
+  if (!isAvailableId("#".concat(popContainerId))) {
     var popContainer = document.createElement('div');
     popContainer.setAttribute('id', popContainerId);
     popContainer.setAttribute('data-popper-id', popContainerId);
     document.body.append(popContainer);
   }
-  if (parentNodeReferId === null) {
-    parentNodeReferId = "id_".concat(esm_browser_v4());
-  }
+  // 清理父节点上的 data-pnode-id 属性
+  var clearParentNodeId = function clearParentNodeId(root) {
+    if (/^parent$/i.test(props.boundary)) {
+      var _ref2 = root || {},
+        parentNode = _ref2.parentNode;
+      if (parentNode !== null && parentNode !== void 0 && parentNode.parentNode) {
+        var attr = parentNode.parentNode.getAttribute('data-pnode-id');
+        // 只清理当前实例设置的属性
+        if (attr === parentNodeReferId) {
+          parentNode.parentNode.removeAttribute('data-pnode-id');
+        }
+      }
+    }
+  };
   return {
     popContainerId: popContainerId,
     prefixId: getPrefixId(),
-    getPrefixId: getPrefixId
+    getPrefixId: getPrefixId,
+    parentNodeReferId: parentNodeReferId,
+    clearParentNodeId: clearParentNodeId
   };
 });
 ;// CONCATENATED MODULE: ../../packages/popover/src/use-popover-init.ts
@@ -4668,7 +4687,8 @@ var parentNodeReferId = null;
     boundary.value = getPrefixId(root || elReference);
   };
   var _usePopperId = use_popper_id(props, '#'),
-    getPrefixId = _usePopperId.getPrefixId;
+    getPrefixId = _usePopperId.getPrefixId,
+    clearParentNodeId = _usePopperId.clearParentNodeId;
   var setFullscreenTag = function setFullscreenTag() {
     var _fullScreenTarget$val2;
     fullScreenTarget === null || fullScreenTarget === void 0 || (_fullScreenTarget$val2 = fullScreenTarget.value) === null || _fullScreenTarget$val2 === void 0 || _fullScreenTarget$val2.setAttribute('data-fllsrn-id', fullscreenReferId);
@@ -4702,25 +4722,49 @@ var parentNodeReferId = null;
     if (props.disabled) {
       return;
     }
-    initPopInstance();
     if (isElementFullScreen()) {
       var query = "[data-fllsrn-id=".concat(fullscreenReferId, "]");
       var target = getFullscreenRoot(query);
       updateFullscreen(target);
     }
+    // 先更新 boundary，确保在初始化 popover 实例之前 boundary 已正确设置
     updateBoundary();
+    initPopInstance();
     document.body.addEventListener('fullscreenchange', handleFullscreenChange);
+    document.addEventListener('click', handleClickOutside);
   };
   var onUnmountedFn = function onUnmountedFn() {
     beforeInstanceUnmount();
+    // 清理父节点上的 data-pnode-id 属性
+    var _resolvePopElements4 = resolvePopElements(),
+      root = _resolvePopElements4.root;
+    clearParentNodeId(root);
     document.body.removeEventListener('fullscreenchange', handleFullscreenChange);
+    document.removeEventListener('click', handleClickOutside);
   };
-  var handleClickOutside = function handleClickOutside(_e) {
+  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;
+  };
+  /**
+   * 处理点击外部区域的事件
+   * @param e - 事件对象
+   * @param hideIgnoreReference - 是否忽略隐藏参考元素
+   * @returns
+   */
+  var handleClickOutside = function handleClickOutside(e) {
     var hideIgnoreReference = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var target = e.target;
+    if (isClickInside(target)) {
+      e.preventDefault();
+      e.stopPropagation();
+      e.stopImmediatePropagation();
+      return;
+    }
     var commonFunc = function commonFunc() {
       ctx.emit(EMIT_EVENTS.CLICK_OUTSIDE, {
         isShow: localIsShow.value,
-        event: _e
+        event: e
       });
       var needExec = props.disableOutsideClick || props.always || props.disabled || props.trigger === 'manual';
       if (!props.forceClickoutside && needExec) {
@@ -4730,6 +4774,11 @@ var parentNodeReferId = null;
         hideFn();
       }
     };
+    /**
+     * 如果需要忽略隐藏参考元素，则设置一个定时器，在定时器结束后检查是否需要隐藏 popover
+     * @param hideIgnoreReference - 是否忽略隐藏参考元素
+     * @returns
+     */
     if (hideIgnoreReference) {
       setTimeout(function () {
         if (ReferenceClickSharedState[uniqKey]) {
@@ -4833,9 +4882,7 @@ function _isSlot(s) {
       }),
       onMountedFn = _usePopoverInit.onMountedFn,
       onUnmountedFn = _usePopoverInit.onUnmountedFn,
-      handleClickOutside = _usePopoverInit.handleClickOutside,
       beforeInstanceUnmount = _usePopoverInit.beforeInstanceUnmount,
-      updateBoundary = _usePopoverInit.updateBoundary,
       initPopInstance = _usePopoverInit.initPopInstance,
       showFn = _usePopoverInit.showFn,
       hideFn = _usePopoverInit.hideFn,
@@ -4865,7 +4912,6 @@ function _isSlot(s) {
         initPopInstance();
       }
     });
-    updateBoundary();
     (0,external_vue_namespaceObject.onMounted)(onMountedFn);
     (0,external_vue_namespaceObject.onBeforeUnmount)(onUnmountedFn);
     var isRenderModeShow = (0,external_vue_namespaceObject.computed)(function () {
@@ -4914,7 +4960,6 @@ function _isSlot(s) {
       isRenderModeShow: isRenderModeShow,
       transBoundary: transBoundary,
       handleClickContent: handleClickContent,
-      handleClickOutside: handleClickOutside,
       updatePopover: updatePopover,
       resetPopover: resetPopover,
       hide: hide,
@@ -4970,7 +5015,7 @@ function _isSlot(s) {
           "to": _this.boundary
         }, {
           "default": function _default() {
-            return [(0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)(content, {
+            return [(0,external_vue_namespaceObject.createVNode)(content, {
               "ref": "refContent",
               "width": _this.width,
               "height": _this.height,
@@ -4995,9 +5040,7 @@ function _isSlot(s) {
                   }
                 }) : '';
               }
-            }), [[(0,external_vue_namespaceObject.resolveDirective)("clickoutside"), function (e) {
-              return _this.handleClickOutside(e, _this.hideIgnoreReference);
-            }]])];
+            })];
           }
         })];
       }

package/lib/popover/popover.d.ts

@@ -154,7 +154,6 @@ declare const _default: import("vue").DefineComponent<{
     isRenderModeShow: import("vue").ComputedRef<boolean>;
     transBoundary: import("vue").ComputedRef<boolean>;
     handleClickContent: () => void;
-    handleClickOutside: (_e: MouseEvent, hideIgnoreReference?: boolean) => void;
     updatePopover: (virtualEl?: any, props?: {}, callFn?: any) => void;
     resetPopover: () => void;
     hide: () => void;

package/lib/popover/use-popover-init.d.ts

@@ -6,7 +6,7 @@ declare const _default: (props: any, ctx: any, { refReference, refContent, refAr
 }) => {
     onMountedFn: () => void;
     onUnmountedFn: () => void;
-    handleClickOutside: (_e: MouseEvent, hideIgnoreReference?: boolean) => void;
+    handleClickOutside: (e: MouseEvent, hideIgnoreReference?: boolean) => void;
     beforeInstanceUnmount: () => void;
     updateBoundary: () => void;
     initPopInstance: () => void;

package/lib/popover/use-popper-id.d.ts

@@ -1,6 +1,8 @@
 declare const _default: (props: any, prefix?: string) => {
-    popContainerId: any;
+    popContainerId: string;
     prefixId: any;
     getPrefixId: (root?: any) => any;
+    parentNodeReferId: string;
+    clearParentNodeId: (root?: any) => void;
 };
 export default _default;

package/package.json

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