hy-virtual-tree 1.1.47 → 1.1.49

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 1.1.49
+
+_2025-12-06_
+
+- 扩展[VirtualTree] 功能
+（1）修复在奇安信浏览器下的css样式不兼容 :has(+.className) 查询下一个元素是否满足条件
+
+### 1.1.48
+
+_2025-12-04_
+
+- 扩展[VirtualTree] 功能
+（1）输出 try...catch... 捕获的错误
+
 ### 1.1.47
 
 _2025-12-03_

package/dist/index.css

@@ -469,12 +469,12 @@
   right: 0;
   transform: translateY(-50%);
 }
-.hy-tree .hy-tree-node:not(.hy-tree-channel-node):has(+ .hy-tree-channel-node) {
-  background-image: linear-gradient(to bottom, transparent 50%, var(--hy-tree-channel-bg-color) 50%, var(--hy-tree-channel-bg-color) 100%);
-}
 .hy-tree .hy-tree-node:not(.hy-tree-channel-node) + .hy-tree-channel-node .hy-tree-node-container .hy-tree-node__expand::before {
   height: calc(var(--hy-tree-item-height) - var(--hy-tree-item-gap) / 2);
 }
-.hy-tree .hy-tree-channel-node:has( + .hy-tree-node:not(.hy-tree-channel-node)) {
+.hy-tree .hy-tree-node.hy-tree-device-node.hy-tree-node-expand {
+  background-image: linear-gradient(to bottom, transparent 50%, var(--hy-tree-channel-bg-color) 50%, var(--hy-tree-channel-bg-color) 100%);
+}
+.hy-tree .hy-tree-channel-node.hy-tree-channel-last-node {
   background: linear-gradient(to bottom, var(--hy-tree-channel-bg-color) 0%, var(--hy-tree-channel-bg-color) calc(100% - var(--hy-tree-item-gap)), transparent calc(100% - var(--hy-tree-item-gap)));
 }

package/dist/index.js

@@ -465,7 +465,7 @@ class VirtualScroll {
             const item = this.items[i];
             if (this.customRenderItem) {
                 // Use custom render function
-                const itemElement = this.customRenderItem(item, i);
+                const itemElement = this.customRenderItem(item, i, this.items[i - 1], this.items[i + 1]);
                 if (itemElement) {
                     // Only set necessary height styles, other styles are determined by the caller
                     itemElement.style.height = `${this.itemHeight * this.heightScale}px`;
@@ -2649,11 +2649,20 @@ class VirtualTree {
                 }
             };
             /** 渲染项 */
-            const generateItem = (item) => {
+            const generateItem = (item, index, prev, next) => {
                 let el = document.createElement('div');
                 el.classList.add('hy-tree-node');
-                if (item.data.dataType === 9) {
+                if (item.data.dataType === DataType.CHANNEL) {
                     el.classList.add('hy-tree-channel-node');
+                    if (!next || next.data.dataType !== DataType.CHANNEL) {
+                        el.classList.add('hy-tree-channel-last-node');
+                    }
+                }
+                else if (item.data.dataType === DataType.DEVICE) {
+                    el.classList.add('hy-tree-device-node');
+                }
+                if (this._expandedKeySet.has(item.key)) {
+                    el.classList.add('hy-tree-node-expand');
                 }
                 let nodeContainer = document.createElement('div');
                 nodeContainer.style.height = `${config.itemHeight}px`;
@@ -2719,7 +2728,9 @@ class VirtualTree {
                             this._refreshVirtualScroll();
                         }
                     }
-                    catch { }
+                    catch (err) {
+                        console.error(err);
+                    }
                 };
                 nodeContainer.addEventListener('mousedown', (e) => {
                     isSelecting = false;
@@ -2774,7 +2785,8 @@ class VirtualTree {
                         toggleCheckbox(item, !(isChecked(item) || isIndeterminate(item)), true, true, true);
                         this.refresh();
                     }
-                    catch {
+                    catch (err) {
+                        console.error(err);
                     }
                 });
                 // 鼠标右键点击事件
@@ -2986,7 +2998,7 @@ class VirtualTree {
             : data;
         return this._tree ? this._tree.treeNodeMap.get(key) : undefined;
     };
-    /** 获取设备/群组下的全部设备 */
+    /** 获取部门/群组/设备 下 的 设备和通道 */
     getDeviceIntegrated = (() => {
         const getAllDevice = (children, params, list = []) => {
             if (!children?.length)
@@ -3032,8 +3044,9 @@ class VirtualTree {
         };
         return (params) => {
             const { id, isBusiness = false } = params;
-            if (!id)
-                return;
+            if (!id) {
+                throw Error('getDeviceIntegrated：id不能为空');
+            }
             let node;
             if (isBusiness && this._business) {
                 switch (this._business) {
@@ -3052,6 +3065,9 @@ class VirtualTree {
                 node = node?.[0];
             }
             node = node || this._tree.treeNodeMap.get(params.id);
+            if (!node) {
+                throw Error('getDeviceIntegrated：找不到节点');
+            }
             return getAllDevice(node?.children || [], params);
         };
     })();

package/package.json

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