bkui-vue 2.0.2-beta.84 → 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.84";
+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/lib/tree/index.js

@@ -19190,7 +19190,9 @@ var use_node_action_this = undefined;
     setSelect: setSelect,
     setOpen: setOpen,
     setNodeAttribute: setNodeAttribute,
-    isIndeterminate: isIndeterminate
+    isIndeterminate: isIndeterminate,
+    deepUpdateChildNode: deepUpdateChildNode,
+    updateParentChecked: updateParentChecked
   };
 });
 ;// CONCATENATED MODULE: external "lodash/throttle"
@@ -20226,7 +20228,9 @@ var use_tree_init_this = undefined;
       setSelect = _useNodeAction.setSelect,
       asyncNodeClick = _useNodeAction.asyncNodeClick,
       setNodeAttribute = _useNodeAction.setNodeAttribute,
-      isIndeterminate = _useNodeAction.isIndeterminate;
+      isIndeterminate = _useNodeAction.isIndeterminate,
+      deepUpdateChildNode = _useNodeAction.deepUpdateChildNode,
+      updateParentChecked = _useNodeAction.updateParentChecked;
     var handleSearch = (0,shared_namespaceObject.debounce)(120, function () {
       matchedNodePath.length = 0;
       flatData.data.forEach(function (item) {
@@ -20254,14 +20258,42 @@ var use_tree_init_this = undefined;
     });
     /**
      * 设置指定节点是否选中
-     * @param item Node item | Node Id
+     * @param item Node item | Node Id | Array of Node items or Node Ids
      * @param checked
      * @param triggerEvent 是否触发抛出事件
      */
     var setChecked = function setChecked(item) {
       var checked = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var triggerEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      setNodeAction(resolveNodeItem(item), NODE_ATTRIBUTES.IS_CHECKED, checked);
+      // 将 item 转换为 TreeNode 数组
+      var resolveToNodes = function resolveToNodes(input) {
+        if (Array.isArray(input)) {
+          return input.map(function (i) {
+            if (typeof i === 'string' || typeof i === 'number') {
+              return getNodeById(i);
+            }
+            return i;
+          }).filter(Boolean);
+        }
+        if (typeof input === 'string' || typeof input === 'number') {
+          var node = getNodeById(input);
+          return node ? [node] : [];
+        }
+        return [input].filter(Boolean);
+      };
+      var nodes = resolveToNodes(item);
+      nodes.forEach(function (node) {
+        var resolvedNode = resolveNodeItem(node);
+        setNodeAction(resolvedNode, NODE_ATTRIBUTES.IS_CHECKED, checked);
+        if (checked) {
+          setNodeAction(resolvedNode, NODE_ATTRIBUTES.IS_INDETERMINATE, false);
+        }
+        // 如果设置了 checkStrictly，需要同步更新子节点和父节点的状态
+        if (props.checkStrictly) {
+          deepUpdateChildNode(resolvedNode, [NODE_ATTRIBUTES.IS_CHECKED, NODE_ATTRIBUTES.IS_INDETERMINATE], [checked, false]);
+          updateParentChecked(resolvedNode, checked);
+        }
+      });
       if (triggerEvent) {
         ctx.emit(EVENTS.NODE_CHECKED, flatData.data.filter(function (t) {
           return isNodeChecked(t);
@@ -20311,7 +20343,17 @@ var use_tree_init_this = undefined;
     (0,external_vue_namespaceObject.watch)(function () {
       return [props.checked];
     }, function () {
+      // 先清除所有节点的选中和半选状态
+      flatData.data.forEach(function (node) {
+        if (isNodeChecked(node) || isIndeterminate(node)) {
+          setNodeAction(node, NODE_ATTRIBUTES.IS_CHECKED, false);
+          setNodeAction(node, NODE_ATTRIBUTES.IS_INDETERMINATE, false);
+        }
+      });
+      // 再设置新的选中节点
       setChecked(props.checked, true);
+    }, {
+      immediate: true
     });
     var reset = function reset() {
       var _root$value;

package/lib/tree/use-node-action.d.ts

@@ -11,5 +11,7 @@ declare const _default: (props: TreePropTypes, ctx: any, flatData: IFlatData, _r
     setOpen: (item: TreeNode, isOpen?: boolean, autoOpenParents?: boolean) => void;
     setNodeAttribute: (node: TreeNode, attrName: string | string[], value: (boolean | number | string)[] | boolean | number | string, loopParent?: boolean) => void;
     isIndeterminate: (item: TreeNode) => any;
+    deepUpdateChildNode: (node: TreeNode, attr: string | string[], value: unknown | unknown[]) => void;
+    updateParentChecked: (item: TreeNode, isChecked: any) => void;
 };
 export default _default;

package/package.json

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