bkui-vue 2.1.0-dev-beta.14 → 2.1.0-dev-beta.15

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.1.0-dev-beta.14";
+export const version = "2.1.0-dev-beta.15";
 window.__bkui_vue_version__ = version;

package/lib/popover/index.js

@@ -3191,7 +3191,7 @@ var PopoverProps = {
    */
   referenceCls: shared_namespaceObject.PropTypes.string.def(''),
   /**
-   * 是否渲染默认插槽最外层 reference span；false 时不主动追加 span
+   * 是否渲染默认插槽最外层 reference span；仅 true 时主动追加 span
    */
   renderReferenceWrapper: shared_namespaceObject.PropTypes.bool.def(undefined),
   /**
@@ -3363,15 +3363,9 @@ var EMIT_EVENTS = {
       target = _toRefs.target,
       floatingReference = _toRefs.floatingReference,
       renderReferenceWrapper = _toRefs.renderReferenceWrapper;
-    var isReferenceWrapperDisabled = (0,external_vue_namespaceObject.computed)(function () {
-      if (renderReferenceWrapper.value !== undefined) {
-        return renderReferenceWrapper.value === false;
-      }
-      var globalValue = globalConfig.value.popoverRenderReferenceWrapper;
-      if (globalValue !== undefined) {
-        return globalValue === false;
-      }
-      return false;
+    var shouldRenderReferenceWrapper = (0,external_vue_namespaceObject.computed)(function () {
+      var _renderReferenceWrapp;
+      return ((_renderReferenceWrapp = renderReferenceWrapper.value) !== null && _renderReferenceWrapp !== void 0 ? _renderReferenceWrapp : globalConfig.value.popoverRenderReferenceWrapper) === true;
     });
     var setReferenceRef = function setReferenceRef(refValue) {
       referenceWrapperRef.value = refValue;
@@ -3484,33 +3478,11 @@ var EMIT_EVENTS = {
     /**
      * 解析默认 slot reference 元素
      *
-     * referenceWrapperRef 使用 display: contents，自身无布局尺寸，
-     * 因此需要从子元素中找到实际的 reference 元素。
-     *
-     * 策略：优先使用第一个元素子节点作为 reference；否则向下寻找第一个具有可见尺寸的 HTMLElement。
+     * referenceWrapperRef 在 wrapper 开启时指向外层 span，
+     * wrapper 关闭时指向默认 slot 的实际元素。
      */
     var resolveDefaultReferenceElement = function resolveDefaultReferenceElement() {
-      var wrapper = resolveReferenceRefElement(referenceWrapperRef.value);
-      if (!wrapper) return null;
-      if (isReferenceWrapperDisabled.value) {
-        return wrapper;
-      }
-      // display: contents 的元素自身尺寸为 0，直接查找子元素
-      var firstChild = wrapper.firstElementChild;
-      if (firstChild instanceof HTMLElement) {
-        return firstChild;
-      }
-      var descendants = wrapper.querySelectorAll('*');
-      for (var _i = 0, _Array$from = Array.from(descendants); _i < _Array$from.length; _i++) {
-        var node = _Array$from[_i];
-        if (!(node instanceof HTMLElement)) continue;
-        var rect = node.getBoundingClientRect();
-        if (rect.width > 0 || rect.height > 0) {
-          return node;
-        }
-      }
-      // 兜底仍返回 wrapper，保证类型与行为一致
-      return wrapper;
+      return resolveReferenceRefElement(referenceWrapperRef.value);
     };
     // 延迟控制
     var delayOptions = (0,external_vue_namespaceObject.computed)(function () {
@@ -3601,7 +3573,7 @@ var EMIT_EVENTS = {
       return target.value;
     }, function () {
       return floatingReference.value;
-    }], function () {
+    }, shouldRenderReferenceWrapper], function () {
       (0,external_vue_namespaceObject.nextTick)(updateFloatingReference);
     });
     (0,external_vue_namespaceObject.watch)(isOpen, function (val) {
@@ -3655,7 +3627,7 @@ var EMIT_EVENTS = {
     };
     var bindNoWrapperReferenceEvents = function bindNoWrapperReferenceEvents() {
       clearNoWrapperReferenceEvents();
-      if (!isReferenceWrapperDisabled.value) return;
+      if (shouldRenderReferenceWrapper.value) return;
       var referenceEl = resolveReferenceRefElement(referenceWrapperRef.value);
       if (!referenceEl) return;
       Object.keys(referenceListeners.value).forEach(function (eventName) {
@@ -3667,7 +3639,7 @@ var EMIT_EVENTS = {
         });
       });
     };
-    (0,external_vue_namespaceObject.watch)([isReferenceWrapperDisabled, referenceWrapperRef, function () {
+    (0,external_vue_namespaceObject.watch)([shouldRenderReferenceWrapper, referenceWrapperRef, function () {
       return referenceListeners.value;
     }], function () {
       (0,external_vue_namespaceObject.nextTick)(bindNoWrapperReferenceEvents);
@@ -3684,7 +3656,7 @@ var EMIT_EVENTS = {
     var isTargetInSelfOrChildren = function isTargetInSelfOrChildren(targetEl) {
       var _floatingRef$value;
       var actualRef = floatingReferenceRef.value;
-      var referenceWrapperEl = isReferenceWrapperDisabled.value ? null : resolveReferenceRefElement(referenceWrapperRef.value);
+      var referenceWrapperEl = shouldRenderReferenceWrapper.value ? resolveReferenceRefElement(referenceWrapperRef.value) : null;
       if (actualRef instanceof HTMLElement && actualRef.contains(targetEl) || referenceWrapperEl instanceof HTMLElement && referenceWrapperEl.contains(targetEl)) {
         return true;
       }
@@ -3797,6 +3769,17 @@ var EMIT_EVENTS = {
     var dataTheme = (0,external_vue_namespaceObject.computed)(function () {
       return theme.value;
     });
+    // 兼容旧版自定义 theme 标记：theme="light bk-table-settings"
+    // 除了追加 bk-table-settings class 外，还需要生成 data-bk-table-settings-theme="true"，
+    // table settings 等组件的弹层样式依赖该属性选择器。
+    var extraThemeAttrs = (0,external_vue_namespaceObject.computed)(function () {
+      var _parseTheme2 = parseTheme(theme.value),
+        extraClasses = _parseTheme2.extraClasses;
+      return extraClasses.reduce(function (attrs, className) {
+        attrs["data-".concat(className, "-theme")] = 'true';
+        return attrs;
+      }, {});
+    });
     var _filterEmptyNodes = function filterEmptyNodes() {
       var children = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var nodes = [];
@@ -3819,11 +3802,6 @@ var EMIT_EVENTS = {
         return !(child && (child.type === external_vue_namespaceObject.Comment || child.type === external_vue_namespaceObject.Fragment && Array.isArray(child.children) && child.children.length === 0 || child.type === external_vue_namespaceObject.Text && "".concat((_child$children = child.children) !== null && _child$children !== void 0 ? _child$children : '').trim() === ''));
       });
     };
-    var hasElementNode = function hasElementNode(nodes) {
-      return nodes.some(function (node) {
-        return node.type !== external_vue_namespaceObject.Text && node.type !== external_vue_namespaceObject.Comment;
-      });
-    };
     // 处理 clickoutside
     var handleClickOutside = function handleClickOutside(event) {
       var _floatingRef$value2;
@@ -3837,7 +3815,7 @@ var EMIT_EVENTS = {
       var target = event.target;
       // 点击在 reference 内（包括自定义 reference 和默认 reference）
       var actualRef = floatingReferenceRef.value;
-      var referenceWrapperEl = isReferenceWrapperDisabled.value ? null : resolveReferenceRefElement(referenceWrapperRef.value);
+      var referenceWrapperEl = shouldRenderReferenceWrapper.value ? resolveReferenceRefElement(referenceWrapperRef.value) : null;
       var isInReference = actualRef instanceof HTMLElement && actualRef.contains(target) || referenceWrapperEl instanceof HTMLElement && referenceWrapperEl.contains(target);
       if (isInReference) {
         // 对于 click 和 hover 模式，点击 reference 的行为由 referenceListeners 处理
@@ -3973,7 +3951,7 @@ var EMIT_EVENTS = {
         id: popoverId,
         floatingEl: floatingRef.value,
         referenceEl: referenceEl,
-        referenceWrapperEl: isReferenceWrapperDisabled.value ? null : resolveReferenceRefElement(referenceWrapperRef.value)
+        referenceWrapperEl: shouldRenderReferenceWrapper.value ? resolveReferenceRefElement(referenceWrapperRef.value) : null
       });
     };
     (0,external_vue_namespaceObject.watch)([floatingRef, floatingReferenceRef, referenceWrapperRef], function () {
@@ -4035,7 +4013,8 @@ var EMIT_EVENTS = {
         "class": contentClass.value,
         "data-arrow": arrowSide.value,
         "data-bk-popover-id": popoverId,
-        "data-theme": dataTheme.value,
+        "data-theme": dataTheme.value
+      }, extraThemeAttrs.value, {
         "onClick": handleClickContent
       }, guardedFloatingListeners.value), [arrow.value && (0,external_vue_namespaceObject.createVNode)("div", {
         "ref": arrowRef,
@@ -4059,13 +4038,10 @@ var EMIT_EVENTS = {
       }
       var defaultSlotNodes = (_slots$default = (_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)) !== null && _slots$default !== void 0 ? _slots$default : [];
       var referenceNodes = _filterEmptyNodes(defaultSlotNodes);
-      var useContentsWrapper = hasElementNode(referenceNodes);
-      if (!isReferenceWrapperDisabled.value) {
+      if (shouldRenderReferenceWrapper.value) {
         return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)("span", (0,external_vue_namespaceObject.mergeProps)({
           "ref": referenceWrapperRef,
-          "style": useContentsWrapper ? {
-            display: 'contents'
-          } : {
+          "style": {
             display: 'inline-block'
           },
           "class": [referenceCls.value, attrs["class"]]
@@ -4075,25 +4051,36 @@ var EMIT_EVENTS = {
         if (!referenceNodes.length) {
           return null;
         }
-        // 无包裹模式下，只有“单个非文本 VNode”可以保持原 DOM 结构不变。
-        // 文本节点或多个节点没有唯一 HTMLElement 可作为 floating reference，必须降级为 span。
-        if (referenceNodes.length > 1 || referenceNodes[0].type === external_vue_namespaceObject.Text) {
+        // 默认无包裹模式：保持 Fragment 根结构，不主动追加任何具体 DOM。
+        // 为了兼容定位与触发事件，尽可能把 ref/class 透传到第一个非文本 reference 节点。
+        // 但纯文本 slot 没有可承载 ref 和监听器的 DOM 节点，需要生成一个 span 作为触发元素。
+        var isTextReference = referenceNodes.every(function (node) {
+          return (0,external_vue_namespaceObject.isVNode)(node) && node.type === external_vue_namespaceObject.Text;
+        });
+        if (isTextReference) {
           return (0,external_vue_namespaceObject.createVNode)("span", {
-            "ref": setReferenceRef,
+            "ref": referenceWrapperRef,
             "style": {
               display: 'inline-block'
             },
             "class": [referenceCls.value, attrs["class"]]
           }, [referenceNodes]);
         }
-        var referenceNode = referenceNodes[0];
-        if (!(0,external_vue_namespaceObject.isVNode)(referenceNode) || referenceNode.type === external_vue_namespaceObject.Comment) {
-          return referenceNode;
+        var referenceNodeIndex = referenceNodes.findIndex(function (node) {
+          return (0,external_vue_namespaceObject.isVNode)(node) && node.type !== external_vue_namespaceObject.Text && node.type !== external_vue_namespaceObject.Comment;
+        });
+        if (referenceNodeIndex < 0) {
+          return referenceNodes;
         }
-        return (0,external_vue_namespaceObject.cloneVNode)(referenceNode, {
-          ref: setReferenceRef,
-          "class": [referenceCls.value, attrs["class"]]
-        }, true);
+        return referenceNodes.map(function (node, index) {
+          if (index !== referenceNodeIndex || !(0,external_vue_namespaceObject.isVNode)(node)) {
+            return node;
+          }
+          return (0,external_vue_namespaceObject.cloneVNode)(node, {
+            ref: setReferenceRef,
+            "class": [referenceCls.value, attrs["class"]]
+          }, true);
+        });
       };
       // 默认情况：渲染 reference 和 floating content
       return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [renderReferenceNode(), renderTeleport()]);

package/lib/popover/props.d.ts

@@ -181,7 +181,7 @@ export declare const PopoverProps: {
         default: string;
     };
     /**
-     * 是否渲染默认插槽最外层 reference span；false 时不主动追加 span
+     * 是否渲染默认插槽最外层 reference span；仅 true 时主动追加 span
      */
     renderReferenceWrapper: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.1.0-dev-beta.14",
+  "version": "2.1.0-dev-beta.15",
   "workspaces": [
     "packages/**",
     "scripts/cli",