hy-virtual-tree 1.1.68 → 1.1.69

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Changelog
 
+### 1.1.69
+
+_2026-01-29_
+
+- 扩展[VirtualTree] 功能
+（1）修复 channel业务 下，设备在线，而设备下全部通道离线，而设备无法选中问题
+（2）完善 channel业务 下，设备在线，而设备下全部通道离线，选中设备后，此时通道上线，会将通道也选中，并且触发选中事件
+（3）新增 tooltip.props 全局配置项
+
 ### 1.1.68
 
 _2026-01-23_

package/dist/index.js

@@ -197,6 +197,10 @@ let tooltipConfig = {
         borderRadius: '4px',
         padding: '7px 9px',
         zIndex: 3200
+    },
+    props: {
+        // 偏移距离
+        offset: 0,
     }
 };
 // 获取tooltip配置
@@ -211,6 +215,12 @@ const setGlobalTooltipConfig = (config) => {
             ...config.style
         };
     }
+    if (config?.props) {
+        const { offset } = config.props;
+        if (typeof offset === 'number') {
+            tooltipConfig.props.offset = offset;
+        }
+    }
 };
 // 获取全局的配置
 const getGlobalTreeConfig = () => {
@@ -1264,9 +1274,18 @@ const isShowSelect = (config, node = null) => {
     return !!(isFunction(showSelect) && showSelect(node.data, node));
 };
 const isCheckLeaf = (config, node) => {
-    if (config.business !== Business.CHANNEL || config.businessConfig.isShowChannelSelect)
+    // 非通道业务
+    if (config.business !== Business.CHANNEL)
         return node.isLeaf;
-    return node.data.dataType === 3 ? true : node.isLeaf;
+    // 未开启通道可选中
+    if (!config.businessConfig.isShowChannelSelect) {
+        return node.data.dataType === 3 ? true : node.isLeaf;
+    }
+    // 仅显示在线数据
+    if (config.businessConfig?.showOnlineState) {
+        return node.data.dataType === 3 && !node.count ? true : node.isLeaf;
+    }
+    return node.isLeaf;
 };
 function useCheck(props, instance) {
     const tree = instance._tree;
@@ -2222,7 +2241,10 @@ function updateDeviceChannelTree(tree, data, config) {
     const deviceMap = tree.deviceMap || new Map();
     const channelMap = tree.channelMap || new Map();
     let beOnlineList = [], beOfflineList = [];
-    const { businessConfig, hiddenNodeKeySet } = config;
+    // 是否触发选中事件
+    let checkedChangeNode = undefined;
+    let isCheckedChange = false;
+    const { businessConfig, hiddenNodeKeySet, isChecked, isIndeterminate, toggleCheckbox } = config;
     const { countFilter, totalFilter, setDeviceStatus } = useHandleFun(config);
     const { sortByStatus, showOnlineState } = businessConfig;
     // 是否参与统计
@@ -2292,7 +2314,8 @@ function updateDeviceChannelTree(tree, data, config) {
         // 通道
         if (v.channelId) {
             const channel = channelMap.get(v.channelId);
-            if (!channel)
+            const channelParent = channel.parent;
+            if (!channel || !parent)
                 return;
             Object.assign(channel, {
                 data: {
@@ -2311,9 +2334,15 @@ function updateDeviceChannelTree(tree, data, config) {
                 else {
                     tree.hiddenNodeKeySet.delete(channel.key);
                     beOnlineList.push(channel);
+                    // 设备在线，而设备下通道全部离线，且此时通道上线，自动勾选通道
+                    if (config.businessConfig.isShowChannelSelect && !channelParent.count && isChecked(channelParent)) {
+                        toggleCheckbox(channel, true, false, true, false);
+                        checkedChangeNode = channel;
+                        isCheckedChange = true;
+                    }
                 }
             }
-            channel.parent && parentMap.set(channel.parent.key, channel.parent);
+            parentMap.set(channelParent.key, channelParent);
         }
         // 设备
         else {
@@ -2353,7 +2382,7 @@ function updateDeviceChannelTree(tree, data, config) {
         }
     });
     updateParnetCount(parentMap);
-    return { tree, beOnlineList, beOfflineList };
+    return { tree, beOnlineList, beOfflineList, checkedChangeNode, isCheckedChange };
 }
 // 用户树
 function updateUserTree(tree, data, config) {
@@ -9344,9 +9373,7 @@ class VirtualTree {
             return;
         this._tree = await this._createTree(config.data);
         this._flattenTree = this._genereateFlattenTree();
-        const { checkedKeys, updateCheckedKeys, isIndeterminate, isChecked, toggleCheckbox, getChecked, 
-        // afterNodeCheck,
-        getCheckedKeys, getCheckedNodes, getCheckedBusinessNodes, 
+        const { checkedKeys, updateCheckedKeys, isIndeterminate, isChecked, toggleCheckbox, getChecked, afterNodeCheck, getCheckedKeys, getCheckedNodes, getCheckedBusinessNodes, 
         // getHalfCheckedKeys,
         // getHalfCheckedNodes,
         setChecked, setCheckedKeys, setCheckedNodes, getSwitchCheckedValue, } = useCheck(config, this);
@@ -9394,10 +9421,7 @@ class VirtualTree {
                 const icon = document.createElement('div');
                 icon.classList.add('hy-tree-node__expand-icon');
                 el.appendChild(icon);
-                const isHideIcon = config.business !== Business.CHANNEL || item.data.dataType !== DataType.DEVICE
-                    ? item.isLeaf
-                    : this._businessConfig?.showOnlineState ? !item.count : !item.total;
-                if (isHideIcon || this._hiddenExpandIconKeySet.has(item.key)) {
+                if (isCheckLeaf(config, item) || this._hiddenExpandIconKeySet.has(item.key)) {
                     el.style.setProperty('visibility', 'hidden');
                 }
                 else {
@@ -9566,21 +9590,22 @@ class VirtualTree {
                         if (config.onNodeClick) {
                             await config.onNodeClick(getNodeData(item), item, e);
                         }
+                        const isLeaf = isCheckLeaf(config, item);
                         if (!getDisabled(config, item) && isShowSelect(config, item)) {
                             if (config.checkOnClickNode) {
                                 toggleCheckbox(item, !(isChecked(item) || isIndeterminate(item)), true, true);
-                                if (!config.expandOnClickNode || item.isLeaf) {
+                                if (!config.expandOnClickNode || isLeaf) {
                                     this.refresh();
                                 }
                             }
-                            else if (item.isLeaf && config.checkOnClickLeaf) {
+                            else if (isLeaf && config.checkOnClickLeaf) {
                                 toggleCheckbox(item, !isChecked(item), true, true);
-                                if (!config.expandOnClickNode || item.isLeaf) {
+                                if (!config.expandOnClickNode || isLeaf) {
                                     this.refresh();
                                 }
                             }
                         }
-                        if (config.expandOnClickNode && !item.isLeaf) {
+                        if (config.expandOnClickNode && !isLeaf) {
                             this._expandedHandle(item);
                             this._refreshVirtualScroll();
                         }
@@ -9604,7 +9629,7 @@ class VirtualTree {
                         return;
                     e.stopPropagation();
                     if ((getDisabled(config, item) ||
-                        item.isLeaf ||
+                        isCheckLeaf(config, item) ||
                         !config.checkOnDblclickParentNode) &&
                         !config.onNodeDblClick) {
                         nodeClickHandle(e);
@@ -9633,7 +9658,7 @@ class VirtualTree {
                             await config.onNodeDblClick(getNodeData(item), item, e);
                         }
                         if (getDisabled(config, item) ||
-                            item.isLeaf ||
+                            isCheckLeaf(config, item) ||
                             !config.checkOnDblclickParentNode ||
                             !isShowSelect(config, item)) {
                             return;
@@ -9726,7 +9751,7 @@ class VirtualTree {
                             reject({});
                             return;
                         }
-                        const { tree } = updateMethod(this._tree, data, {
+                        const { tree, checkedChangeNode, isCheckedChange } = updateMethod(this._tree, data, {
                             business: this._business,
                             props: {
                                 value: this._props.value,
@@ -9736,21 +9761,17 @@ class VirtualTree {
                                 total: this._props.total
                             },
                             businessConfig: this._businessConfig,
-                            hiddenNodeKeySet: this._hiddenNodeKeySet
+                            hiddenNodeKeySet: this._hiddenNodeKeySet,
+                            isChecked,
+                            isIndeterminate,
+                            toggleCheckbox
                         });
                         Object.assign(this._tree, tree);
-                        // 设备离线时取消勾选状态
-                        // let updateNode = null
-                        // for (const node of (beOfflineList || [])) {
-                        //   if (checkedKeys.has(node.key)) {
-                        //     checkedKeys.delete(node.key)
-                        //     updateNode = node
-                        //   }
-                        // }
                         updateCheckedKeys();
-                        // if (updateNode) {
-                        //   afterNodeCheck(updateNode, false)
-                        // }
+                        // 选中数据更新，触发选中事件
+                        if (checkedChangeNode && isCheckedChange) {
+                            afterNodeCheck(checkedChangeNode, true);
+                        }
                         resolve({});
                         return;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-virtual-tree",
-  "version": "1.1.68",
+  "version": "1.1.69",
   "type": "module",
   "scripts": {
     "dev": "vite",