bkui-vue 2.0.2-beta.80 → 2.0.2-beta.81

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

package/lib/tree/index.js

@@ -18925,7 +18925,9 @@ var use_node_action_this = undefined;
       setNodeOpened(item, false, e, true);
       return;
     }
-    if (isRemoteFnExec(event)) {
+    /** 如果是异步节点，尝试加载数据 */
+    var isAsyncNode = getNodeAttr(item, NODE_ATTRIBUTES.IS_ASYNC);
+    if (isAsyncNode && isRemoteFnExec(event)) {
       /** 如果是异步请求加载 */
       asyncNodeClick(item)["finally"](function () {
         if (getNodeAttr(item, NODE_ATTRIBUTES.IS_LOADING)) {
@@ -18939,6 +18941,9 @@ var use_node_action_this = undefined;
           setNodeOpened(item, true, e, true);
         }
       });
+    } else {
+      /** 非异步节点或者 trigger 不匹配时，直接展开 */
+      setNodeOpened(item, true, e, true);
     }
   };
   /**
@@ -19034,24 +19039,32 @@ var use_node_action_this = undefined;
     return ['selected', 'expand', 'click'];
   };
   /**
-   * 点击节点事件
-   * @param item
+   * 点击节点内容事件
+   * 处理节点内容（除展开/收起按钮外）的点击行为
+   * @param item 当前节点
+   * @param e 鼠标事件
+   * @param event 事件类型
    */
   var handleNodeContentClick = function handleNodeContentClick(item, e, event) {
     var nodeActions = resolveNodeAction(item);
+    var isOpened = isNodeOpened(item);
+    // 1. 处理 selected 行为：选中节点
     if (nodeActions.includes('selected')) {
-      setSelect(item, true, true, true, event);
+      // 如果配置了 expand 或 collapse，selected 不应该自动展开节点
+      // 让展开/收起逻辑由 expand/collapse 单独处理
+      var hasExpandOrCollapse = nodeActions.includes('expand') || nodeActions.includes('collapse');
+      var autoOpen = !hasExpandOrCollapse;
+      setSelect(item, true, autoOpen, true, event);
     }
-    if (nodeActions.includes('expand')) {
-      if (!isNodeOpened(item)) {
-        handleTreeNodeClick(item, e, event);
-      }
+    // 2. 处理 expand 行为：仅当节点是收起状态时展开
+    if (nodeActions.includes('expand') && !isOpened) {
+      handleTreeNodeClick(item, e, 'expand');
     }
-    if (nodeActions.includes('collapse')) {
-      if (isNodeOpened(item)) {
-        handleTreeNodeClick(item, e, event);
-      }
+    // 3. 处理 collapse 行为：仅当节点是展开状态时收起
+    if (nodeActions.includes('collapse') && isOpened) {
+      handleTreeNodeClick(item, e, 'expand');
     }
+    // 4. 处理 click 行为：触发 node-click 事件
     if (nodeActions.includes('click')) {
       var eventName = EVENTS.NODE_CLICK;
       ctx.emit(eventName, item, resolveScopedSlotParam(item), getSchemaVal(item), e);

package/lib/tree/tree.css

@@ -263,9 +263,15 @@
   padding-left: calc(var(--offset-left));
   position: relative;
 }
+.bk-tree .bk-node-row:hover {
+  background-color: #f5f7fa;
+}
 .bk-tree .bk-node-row.is-selected {
   background-color: #ebf2ff;
 }
+.bk-tree .bk-node-row.is-selected:hover {
+  background-color: #e1ecff;
+}
 .bk-tree .bk-node-row.drop-before::before {
   content: '';
   position: absolute;

package/lib/tree/tree.less

@@ -11,8 +11,16 @@
     padding-left: calc(var(--offset-left));
     position: relative;
 
+    &:hover {
+      background-color: #f5f7fa;
+    }
+
     &.is-selected {
       background-color: #ebf2ff;
+
+      &:hover {
+        background-color: #e1ecff;
+      }
     }
 
     &.drop-before {

package/lib/tree/tree.variable.css

@@ -394,9 +394,15 @@
   padding-left: calc(var(--offset-left));
   position: relative;
 }
+.bk-tree .bk-node-row:hover {
+  background-color: #f5f7fa;
+}
 .bk-tree .bk-node-row.is-selected {
   background-color: #ebf2ff;
 }
+.bk-tree .bk-node-row.is-selected:hover {
+  background-color: #e1ecff;
+}
 .bk-tree .bk-node-row.drop-before::before {
   content: '';
   position: absolute;

package/package.json

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