hy-virtual-tree 1.1.38 → 1.1.40

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 1.1.40
+
+_2025-10-24_
+
+- 扩展[VirtualTree] 功能
+（1）修复更新设备数据时，统计在线数据出错问题
+
+### 1.1.39
+
+_2025-10-24_
+
+- 扩展[VirtualTree] 功能
+（1）修复虚拟树卸载时没有清除数据问题
+
 ### 1.1.38
 
 _2025-10-24_

package/dist/index.js

@@ -1217,7 +1217,6 @@ function useFilter(config, filterMethod, tree = {
             nodes.forEach((node) => {
                 const businessList = [];
                 family.push(node);
-                // if (tree.hiddenNodeKeySet.has(node.key)) return
                 if (isShow || (filterMethod && filterMethod(params, node.data, node))) {
                     family.forEach((member) => {
                         expandKeySet.add(member.key);
@@ -1251,12 +1250,14 @@ function useFilter(config, filterMethod, tree = {
                 else if (!hiddenKeys.has(node.key)) {
                     node.count = 0;
                     node.total = 0;
-                    // 统计
-                    if (isCountFiler && countFilter) {
-                        count += countFilter(node.data) ? 1 : 0;
-                    }
-                    if (isTotalFiler && totalFilter) {
-                        total += totalFilter(node.data) ? 1 : 0;
+                    // 统计，当仅展示在线时，不统计离线的设备
+                    if (!tree.hiddenNodeKeySet.has(node.key)) {
+                        if (isCountFiler && countFilter) {
+                            count += countFilter(node.data) ? 1 : 0;
+                        }
+                        if (isTotalFiler && totalFilter) {
+                            total += totalFilter(node.data) ? 1 : 0;
+                        }
                     }
                 }
                 if (!node.isLeaf) {
@@ -1325,9 +1326,11 @@ function useFilter(config, filterMethod, tree = {
                         node.count = 0;
                         node.total = 0;
                     }
-                    // 统计
-                    count += node.count || 0;
-                    total += node.total || 0;
+                    // 统计，当仅展示在线时，不统计离线的设备
+                    if (!tree.hiddenNodeKeySet.has(node.key)) {
+                        count += node.count || 0;
+                        total += node.total || 0;
+                    }
                 }
                 if (!node.isLeaf) {
                     if (!expandKeySet.has(node.key)) {
@@ -1461,7 +1464,6 @@ var WorkerFactory = /*#__PURE__*/createBase64WorkerFactory('Lyogcm9sbHVwLXBsdWdp
 function updateDeviceTree(tree, data, config) {
     const deviceMap = tree.deviceMap || new Map();
     let beOnlineList = [], beOfflineList = [];
-    const { hiddenNodeKeySet } = config;
     const { countFilter, totalFilter, setDeviceStatus } = useHandleFun(config);
     const { sortByStatus, showOnlineState, integratedBusiness } = config.businessConfig;
     // 更新父节点统计
@@ -1471,7 +1473,7 @@ function updateDeviceTree(tree, data, config) {
         const parentKeySet = new Set();
         for (const key of keySet) {
             const target = tree.treeNodeMap.get(key);
-            if (!target || hiddenNodeKeySet.has(target.key))
+            if (!target)
                 continue;
             let count = isCountFiler ? 0 : target.data.count;
             let total = isTotalFiler ? 0 : target.data.total;
@@ -1481,8 +1483,6 @@ function updateDeviceTree(tree, data, config) {
                 let children = target.children || [];
                 for (let i = 0; i < children.length; i++) {
                     const item = target.children[i];
-                    if (hiddenNodeKeySet.has(item.key))
-                        continue;
                     count =
                         isCountFiler && !tree.hiddenNodeKeySet.has(item.key) && countFilter
                             ? count + (item.children ? item.count : countFilter(item.data))
@@ -1509,9 +1509,9 @@ function updateDeviceTree(tree, data, config) {
                 }
                 target.data.childrenDeviceList = businessList;
             }
-            // 在仅显示设备时，切换显隐状态
-            if (showOnlineState) {
-                tree.hiddenNodeKeySet[count === 0 ? 'add' : 'delete'](target.key);
+            // 在仅显示设备时，设置 部门/群组 显示状态
+            if (showOnlineState && count > 0) {
+                tree.hiddenNodeKeySet.delete(target.key);
             }
             target.count = count;
             target.total = total;
@@ -1825,8 +1825,13 @@ class VirtualTree {
         }
         while (stack.length) {
             const node = stack.pop();
-            if (hiddenKeys.has(node.key) || this._tree.hiddenNodeKeySet.has(node.key))
+            if (hiddenKeys.has(node.key) ||
+                this._tree.hiddenNodeKeySet.has(node.key) ||
+                (this._businessConfig?.showOnlineState &&
+                    /^(1|4)$/.test(node.data.dataType) &&
+                    !node.count)) {
                 continue;
+            }
             flattenNodes.push(node);
             if (node.children && expandedKeys.has(node.key)) {
                 for (let i = node.children.length - 1; i >= 0; --i) {
@@ -2307,7 +2312,6 @@ class VirtualTree {
                                 count: this._props.count,
                                 total: this._props.total
                             },
-                            hiddenNodeKeySet: this._hiddenNodeKeySet,
                             businessConfig: this._businessConfig
                         });
                         Object.assign(this._tree, tree);
@@ -2372,6 +2376,10 @@ class VirtualTree {
             Object.assign(this._tree, tree);
             this._hiddenExpandIconKeySet = new Set();
             this._hiddenNodeKeySet = new Set();
+            for (const $destroy of this._destroyDomSet) {
+                $destroy && $destroy();
+            }
+            this._destroyDomSet.clear();
             this._isForceHiddenExpandIcon = undefined;
             this._updateCheckedKeys();
             this._refreshVirtualScroll();
@@ -2491,16 +2499,15 @@ class VirtualTree {
     /** 销毁组件 */
     destroy = () => {
         this._el = null;
-        for (const $destroy of this._destroyDomSet) {
-            $destroy && $destroy();
-        }
-        this._destroyDomSet.clear();
         this.setData([]);
         this.setCheckedKeys && this.setCheckedKeys([]);
         this._expandedKeySet = new Set();
         this._virtualScroll && this._virtualScroll.destroy();
         this._virtualScroll = null;
         this._isDestroy = true;
+        this._virtualScroll = null;
+        this._business = undefined;
+        this._businessConfig = undefined;
     };
 }
 

package/package.json

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