hy-virtual-tree 1.1.8 → 1.1.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Changelog
 
+### 1.1.10
+
+_2025-08-29_
+
+- 扩展[VirtualTree] 功能
+（1）对通过 filter 方法隐藏的节点不做勾选处理
+（2）修复renderContent的样式问题
+
+### 1.1.9
+
+_2025-08-28_
+
+- 扩展[VirtualTree] 功能
+（1）修改 props.showStatus 默认参数为false，并设置关闭 props.showStatus 时，也会一并关闭设备状态样式
+（2）cs业务类型添加图标
+（3）删除设备内置禁用业务逻辑，改为由外部自定义传入
+
 ### 1.1.8
 
 _2025-08-27_
@@ -13,7 +30,7 @@ _2025-08-27_
 
 - 扩展[VirtualTree] 功能
 （1）添加设备类型业务的默认图标
-（2）添加placeholderColor离线字体颜色
+（2）添加 placeholderColor 离线字体颜色
 （3）修复节点布局被挤压
 （4）添加节点禁止点击手势
 
@@ -60,6 +77,7 @@ _2025-08-19_
 （1）添加 群组设备业务逻辑
 （2）添加renderItem、renderContent、renderRight配置
 （3）setChecked、setCheckedKeys添加isBusiness参数，可用业务id设置选中
+（4）添加 props.showStatus 配置
 
 ### 1.1.1
 

package/dist/index.css

