hy-virtual-tree 1.1.70 → 1.1.72

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Changelog
 
+### 1.1.72
+
+_2026-02-02_
+
+- 扩展[VirtualTree] 功能
+（1）修复树形的展开和选中逻辑问题，提取展开逻辑函数
+
+### 1.1.71
+
+_2026-01-31_
+
+- 扩展[VirtualTree] 功能
+（1）修复 channel业务下，设备下全部通道离线会导致设备的下拉选项隐藏问题
+（2）修复 tooltip 快速滚动导致不会隐藏问题
+
 ### 1.1.70
 
 _2026-01-31_

package/dist/index.js

@@ -6607,18 +6607,75 @@ const encryptToBase64 = (str) => {
 function base64Decrypt(str) {
     return CryptoJS.enc.Base64.parse(str).toString(CryptoJS.enc.Utf8);
 }
+/**
+ * @function generateRandomCode 生成随机码
+ * @description 随机生成包含小写字母和数字的随机码
+ * @param {Number} number 生成随机码的个数，默认为 13
+ * @returns {String}
+ */
+function generateRandomCode(number = 13) {
+    const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    const charCount = chars.length;
+    let randomString1 = '';
+    for (let i = 0; i < number; i++) {
+        const randomIndex = Math.floor(Math.random() * charCount);
+        randomString1 += chars[randomIndex];
+    }
+    return randomString1;
+}
 
+let btnBlurMap$1 = new Map();
+const btnBlurMapFn$1 = () => {
+    btnBlurMap$1.keys().forEach((key) => {
+        const fn = btnBlurMap$1.get(key);
+        fn && fn();
+    });
+    btnBlurMap$1 = new Map();
+};
+let isWheelListenerate$1 = false;
+let isScrolling$1 = false;
+let scrollTimer$1;
+const addWeelListenerate$1 = () => {
+    if (isWheelListenerate$1)
+        return;
+    window.addEventListener('wheel', (e) => {
+        btnBlurMapFn$1();
+        scrollTimer$1 && clearTimeout(scrollTimer$1);
+        isScrolling$1 = true;
+        scrollTimer$1 = setTimeout(() => {
+            isScrolling$1 = false;
+        }, 100);
+    });
+    isWheelListenerate$1 = true;
+};
+let focusTimer$1;
 const setElementFocus = (config) => {
-    const { container, trigger, onFocus, onBlur } = config;
+    addWeelListenerate$1();
+    const { container, trigger, openDelay, onFocus, onBlur } = config;
+    const id = generateRandomCode();
     let btn = document.createElement('button');
+    let isBlur = false;
     const btnFocus = () => {
-        btn.focus();
-        onFocus && onFocus();
+        btnBlurMapFn$1();
+        if (isScrolling$1)
+            return;
+        isBlur = false;
+        focusTimer$1 && clearTimeout(focusTimer$1);
+        focusTimer$1 = setTimeout(() => {
+            if (isBlur)
+                return;
+            btn.focus();
+            onFocus && onFocus();
+        }, openDelay || 0);
+        btnBlurMap$1.set(id, btnBlur);
     };
     const btnBlur = () => {
+        isBlur = true;
+        focusTimer$1 && clearTimeout(focusTimer$1);
         btn.blur();
-        onBlur && onBlur();
+        onBlur && onBlur(id);
     };
+    btn.addEventListener('blur', btnBlur);
     if (trigger === 'click') {
         container.addEventListener('click', btnFocus);
         btn.addEventListener('blur', btnBlur);
@@ -6900,8 +6957,111 @@ const setGlobalTreeConfig = (config, isReset = true) => {
     setGlobalVirtualTreeConfig(config.tree || {}, isReset);
 };
 
+let btnBlurMap = new Map();
+const btnBlurMapFn = () => {
+    btnBlurMap.keys().forEach((key) => {
+        const fn = btnBlurMap.get(key);
+        fn && fn();
+    });
+    btnBlurMap = new Map();
+};
+let isWheelListenerate = false;
+let isScrolling = false;
+let scrollTimer;
+const addWeelListenerate = () => {
+    if (isWheelListenerate)
+        return;
+    window.addEventListener('wheel', (e) => {
+        btnBlurMapFn();
+        scrollTimer && clearTimeout(scrollTimer);
+        isScrolling = true;
+        scrollTimer = setTimeout(() => {
+            isScrolling = false;
+        }, 100);
+    });
+    isWheelListenerate = true;
+};
+let focusTimer;
+class Trigger {
+    _id = generateRandomCode();
+    _btn = document.createElement('button');
+    _isBlur = true;
+    el;
+    bind;
+    _focus = () => { };
+    _blur = () => { };
+    trigger = 'hover';
+    openDelay = 200;
+    onFocus;
+    onBlur;
+    constructor(props) {
+        if (!props.bind || !isElement(props.bind) || !isElement(props.el)) {
+            throw Error('【参数错误】：请传入元素节点');
+        }
+        addWeelListenerate();
+        this._setConfig(props)
+            ._init();
+    }
+    _setConfig(config) {
+        const { el, bind, trigger, openDelay, onFocus, onBlur } = config;
+        this.el = el;
+        this.bind = bind;
+        this.trigger = ['click', 'hover'].includes(trigger) ? trigger : this.trigger;
+        this.openDelay = isNumber(openDelay) ? openDelay : this.openDelay;
+        this.onFocus = onFocus;
+        this.onBlur = onBlur;
+        return this;
+    }
+    _init() {
+        if (!this.bind || !this.el)
+            return;
+        this._isBlur = true;
+        this._focus = this.focus.bind(this);
+        this._blur = this.blur.bind(this);
+        if (this.trigger === 'click') {
+            this.bind.addEventListener('click', this._focus);
+            this._btn.addEventListener('blur', this._blur);
+        }
+        else {
+            this.bind.addEventListener('mouseenter', this._focus);
+            this.bind.addEventListener('mouseleave', this._blur);
+        }
+    }
+    focus() {
+        btnBlurMapFn();
+        if (isScrolling)
+            return;
+        this._isBlur = false;
+        focusTimer && clearTimeout(focusTimer);
+        focusTimer = setTimeout(() => {
+            if (this._isBlur)
+                return;
+            this._btn?.focus();
+            this.onFocus && this.onFocus();
+        }, this.openDelay || 0);
+        btnBlurMap.set(this._id, this._blur);
+    }
+    blur() {
+        this._isBlur = true;
+        focusTimer && clearTimeout(focusTimer);
+        this._btn?.blur();
+        this.onBlur && this.onBlur(this._id);
+    }
+    destroy() {
+        this._blur();
+        if (!this.bind)
+            return;
+        if (this.trigger === 'click') {
+            this.bind.removeEventListener('click', this._focus);
+        }
+        else {
+            this.bind.removeEventListener('mouseenter', this._focus);
+            this.bind.removeEventListener('mouseleave', this._blur);
+        }
+    }
+}
+
 let container;
-let closeActiveTooltip;
 const getContainer$1 = () => {
     if (container)
         return container;
@@ -6922,34 +7082,16 @@ const styleVar = {
     padding: '--hy-tooltip-padding',
     zIndex: '--hy-tooltip-z-index',
 };
-let isWheelListenerate = false;
-let isScrolling = false;
-let scrollTimer;
-const addWeelListenerate = () => {
-    if (isWheelListenerate)
-        return;
-    window.addEventListener('wheel', (e) => {
-        closeActiveTooltip && closeActiveTooltip();
-        closeActiveTooltip = null;
-        scrollTimer && clearTimeout(scrollTimer);
-        isScrolling = true;
-        scrollTimer = setTimeout(() => {
-            isScrolling = false;
-        }, 100);
-    });
-    isWheelListenerate = true;
-};
 class Tooltip {
     _el;
     _config;
-    _focus;
+    _trigger;
     _timer;
     _openTimer;
     _closeTimer;
     _style = getGlobalTooltipConfig().style;
     _isHover = false;
     constructor(props) {
-        addWeelListenerate();
         if (!props.bind || !isElement(props.bind))
             throw Error('【bind参数错误】：请传入元素节点');
         this._config = this._generateConfig(props);
@@ -6992,19 +7134,18 @@ class Tooltip {
             this.setPopper();
         });
         el.addEventListener('mouseleave', (e) => {
+            this._openTimer && clearTimeout(this._openTimer);
             this.setIsHover(false);
             this.hide();
         });
-        this._focus = setElementFocus({
-            container: bind,
+        this._trigger = new Trigger({
+            el: this._el,
+            bind: bind,
             trigger: this._config.trigger === 'click' ? 'click' : 'hover',
+            openDelay: this._config.openDelay || 0,
             onFocus: () => {
-                if (isScrolling) {
-                    return;
-                }
                 if (this.isHover)
                     return;
-                closeActiveTooltip && closeActiveTooltip();
                 if (!this._el || !this._config)
                     return;
                 if (this._config?.trigger === 'hover-overflow' && !isOverflowing(this._config.bind))
@@ -7025,10 +7166,10 @@ class Tooltip {
                     if (this._config?.autoClose && isNumber(this._config.autoClose)) {
                         this._timer && clearTimeout(this._timer);
                         this._timer = setTimeout(() => {
-                            this._focus && this._focus.blur();
+                            this._trigger && this._trigger.blur();
                         }, this._config?.autoClose);
                     }
-                }, this._config.openDelay || 0);
+                }, 200);
             },
             onBlur: () => {
                 if (this.isHover)
@@ -7083,7 +7224,6 @@ class Tooltip {
                 this._el.style.setProperty('left', `${left + width + offset}px`);
                 break;
         }
-        closeActiveTooltip = this.hide.bind(this);
     }
     hide() {
         this._openTimer && clearTimeout(this._openTimer);
@@ -7105,8 +7245,9 @@ class Tooltip {
         }, 200);
     }
     destroy() {
+        this.hide();
         this._timer && clearTimeout(this._timer);
-        this._focus && this._focus.destroy();
+        this._trigger && this._trigger.destroy();
         this._config = undefined;
     }
 }
@@ -7973,6 +8114,14 @@ const isCheckLeaf = (config, node) => {
     }
     return node.isLeaf;
 };
+const isExpandLeaf = (config, node) => {
+    // 非通道业务 或 非设备类型
+    if (config.business !== Business.CHANNEL || node.data.dataType !== DataType.DEVICE) {
+        return node.isLeaf;
+    }
+    // 设备类型
+    return config.businessConfig?.showOnlineState ? !node.count : !node.total;
+};
 function useCheck(props, instance) {
     const tree = instance._tree;
     const checkedKeys = new Set();
@@ -9517,7 +9666,7 @@ class VirtualTree {
                 const icon = document.createElement('div');
                 icon.classList.add('hy-tree-node__expand-icon');
                 el.appendChild(icon);
-                if (isCheckLeaf(config, item) || this._hiddenExpandIconKeySet.has(item.key)) {
+                if (isExpandLeaf(config, item) || this._hiddenExpandIconKeySet.has(item.key)) {
                     el.style.setProperty('visibility', 'hidden');
                 }
                 else {
@@ -9686,7 +9835,7 @@ class VirtualTree {
                         if (config.onNodeClick) {
                             await config.onNodeClick(getNodeData(item), item, e);
                         }
-                        const isLeaf = isCheckLeaf(config, item);
+                        const isLeaf = isExpandLeaf(config, item);
                         if (!getDisabled(config, item) && isShowSelect(config, item)) {
                             if (config.checkOnClickNode) {
                                 toggleCheckbox(item, !(isChecked(item) || isIndeterminate(item)), true, true);
@@ -9736,6 +9885,7 @@ class VirtualTree {
                         nodeClickTimer = setTimeout(() => {
                             if (nodeClickCount === 1) {
                                 nodeClickHandle(e);
+                                nodeClickCount = 0;
                             }
                             else {
                                 nodeClickCount = 0;
@@ -10127,4 +10277,4 @@ class VirtualTree {
     };
 }
 
-export { Business, DataType, DeviceStatus, VirtualScroll, VirtualTree, base64Decrypt, cloneDeep, encryptToBase64, getGlobalDeviceConfig, getGlobalTooltipConfig, getGlobalTreeConfig, getGlobalVirtualTreeConfig, isArray, isBoolean, isElement, isEmpty, isFunction, isNull, isNumber, isObject, isOverflowing, isString, isUndefined, mergeDeep, setElementFocus, setGlobalDeviceConfig, setGlobalTooltipConfig, setGlobalTreeConfig, setGlobalVirtualTreeConfig };
+export { Business, DataType, DeviceStatus, VirtualScroll, VirtualTree, base64Decrypt, cloneDeep, encryptToBase64, generateRandomCode, getGlobalDeviceConfig, getGlobalTooltipConfig, getGlobalTreeConfig, getGlobalVirtualTreeConfig, isArray, isBoolean, isElement, isEmpty, isFunction, isNull, isNumber, isObject, isOverflowing, isString, isUndefined, mergeDeep, setElementFocus, setGlobalDeviceConfig, setGlobalTooltipConfig, setGlobalTreeConfig, setGlobalVirtualTreeConfig };

package/package.json

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