hy-virtual-tree 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+### 2.1.3
+
+_2026-05-20_
+
+（1）filterExpandModel 参数新增 result 选项，实时过滤后只展开符合条件的数据
+
+### 2.1.2
+
+_2026-05-20_
+
+（1）修复 调用setChecked方法时 checkStrictly配置 不生效问题
+
 ### 2.1.1
 
 _2026-05-16_

package/dist/index.js

@@ -1,4 +1,4 @@
-/* hy-virtual-tree v2.1.1 */
+/* hy-virtual-tree v2.1.3 */
 import './svg_bundle.js';
 const isString = (e) => typeof e === 'string';
 const isNumber = (e) => typeof e === 'number';
@@ -8449,7 +8449,7 @@ function useCheck(props, instance) {
         if (!isBusiness || !props.business) {
             const node = treeNodeMap.get(key);
             if (node) {
-                toggleCheckbox(node, isChecked, false, true, true, isForce);
+                toggleCheckbox(node, isChecked, false, true, false, isForce);
             }
             return;
         }
@@ -8691,6 +8691,7 @@ function useFilter(config, filterMethod, tree = {
         const isCountFiler = countFilter && isFunction(countFilter);
         const isTotalFiler = totalFilter && isFunction(totalFilter);
         const expandKeySet = new Set();
+        const resultExpandKeySet = new Set();
         const hiddenExpandIconKeys = hiddenExpandIconKeySet;
         const hiddenKeys = hiddenNodeKeySet;
         const family = [];
@@ -8699,8 +8700,12 @@ function useFilter(config, filterMethod, tree = {
         function traverse(nodes, isShow = false) {
             let count = 0;
             let total = 0;
+            let hasFilterResult = false;
             nodes.forEach((node) => {
                 family.push(node);
+                if (!hasFilterResult) {
+                    hasFilterResult = !!(filterMethod && filterMethod(params, node.data, node));
+                }
                 if (isShow || (filterMethod && filterMethod(params, node.data, node))) {
                     family.forEach((member) => {
                         expandKeySet.add(member.key);
@@ -8711,11 +8716,15 @@ function useFilter(config, filterMethod, tree = {
                 }
                 const children = node.children;
                 if (children) {
-                    const { count: childCount, total: childTotal } = traverse(children, filterAll ? false : expandKeySet.has(node.key));
+                    const { count: childCount, total: childTotal, hasFilterResult: childHasFilterResult } = traverse(children, filterAll ? false : expandKeySet.has(node.key));
                     node.count = isCountFiler ? childCount : getCount(node);
                     node.total = isTotalFiler ? childTotal : getTotal(node);
                     count += childCount;
                     total += childTotal;
+                    hasFilterResult = hasFilterResult || childHasFilterResult;
+                    if (childHasFilterResult) {
+                        resultExpandKeySet.add(node.key);
+                    }
                 }
                 else if (!hiddenKeys.has(node.key)) {
                     node.count = 0;
@@ -8752,10 +8761,10 @@ function useFilter(config, filterMethod, tree = {
                 }
                 family.pop();
             });
-            return { count, total };
+            return { count, total, hasFilterResult };
         }
         traverse(nodes);
-        return expandKeySet;
+        return { expandKeySet, resultExpandKeySet };
     }
     // 通道过滤方法
     function channelFilter(params, filterAll = true) {
@@ -8766,6 +8775,7 @@ function useFilter(config, filterMethod, tree = {
         const isCountFiler = countFilter && isFunction(countFilter);
         const isTotalFiler = totalFilter && isFunction(totalFilter);
         const expandKeySet = new Set();
+        const resultExpandKeySet = new Set();
         const hiddenExpandIconKeys = hiddenExpandIconKeySet;
         const hiddenKeys = hiddenNodeKeySet;
         const family = [];
@@ -8780,9 +8790,13 @@ function useFilter(config, filterMethod, tree = {
         function traverse(nodes, isShow = false) {
             let count = 0;
             let total = 0;
+            let hasFilterResult = false;
             nodes.forEach((node) => {
                 const isLeaf = isFilterLeaf(node);
                 family.push(node);
+                if (!hasFilterResult) {
+                    hasFilterResult = !!(filterMethod && filterMethod(params, node.data, node));
+                }
                 if (isShow || (filterMethod && filterMethod(params, node.data, node))) {
                     family.forEach((member) => {
                         expandKeySet.add(member.key);
@@ -8794,11 +8808,15 @@ function useFilter(config, filterMethod, tree = {
                 const children = node.children;
                 if (children) {
                     if (!isLeaf) {
-                        const { count: childCount, total: childTotal } = traverse(children, filterAll ? false : expandKeySet.has(node.key));
+                        const { count: childCount, total: childTotal, hasFilterResult: childHasFilterResult } = traverse(children, filterAll ? false : expandKeySet.has(node.key));
                         node.count = isCountFiler ? childCount : getCount(node);
                         node.total = isTotalFiler ? childTotal : getTotal(node);
                         count += childCount;
                         total += childTotal;
+                        hasFilterResult = hasFilterResult || childHasFilterResult;
+                        if (childHasFilterResult) {
+                            resultExpandKeySet.add(node.key);
+                        }
                     }
                     // 拥有道通的设备
                     else if (!hiddenKeys.has(node.key) && node.data.dataType === DataType.DEVICE && !node.isLeaf) {
@@ -8845,10 +8863,10 @@ function useFilter(config, filterMethod, tree = {
                 }
                 family.pop();
             });
-            return { count, total };
+            return { count, total, hasFilterResult };
         }
         traverse(nodes);
-        return expandKeySet;
+        return { expandKeySet, resultExpandKeySet };
     }
     // group业务过滤方法
     function doGroupFilter(params, filterAll = true) {
@@ -8857,6 +8875,7 @@ function useFilter(config, filterMethod, tree = {
         }
         useHandleFun(config);
         const expandKeySet = new Set();
+        const resultExpandKeySet = new Set();
         const hiddenExpandIconKeys = hiddenExpandIconKeySet;
         const hiddenKeys = hiddenNodeKeySet;
         const family = [];
@@ -8865,8 +8884,12 @@ function useFilter(config, filterMethod, tree = {
         function traverse(nodes, isShow = false) {
             let count = 0;
             let total = 0;
+            let hasFilterResult = false;
             nodes.forEach((node) => {
                 family.push(node);
+                if (!hasFilterResult) {
+                    hasFilterResult = !!(filterMethod && filterMethod(params, node.data, node));
+                }
                 // if (tree.hiddenNodeKeySet.has(node.key)) return
                 if (isShow || (filterMethod && filterMethod(params, node.data, node))) {
                     family.forEach((member) => {
@@ -8878,11 +8901,15 @@ function useFilter(config, filterMethod, tree = {
                 }
                 const children = node.children;
                 if (children) {
-                    const { count: childCount, total: childTotal } = traverse(children, filterAll ? false : expandKeySet.has(node.key));
+                    const { count: childCount, total: childTotal, hasFilterResult: childHasFilterResult } = traverse(children, filterAll ? false : expandKeySet.has(node.key));
                     node.count = childCount;
                     node.total = childTotal;
                     count += childCount;
                     total += childTotal;
+                    hasFilterResult = hasFilterResult || childHasFilterResult;
+                    if (childHasFilterResult) {
+                        resultExpandKeySet.add(node.key);
+                    }
                 }
                 else if (!hiddenKeys.has(node.key)) {
                     if (node.data.dataType !== 4) {
@@ -8917,10 +8944,10 @@ function useFilter(config, filterMethod, tree = {
                 }
                 family.pop();
             });
-            return { count, total };
+            return { count, total, hasFilterResult };
         }
         traverse(nodes);
-        return expandKeySet;
+        return { expandKeySet, resultExpandKeySet };
     }
     function isForceHiddenExpandIcon(node) {
         return hiddenExpandIconKeySet.has(node.key);
@@ -10423,16 +10450,20 @@ class VirtualTree {
             business: this._business,
             businessConfig: this._businessConfig
         }, this._filterMethod, this._tree);
-        const keys = doFilter(params, filterAll);
-        if (keys) {
+        const filterResult = doFilter(params, filterAll);
+        if (filterResult) {
+            const { expandKeySet, resultExpandKeySet } = filterResult;
             const expandModel = params ? this._props.filterExpandModel : this._props.defaultExpandModel;
             if (expandModel === 'all') {
-                this._expandedKeySet = keys;
+                this._expandedKeySet = expandKeySet;
             }
             else if (expandModel === 'first') {
-                const keysList = Array.from(keys.values());
+                const keysList = Array.from(expandKeySet.values());
                 this._expandedKeySet = new Set([keysList[0]].filter(Boolean));
             }
+            else if (expandModel === 'result') {
+                this._expandedKeySet = resultExpandKeySet;
+            }
             this._hiddenExpandIconKeySet = hiddenExpandIconKeySet;
             this._hiddenNodeKeySet = hiddenNodeKeySet;
             this._isRenderInitial = false;

package/package.json

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