hy-virtual-tree 1.1.50 → 1.1.52

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 1.1.52
+
+_2025-12-18_
+
+- 扩展[VirtualTree] 功能
+（1）优化树父节点的选中逻辑
+
+### 1.1.51
+
+_2025-12-12_
+
+- 扩展[VirtualTree] 功能
+（1）修复通道树在过滤时统计在线设备错误问题
+
 ### 1.1.50
 
 _2025-12-09_

package/dist/index.js

@@ -1503,6 +1503,51 @@ function useCheck(props, tree) {
             updateCheckedKeys();
         }
     }
+    // 获取切换选中后的值
+    function getSwitchCheckedValue(node) {
+        if (!isIndeterminate(node) || props.rowSelection.checkStrictly || !node.children?.length)
+            return !isChecked(node);
+        const { isAllSelect } = getNodeCheckInfo(node.children || []);
+        console.log('isAllSelect', isAllSelect);
+        return !isAllSelect;
+    }
+    // 获取当前项选中信息
+    function getNodeCheckInfo(children) {
+        const { checkStrictly } = props.rowSelection;
+        let isAllDisabled = true;
+        let isCanAllSelect = true;
+        let isAllSelect = true;
+        for (const node of children) {
+            if (isChecked(node))
+                continue;
+            // 严格模式 或 非严格模式下没有子元素
+            if (checkStrictly || (!checkStrictly && !node.children?.length)) {
+                if (getDisabled(props, node)) {
+                    isCanAllSelect = false;
+                }
+                else if (!isChecked(node)) {
+                    isAllSelect = false;
+                    isAllDisabled = false;
+                }
+                if (!isAllDisabled && !isCanAllSelect && !isAllSelect) {
+                    break;
+                }
+            }
+            // 递归子元素
+            if (node.children?.length) {
+                const checkInfo = getNodeCheckInfo(node.children);
+                if (!checkStrictly) {
+                    isAllDisabled = checkInfo.isAllDisabled && isAllDisabled;
+                    isCanAllSelect = checkInfo.isCanAllSelect && isCanAllSelect;
+                    isAllSelect = checkInfo.isAllSelect && isAllSelect;
+                }
+            }
+            if (!isAllDisabled && !isCanAllSelect && !isAllSelect) {
+                break;
+            }
+        }
+        return { isAllDisabled, isCanAllSelect, isAllSelect };
+    }
     return {
         checkedKeys,
         updateCheckedKeys,
@@ -1518,7 +1563,8 @@ function useCheck(props, tree) {
         getHalfCheckedNodes,
         setChecked,
         setCheckedKeys,
-        setCheckedNodes
+        setCheckedNodes,
+        getSwitchCheckedValue,
     };
 }
 
@@ -1650,9 +1696,14 @@ function useFilter(config, filterMethod, tree = {
                         count += childCount;
                         total += childTotal;
                     }
-                    else if (!hiddenKeys.has(node.key)) {
-                        count++;
-                        total++;
+                    // 拥有道通的设备
+                    else if (!hiddenKeys.has(node.key) && node.data.dataType === 3 && !node.isLeaf) {
+                        if (isCountFiler && countFilter) {
+                            count += countFilter(node.data) ? 1 : 0;
+                        }
+                        if (isTotalFiler && totalFilter) {
+                            total += totalFilter(node.data) ? 1 : 0;
+                        }
                     }
                 }
                 else if (!hiddenKeys.has(node.key)) {
@@ -1814,7 +1865,7 @@ const useStatus = (config, data, node) => {
     }
 };
 function checkDeviceTypeFn(config, data) {
-    // [设备类型]{1:执法记录仪;2:对讲机;3:消防调度台;4:消防值班台;5:PhoneAPP;6:布控球;7:IPC摄像头;8:头盔;9:手电筒;10:工牌;11:无人机;12:车载云台;13:向下级联设备;14:JT808设备;15:国标记录仪;16:RTOS设备;17:手表;18:sip}
+    // [设备类型]{1:执法记录仪;2:对讲机;3:消防调度台;4:消防值班台;5:PhoneAPP;6:布控球;7:IPC摄像头;8:头盔;9:手电筒;10:工牌;11:无人机;12:车载云台;13:向下级联设备;14:JT808设备;15:国标记录仪;16:RTOS设备;17:手表;18:sip;19:RTC报警器;20:FLV设备}
     const deviceTypeMap = {
         1: 'lawEnforcement',
         2: 'walkieTalkie',
@@ -9086,7 +9137,7 @@ class VirtualTree {
         getCheckedKeys, getCheckedNodes, 
         // getHalfCheckedKeys,
         // getHalfCheckedNodes,
-        setChecked, setCheckedKeys, setCheckedNodes } = useCheck(config, this._tree);
+        setChecked, setCheckedKeys, setCheckedNodes, getSwitchCheckedValue, } = useCheck(config, this._tree);
         this._updateCheckedKeys = updateCheckedKeys;
         this.getChecked = getChecked;
         this.getCheckedKeys = getCheckedKeys;
@@ -9225,11 +9276,7 @@ class VirtualTree {
                             onClick: () => {
                                 if (getDisabled(config, item))
                                     return;
-                                item.checkedMark = item.children?.length ? !(isChecked(item) || item.checkedMark) : !isChecked(item);
-                                toggleCheckbox(item, item.checkedMark, true, true, false, this._hiddenNodeKeySet);
-                                if (isChecked(item) || isIndeterminate(item)) {
-                                    item.checkedMark = true;
-                                }
+                                toggleCheckbox(item, getSwitchCheckedValue(item), true, true, false, this._hiddenNodeKeySet);
                                 this.refresh();
                             }
                         }).mount(el);

package/package.json

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