@@ -266,6 +266,9 @@
 .hy-tree .hy-tree-icon {
   margin-right: 4px;
   flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .hy-tree .hy-tree-node__content {
   white-space: nowrap;

package/dist/index.js

@@ -417,7 +417,7 @@ const useConfig = (config) => {
         showCount: false,
         total: 'total',
         count: 'count',
-        showStatus: true
+        showStatus: false
     }, config.props);
     let rowSelection = Object.assign({
         type: 'checkbox',
@@ -450,7 +450,7 @@ const useConfig = (config) => {
         props = {
             class: '',
             disabled: 'disabled',
-            showStatus: true,
+            showStatus: false,
             showCount: (data) => data.dataType !== 3,
             ...(config.props || {}),
             value: 'onlyId',
@@ -639,18 +639,6 @@ const getDisabled = (config, node) => {
     if (isFunction(disabled))
         return disabled(node.data, node);
 };
-const getDisabledCheck = (config, node) => {
-    const { business } = config;
-    const { disabled } = config.props;
-    let isDisabled = false;
-    if (['device', 'groupDevice'].includes(`${business}`)) {
-        isDisabled = ((data, node) => data.dataType !== 3 && !node.total)(node.data, node);
-    }
-    if (isString(disabled))
-        return isDisabled || node.data[disabled];
-    if (isFunction(disabled))
-        return isDisabled || disabled(node.data, node);
-};
 function useCheck(props, tree) {
     const checkedKeys = new Set();
     let indeterminateKeys = new Set();
@@ -703,7 +691,7 @@ function useCheck(props, tree) {
     };
     const isChecked = (node) => checkedKeys.has(node.key);
     const isIndeterminate = (node) => indeterminateKeys.has(node.key);
-    const toggleCheckbox = (node, isChecked, nodeClick = true, immediateUpdate = true, checkOnDbclick = false) => {
+    const toggleCheckbox = (node, isChecked, nodeClick = true, immediateUpdate = true, checkOnDbclick = false, hiddenNodeKeySet = new Set()) => {
         const { type, checkStrictly, cancelable } = props.rowSelection;
         const checkedKeySet = checkedKeys;
         // 单选
@@ -719,11 +707,14 @@ function useCheck(props, tree) {
         }
         // 多选
         const toggle = (node, checked) => {
+            // 对隐藏的节点不做处理
+            if (hiddenNodeKeySet.has(node.key))
+                return;
             checkedKeySet[checked ? 'add' : 'delete'](node.key);
             const children = node.children;
             if ((!checkStrictly || checkOnDbclick) && children) {
                 children.forEach((childNode) => {
-                    if (!getDisabledCheck(props, childNode)) {
+                    if (!getDisabled(props, childNode)) {
                         toggle(childNode, checked);
                     }
                 });
@@ -1113,6 +1104,8 @@ var walkieTalkie_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbm
 
 var walkieTalkie_offLine_svg = 'data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8"?>
<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
        <g id="walkieTalkie_offLine" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <path d="M10.9000598,18.9157884 C10.6187024,18.9157884 10.3895609,19.1359757 10.3895609,19.4094188 C10.3895609,19.6816637 10.6187024,19.9014109 10.9000598,19.9014109 C11.1818228,19.9014109 11.4117247,19.6816637 11.4117247,19.4094188 C11.4117501,19.1359757 11.1818228,18.9157884 10.9000598,18.9157884 Z M10.9000598,17.061447 C10.6187024,17.061447 10.3895609,17.2812676 10.3895609,17.5542949 C10.3895609,17.8272978 10.6187024,18.046287 10.9000598,18.046287 C11.1818228,18.046287 11.4117247,17.8272978 11.4117247,17.5542949 C11.4117501,17.281292 11.1818228,17.061447 10.9000598,17.061447 Z M13.0125217,20.7721104 C12.7320261,20.7721104 12.5020734,20.9919065 12.5020734,21.2649094 C12.5020734,21.5375455 12.7319754,21.7569748 13.012547,21.7569748 C13.2946902,21.7569748 13.5234008,21.5375455 13.5234008,21.2649094 C13.5233755,20.9919065 13.2946902,20.7721104 13.012547,20.7721104 L13.0125217,20.7721104 Z M13.0125217,18.9157884 C12.7320261,18.9157884 12.5020734,19.1359757 12.5020734,19.4094188 C12.5020734,19.6816637 12.7319754,19.9014109 13.012547,19.9014109 C13.2946902,19.9014109 13.5234008,19.6816637 13.5234008,19.4094188 C13.5233755,19.1359757 13.2946902,18.9157884 13.012547,18.9157884 L13.0125217,18.9157884 Z M11.3584443,10.8020882 L14.152374,10.8020882 C14.3058026,10.8020882 14.431653,10.6819082 14.431653,10.5327041 C14.431653,10.3838668 14.3058026,10.2632956 14.152374,10.2632956 L11.3584189,10.2632956 C11.2046102,10.2632956 11.0791654,10.3838668 11.0791654,10.5327041 C11.0791654,10.6819082 11.2046356,10.8020882 11.3584189,10.8020882 L11.3584443,10.8020882 Z M10.9000852,20.7721104 C10.6187278,20.7721104 10.3895862,20.9919065 10.3895862,21.2649094 C10.3895862,21.5375455 10.6187278,21.7569748 10.9000852,21.7569748 C11.1818481,21.7569748 11.4117501,21.5375455 11.4117501,21.2649094 C11.4117754,20.9919065 11.1818481,20.7721104 10.9000852,20.7721104 Z M9.68287218,12.6910776 L15.6411096,12.6910776 L15.6411096,14.3925227 L9.68287218,14.3925227 L9.68287218,12.6910531 L9.68287218,12.6910776 Z M13.012547,17.061447 C12.7320514,17.061447 12.5020988,17.2812676 12.5020988,17.5542949 C12.5020988,17.8272978 12.7320007,18.046287 13.0125724,18.046287 C13.2947156,18.046287 13.5234262,17.8272978 13.5234262,17.5542949 C13.5234008,17.281292 13.2947156,17.061447 13.0125724,17.061447 L13.012547,17.061447 Z M15.1262762,17.061447 C14.8445133,17.061447 14.6145606,17.2812676 14.6145606,17.5542949 C14.6145606,17.8272978 14.8444626,18.046287 15.1262762,18.046287 C15.4076337,18.046287 15.6362936,17.8272978 15.6362936,17.5542949 C15.6362936,17.281292 15.4076337,17.061447 15.1262762,17.061447 Z M15.1262762,18.9157884 C14.8445133,18.9157884 14.6145606,19.1359757 14.6145606,19.4094188 C14.6145606,19.6816637 14.8444626,19.9014109 15.1262762,19.9014109 C15.4076337,19.9014109 15.6362936,19.6816637 15.6362936,19.4094188 C15.6362936,19.1359757 15.4076337,18.9157884 15.1262762,18.9157884 Z M15.1262762,20.7721104 C14.8445133,20.7721104 14.6145606,20.9919065 14.6145606,21.2649094 C14.6145606,21.5375455 14.8444626,21.7569748 15.1262762,21.7569748 C15.4076337,21.7569748 15.6362936,21.5375455 15.6362936,21.2649094 C15.6362936,20.9919065 15.4076337,20.7721104 15.1262762,20.7721104 Z M13.8371524,6.31153874 L13.8371524,5.77233049 C13.8371524,5.47428907 13.5871245,5.23353791 13.2790254,5.23353791 C12.9700899,5.23353791 12.720493,5.47428907 12.720493,5.77233049 L12.720493,6.850747 L13.8371524,6.850747 L13.8371524,6.31153874 Z M15.9328849,6.31153874 L15.9328849,5.77233049 C15.9328849,5.47428907 15.6824514,5.23353791 15.3738961,5.23353791 C15.0653662,5.23353791 14.8157945,5.47428907 14.8157945,5.77233049 L14.8157945,6.850747 L15.9328595,6.850747 L15.9328595,6.31153874 L15.9328849,6.31153874 Z M15.6249632,7.74841675 L11.3089406,7.74841675 L11.3089406,5.56943052 L10.93727,5.56943052 L10.93727,2.53874367 C10.93727,2.24194929 10.6864563,2 10.3787375,2 C10.069802,2 9.8198248,2.24194929 9.8198248,2.53874367 L9.8198248,5.56943052 L9.42432753,5.56943052 L9.42432753,7.92865002 L9.4552515,7.92865002 C8.60197812,8.2779177 8,9.09377216 8,10.0398562 L8,14.2505563 C8,14.9776512 8.35704509,15.6262073 8.90883513,16.046776 C8.90883513,16.0512018 8.90804936,16.0568501 8.90804936,16.0609091 L8.90804936,21.7085116 C8.90804936,21.8807492 8.92812459,22.0486344 8.96591773,22.2102599 C9.20469132,23.2315573 10.1554005,24 11.2830354,24 L14.7181813,24 C15.8450811,24 16.7957396,23.2315573 17.0344878,22.2102599 C17.07299,22.0455955 17.0923987,21.8773128 17.0923562,21.7085116 L17.0923562,16.0609091 C17.0923562,16.0568501 17.091976,16.0512018 17.091976,16.046776 C17.6437914,15.6262073 18,14.9776512 18,14.2505563 L18,10.0398807 C18,8.77961709 16.9314248,7.7483923 15.6249632,7.7483923 L15.6249632,7.74841675 Z M11.3584189,10.2632956 L14.1523487,10.2632956 C14.3057772,10.2632956 14.4316276,10.3838668 14.4316276,10.5327041 C14.4316276,10.6819082 14.3057772,10.8020882 14.1523487,10.8020882 L11.3584189,10.8020882 C11.2046102,10.8020882 11.0791654,10.6819082 11.0791654,10.5327041 C11.0791654,10.3838668 11.2046356,10.2632956 11.3584189,10.2632956 Z M10.9000598,21.7569259 C10.6187024,21.7569259 10.3895609,21.5374966 10.3895609,21.2648605 C10.3895609,20.9918576 10.6187024,20.7720615 10.9000598,20.7720615 C11.1818228,20.7720615 11.4117247,20.9918576 11.4117247,21.2648605 C11.4117501,21.5375211 11.1818228,21.7569259 10.9000598,21.7569259 Z M10.9000598,19.9013864 C10.6187024,19.9013864 10.3895609,19.6816392 10.3895609,19.4093943 C10.3895609,19.1359757 10.6187024,18.915764 10.9000598,18.915764 C11.1818228,18.915764 11.4117247,19.1359513 11.4117247,19.4093943 C11.4117501,19.6815903 11.1818228,19.9013864 10.9000598,19.9013864 Z M10.9000598,18.0462626 C10.6187024,18.0462626 10.3895609,17.8272734 10.3895609,17.5542705 C10.3895609,17.2812676 10.6187024,17.0614226 10.9000598,17.0614226 C11.1818228,17.0614226 11.4117247,17.2812431 11.4117247,17.5542705 C11.4117501,17.8272734 11.1818228,18.0462626 10.9000598,18.0462626 Z M13.0125217,21.7569259 C12.7320261,21.7569259 12.5020734,21.5374966 12.5020734,21.2648605 C12.5020734,20.9918576 12.7319754,20.7720615 13.012547,20.7720615 C13.2946902,20.7720615 13.5234008,20.9918576 13.5234008,21.2648605 C13.5233755,21.5375211 13.2946902,21.7569259 13.012547,21.7569259 L13.0125217,21.7569259 Z M13.0125217,19.9013864 C12.7320261,19.9013864 12.5020734,19.6816392 12.5020734,19.4093943 C12.5020734,19.1359757 12.7319754,18.915764 13.012547,18.915764 C13.2946902,18.915764 13.5234008,19.1359513 13.5234008,19.4093943 C13.5233755,19.6815903 13.2946902,19.9013864 13.012547,19.9013864 L13.0125217,19.9013864 Z M13.0125217,18.0462626 C12.7320261,18.0462626 12.5020734,17.8272734 12.5020734,17.5542705 C12.5020734,17.2812676 12.7319754,17.0614226 13.012547,17.0614226 C13.2946902,17.0614226 13.5234008,17.2812431 13.5234008,17.5542705 C13.5233755,17.8272734 13.2946902,18.0462626 13.012547,18.0462626 L13.0125217,18.0462626 Z M15.1262509,21.7569259 C14.8444879,21.7569259 14.6145353,21.5374966 14.6145353,21.2648605 C14.6145353,20.9918576 14.8444372,20.7720615 15.1262509,20.7720615 C15.4076083,20.7720615 15.6362682,20.9918576 15.6362682,21.2648605 C15.6362682,21.5375211 15.4076083,21.7569259 15.1262509,21.7569259 Z M15.1262509,19.9013864 C14.8444879,19.9013864 14.6145353,19.6816392 14.6145353,19.4093943 C14.6145353,19.1359757 14.8444372,18.915764 15.1262509,18.915764 C15.4076083,18.915764 15.6362682,19.1359513 15.6362682,19.4093943 C15.6362682,19.6815903 15.4076083,19.9013864 15.1262509,19.9013864 Z M15.1262509,18.0462626 C14.8444879,18.0462626 14.6145353,17.8272734 14.6145353,17.5542705 C14.6145353,17.2812676 14.8444372,17.0614226 15.1262509,17.0614226 C15.4076083,17.0614226 15.6362682,17.2812431 15.6362682,17.5542705 C15.6362682,17.8272734 15.4076083,18.0462626 15.1262509,18.0462626 Z M15.6410589,14.3924982 L9.68287218,14.3924982 L9.68287218,12.6910287 L15.6410589,12.6910287 L15.6410589,14.3924982 Z" id="形状" fill="#88919B" fill-rule="nonzero"></path>
    </g>
</svg>';
 
+var menu_acquisitionStation_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNDRweCIgaGVpZ2h0PSIzOHB4IiB2aWV3Qm94PSIwIDAgNDQgMzgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8ZyBpZD0iY2Fpaml6aGFuIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0iI0ZGRkZGRiIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMzIuODAwNTQ4MywzIEMzNC4yMzIzMTY4LDMuMDA0MTc4NzIgMzUuNDAyNDEwMiw0LjEwNTM5MjY1IDM1LjQ5NDIxMTksNS40OTcyNTgwNCBMMzUuNSw1LjY2NTYyNTQxIEwzNS41LDMyLjMzNDM3NDYgQzM1LjQ5NTc2ODMsMzMuNzQ4MjAxOSAzNC4zODA1ODAxLDM0LjkwMzYzMzEgMzIuOTcxMDUyMiwzNC45OTQyODQ0IEwzMi44MDA1NDgzLDM1IEwxMS4xOTk0NTE3LDM1IEM5Ljc2NzY4MzE5LDM0Ljk5NTgyMTMgOC41OTc1ODk4MSwzMy44OTQ2MDczIDguNTA1Nzg4MTQsMzIuNTAyNzQyIEw4LjUsMzIuMzM0Mzc0NiBMOC41LDUuNjY1NjI1NDEgQzguNTA0MjMxNzUsNC4yNTE3OTgxMiA5LjYxOTQxOTg3LDMuMDk2MzY2OTMgMTEuMDI4OTQ3OCwzLjAwNTcxNTYxIEwxMS4xOTk0NTE3LDMgTDMyLjgwMDU0ODMsMyBaIE0yNC43MTM2MzY0LDE5Ljg4ODg4ODkgTDEzLjg4NjM2MzYsMTkuODg4ODg4OSBDMTMuNDM0NDk0MywxOS44ODg4ODg5IDEzLjA2MTYwMDUsMjAuMjI3MDIzNSAxMy4wMDY5MDYsMjAuNjY0MDY5IEwxMywyMC43NzUyNTI1IEwxMywyMi41NTgwODA4IEMxMywyMy4wMDk5NTAxIDEzLjMzODEzNDYsMjMuMzgyODQzOSAxMy43NzUxODAxLDIzLjQzNzUzODQgTDEzLjg4NjM2MzYsMjMuNDQ0NDQ0NCBMMjQuNzEzNjM2NCwyMy40NDQ0NDQ0IEMyNS4xNjU1MDU3LDIzLjQ0NDQ0NDQgMjUuNTM4Mzk5NSwyMy4xMDYzMDk4IDI1LjU5MzA5NCwyMi42NjkyNjQ0IEwyNS42LDIyLjU1ODA4MDggTDI1LjYsMjAuNzc1MjUyNSBDMjUuNiwyMC4yODU3Mjc0IDI1LjIwMzE2MTUsMTkuODg4ODg4OSAyNC43MTM2MzY0LDE5Ljg4ODg4ODkgWiBNMzAuMTEzNjM2NCwxOS44ODg4ODg5IEwyOC4yODYzNjM2LDE5Ljg4ODg4ODkgQzI3LjgzNDQ5NDMsMTkuODg4ODg4OSAyNy40NjE2MDA1LDIwLjIyNzAyMzUgMjcuNDA2OTA2LDIwLjY2NDA2OSBMMjcuNCwyMC43NzUyNTI1IEwyNy40LDIyLjU1ODA4MDggQzI3LjQsMjMuMDA5OTUwMSAyNy43MzgxMzQ2LDIzLjM4Mjg0MzkgMjguMTc1MTgwMSwyMy40Mzc1Mzg0IEwyOC4yODYzNjM2LDIzLjQ0NDQ0NDQgTDMwLjExMzYzNjQsMjMuNDQ0NDQ0NCBDMzAuNTY1NTA1NywyMy40NDQ0NDQ0IDMwLjkzODM5OTUsMjMuMTA2MzA5OCAzMC45OTMwOTQsMjIuNjY5MjY0NCBMMzEsMjIuNTU4MDgwOCBMMzEsMjAuNzc1MjUyNSBDMzEsMjAuMjg1NzI3NCAzMC42MDMxNjE1LDE5Ljg4ODg4ODkgMzAuMTEzNjM2NCwxOS44ODg4ODg5IFogTTMxLjAyNzI3MjcsNi41NTU1NTU1NiBMMTIuOTcyNzI3Myw2LjU1NTU1NTU2IEMxMi4wNDI2Mjk1LDYuNTU1NTU1NTYgMTEuMjc5ODMxMSw3LjI3MTg0OTA4IDExLjIwNTg3NjUsOC4xODI4OTE2MyBMMTEuMiw4LjMyODI4MjgzIEwxMS4yLDE1LjQ0OTQ5NDkgQzExLjIsMTYuMzc5NTkyNyAxMS45MTYyOTM1LDE3LjE0MjM5MTEgMTIuODI3MzM2MSwxNy4yMTYzNDU3IEwxMi45NzI3MjczLDE3LjIyMjIyMjIgTDMxLjAyNzI3MjcsMTcuMjIyMjIyMiBDMzEuOTU3MzcwNSwxNy4yMjIyMjIyIDMyLjcyMDE2ODksMTYuNTA1OTI4NyAzMi43OTQxMjM1LDE1LjU5NDg4NjEgTDMyLjgsMTUuNDQ5NDk0OSBMMzIuOCw4LjMyODI4MjgzIEMzMi44LDcuMzQ5MjMyNTkgMzIuMDA2MzIzLDYuNTU1NTU1NTYgMzEuMDI3MjcyNyw2LjU1NTU1NTU2IFogTTI4LjMxMzYzNjQsMTAuMTExMTExMSBDMjguODAzMTYxNSwxMC4xMTExMTExIDI5LjIsMTAuNTA3OTQ5NiAyOS4yLDEwLjk5NzQ3NDggTDI5LjIsMTIuNzgwMzAzIEMyOS4yLDEzLjI2OTgyODEgMjguODAzMTYxNSwxMy42NjY2NjY3IDI4LjMxMzYzNjQsMTMuNjY2NjY2NyBMMTUuNjg2MzYzNiwxMy42NjY2NjY3IEMxNS4xOTY4Mzg1LDEzLjY2NjY2NjcgMTQuOCwxMy4yNjk4MjgxIDE0LjgsMTIuNzgwMzAzIEwxNC44LDEwLjk5NzQ3NDggQzE0LjgsMTAuNTA3OTQ5NiAxNS4xOTY4Mzg1LDEwLjExMTExMTEgMTUuNjg2MzYzNiwxMC4xMTExMTExIEwyOC4zMTM2MzY0LDEwLjExMTExMTEgWiIgaWQ9IuW9oueKtue7k+WQiOWkh+S7vSIgZmlsbD0iI0ZGRkZGRiIgZmlsbC1ydWxlPSJub256ZXJvIj48L3BhdGg+CiAgICA8L2c+Cjwvc3ZnPg==';
+
 const svgMap = {
     workCard_svg,
     workCard_offLine_svg,
@@ -1143,7 +1136,8 @@ const svgMap = {
     vehicle_svg,
     vehicle_offLine_svg,
     walkieTalkie_svg,
-    walkieTalkie_offLine_svg
+    walkieTalkie_offLine_svg,
+    menu_acquisitionStation_svg
 };
 
 class Icon {
@@ -1208,7 +1202,7 @@ const useStatus = (config, data, node) => {
         return el;
     }
 };
-function checkDeviceTypeFn(deviceType, onlineState) {
+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}
     const deviceTypeMap = {
         1: 'lawEnforcement',
@@ -1228,15 +1222,18 @@ function checkDeviceTypeFn(deviceType, onlineState) {
         15: 'lawEnforcementV2',
         17: 'smartwatch'
     };
-    const svgName = deviceTypeMap[deviceType] || 'walkieTalkie';
-    return `${svgName}${onlineState === 1 ? '' : '_offLine'}`;
+    const svgName = deviceTypeMap[data.type] || 'walkieTalkie';
+    return `${svgName}${data.onlineState === 1 || !config.props.showStatus ? '' : '_offLine'}`;
 }
 const useIcon = (config, data, node) => {
-    if (['device', 'groupDevice'].includes(config.business) && data.dataType === 3) {
+    if ((['device', 'groupDevice'].includes(config.business) && data.dataType === 3)) {
         return new Icon({
-            svgName: checkDeviceTypeFn(data.type, data.onlineState) + '_svg'
+            svgName: checkDeviceTypeFn(config, data) + '_svg'
         });
     }
+    else if ((config.business === 'cs' && data.dataType === 8)) {
+        return new Icon({ svgName: 'menu_acquisitionStation_svg' });
+    }
 };
 
 function decodeBase64(base64, enableUnicode) {
@@ -1704,7 +1701,6 @@ class VirtualTree {
                 if (renderContent)
                     return renderContent(data, item);
                 const el = document.createElement('div');
-                el.classList.add('hy-tree-node__content');
                 if (item.label) {
                     el.innerHTML = item.label;
                 }
@@ -1802,13 +1798,16 @@ class VirtualTree {
                     if (type === 'checkbox') {
                         const checkbox = new Checkbox({
                             checked: isChecked(item),
-                            disabled: getDisabledCheck(config, item),
+                            disabled: getDisabled(config, item),
                             indeterminate: isIndeterminate(item),
                             onClick: () => {
-                                if (getDisabledCheck(config, item))
+                                if (getDisabled(config, item))
                                     return;
                                 item.checkedMark = !(isChecked(item) || item.checkedMark);
-                                toggleCheckbox(item, item.checkedMark, true, true);
+                                toggleCheckbox(item, item.checkedMark, true, true, false, this._hiddenNodeKeySet);
+                                if (isChecked(item) || isIndeterminate(item)) {
+                                    item.checkedMark = true;
+                                }
                                 this.refresh();
                             }
                         });
@@ -1817,7 +1816,7 @@ class VirtualTree {
                     else if (type === 'radio') {
                         const radio = new Radio({
                             checked: isChecked(item),
-                            disabled: getDisabledCheck(config, item),
+                            disabled: getDisabled(config, item),
                             onClick: () => {
                                 const checked = config.rowSelection.cancelable ? !isChecked(item) : true;
                                 toggleCheckbox(item, checked, true, false);
@@ -1836,7 +1835,7 @@ class VirtualTree {
                     // 图标
                     customRender(generateIcon, item, content, 'hy-tree-icon');
                     // 内容
-                    customRender(generateContent, item, content);
+                    customRender(generateContent, item, content, 'hy-tree-node__content');
                     // 统计
                     customRender(generateStats, item, content);
                     // 右侧内容
@@ -1846,7 +1845,7 @@ class VirtualTree {
                 let nodeClickTimer;
                 let nodeClickCount = 0;
                 const nodeClickHandle = (e) => {
-                    if (!getDisabledCheck(config, item) && (isBoolean(showSelect)
+                    if (!getDisabled(config, item) && (isBoolean(showSelect)
                         ? showSelect
                         : isFunction(showSelect) && showSelect(item.data, item))) {
                         if (config.checkOnClickNode) {
@@ -1870,7 +1869,7 @@ class VirtualTree {
                 };
                 // 鼠标左键点击事件
                 nodeContainer.addEventListener('click', (e) => {
-                    if (getDisabledCheck(config, item) ||
+                    if (getDisabled(config, item) ||
                         item.isLeaf ||
                         !config.checkOnDblclickParentNode) {
                         nodeClickHandle(e);
@@ -1890,7 +1889,7 @@ class VirtualTree {
                 });
                 // 鼠标左键双击事件
                 nodeContainer.addEventListener('dblclick', (e) => {
-                    if (getDisabledCheck(config, item) ||
+                    if (getDisabled(config, item) ||
                         item.isLeaf ||
                         !config.checkOnDblclickParentNode) {
                         return;

package/package.json

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