hy-virtual-tree 1.1.51 → 1.1.53

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 1.1.53
+
+_2025-12-23_
+
+- 扩展[VirtualTree] 功能
+（1）当通道状态为监控中时，且设备状态处于在线时，将设备状态回显为监控中
+
+### 1.1.52
+
+_2025-12-18_
+
+- 扩展[VirtualTree] 功能
+（1）优化树父节点的选中逻辑
+
 ### 1.1.51
 
 _2025-12-12_

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,
     };
 }
 
@@ -1805,16 +1851,20 @@ const useStatus = (config, data, node) => {
         if (data.dataType !== 3)
             return;
         el.classList.add('hy-tree-node__status');
-        if (data.deviceStatus === 1) {
+        let { deviceStatus } = data;
+        if (deviceStatus === DeviceStatus.ON_LINE && node.children?.some((item) => item.data.deviceStatus === DeviceStatus.BE_MONITOR)) {
+            deviceStatus = DeviceStatus.BE_MONITOR;
+        }
+        if (deviceStatus === DeviceStatus.ON_LINE) {
             el.classList.add('hy-text-success');
         }
-        else if (data.deviceStatus === 7) {
+        else if (deviceStatus === DeviceStatus.SOS) {
             el.classList.add('hy-text-danger');
         }
-        else if (data.deviceStatus !== 0) {
+        else if (deviceStatus !== DeviceStatus.OFF_LINE) {
             el.classList.add('hy-text-gradient');
         }
-        el.innerHTML = deviceStatusMap[data.deviceStatus];
+        el.innerHTML = deviceStatusMap[deviceStatus];
         return el;
     }
 };
@@ -9091,7 +9141,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;
@@ -9180,7 +9230,7 @@ class VirtualTree {
                     statusSlot = this._customRender(config.renderStatus, item, {
                         inset: true,
                         className: 'hy-tree-node__status',
-                        defaultFn: (data, node) => useStatus(config, data)
+                        defaultFn: (data, node) => useStatus(config, data, node)
                     });
                 }
                 // 右侧内容
@@ -9230,11 +9280,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.51",
+  "version": "1.1.53",
   "type": "module",
   "scripts": {
     "dev": "vite",