amis-ui 6.13.0-beta.2 → 6.13.0-beta.21

package/esm/components/Tree.d.ts

@@ -94,7 +94,6 @@ interface TreeSelectorProps extends ThemeProps, LocaleProps, SpinnerExtraProps {
     creatable?: boolean;
     createTip?: string;
     virtualThreshold?: number;
-    itemHeight?: number;
     onAdd?: (idx?: number | Array<number>, value?: any, skipForm?: boolean) => void;
     editable?: boolean;
     editTip?: string;
@@ -130,6 +129,7 @@ interface TreeSelectorState {
     flattenedOptions: Option[];
     dropIndicator?: IDropIndicator;
     virtualHeight: number;
+    itemHeight: number;
 }
 export declare class TreeSelector extends React.Component<TreeSelectorProps, TreeSelectorState> {
     static defaultProps: {
@@ -167,7 +167,6 @@ export declare class TreeSelector extends React.Component<TreeSelectorProps, Tre
         pathSeparator: string;
         nodePath: never[];
         virtualThreshold: number;
-        itemHeight: number;
         enableDefaultIcon: boolean;
     };
     unfolded: WeakMap<Object, boolean>;
@@ -180,7 +179,7 @@ export declare class TreeSelector extends React.Component<TreeSelectorProps, Tre
         y: number;
     };
     root: React.RefObject<HTMLDivElement>;
-    virtualListRef: React.RefObject<any>;
+    virtualListRef: HTMLDivElement | null;
     unSensor?: () => void;
     constructor(props: TreeSelectorProps);
     componentDidMount(): void;
@@ -190,6 +189,7 @@ export declare class TreeSelector extends React.Component<TreeSelectorProps, Tre
      * 展开懒加载节点的父节点
      */
     expandLazyLoadNodes(): void;
+    virtualListRefSetter(ref: HTMLDivElement | null): void;
     syncUnFolded(props: TreeSelectorProps, unfoldedLevel?: number, initial?: boolean): WeakMap<Object, boolean>;
     toggleUnfolded(node: any): void;
     isUnfolded(node: any): boolean;
@@ -246,16 +246,18 @@ export declare class TreeSelector extends React.Component<TreeSelectorProps, Tre
      *
      */
     isItemDisabled(item: Option, checked: boolean): boolean;
-    renderItem({ index, style }: {
+    renderItem({ index, style, ...rest }: {
         index: number;
         style?: Record<string, any>;
+        ref?: (node: HTMLElement | null) => void;
     }): React.JSX.Element | null;
     isEmptyOrNotExist(obj: any): boolean;
     getAvailableOptions(): Option[];
     handleCheckAll(availableOptions: Option[], checkedAll: boolean): void;
     handleToggle(bool?: boolean): void;
     renderCheckAll(): React.JSX.Element | null;
-    renderList(list: Options): React.JSX.Element;
+    styleGetter(node: HTMLElement | null): void;
+    renderList(list: Options): React.JSX.Element | null;
     handleVirtualHeight(): void;
     render(): React.JSX.Element;
 }
@@ -269,7 +271,6 @@ declare const _default: {
         extractValue?: boolean | undefined;
         delimiter?: string | undefined;
         pathSeparator?: string | undefined;
-        itemHeight?: number | undefined;
         virtualThreshold?: number | undefined;
         showIcon?: boolean | undefined;
         deferField?: string | undefined;
@@ -315,7 +316,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -357,7 +357,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -403,7 +402,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -446,7 +444,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -487,7 +484,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -530,7 +526,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -571,7 +566,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -612,7 +606,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -653,7 +646,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -698,7 +690,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -744,7 +735,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -786,7 +776,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -832,7 +821,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -875,7 +863,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -916,7 +903,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -959,7 +945,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1000,7 +985,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1041,7 +1025,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1082,7 +1065,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1131,7 +1113,6 @@ declare const _default: {
         extractValue?: boolean | undefined;
         delimiter?: string | undefined;
         pathSeparator?: string | undefined;
-        itemHeight?: number | undefined;
         virtualThreshold?: number | undefined;
         showIcon?: boolean | undefined;
         deferField?: string | undefined;
@@ -1177,7 +1158,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1219,7 +1199,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1265,7 +1244,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1308,7 +1286,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1349,7 +1326,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1392,7 +1368,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1433,7 +1408,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1474,7 +1448,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1515,7 +1488,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1564,7 +1536,6 @@ declare const _default: {
             extractValue?: boolean | undefined;
             delimiter?: string | undefined;
             pathSeparator?: string | undefined;
-            itemHeight?: number | undefined;
             virtualThreshold?: number | undefined;
             showIcon?: boolean | undefined;
             deferField?: string | undefined;
@@ -1610,7 +1581,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1652,7 +1622,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1698,7 +1667,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1741,7 +1709,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1782,7 +1749,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1825,7 +1791,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1866,7 +1831,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1907,7 +1871,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;
@@ -1948,7 +1911,6 @@ declare const _default: {
                 extractValue?: boolean | undefined;
                 delimiter?: string | undefined;
                 pathSeparator?: string | undefined;
-                itemHeight?: number | undefined;
                 virtualThreshold?: number | undefined;
                 showIcon?: boolean | undefined;
                 deferField?: string | undefined;

package/esm/components/Tree.js

@@ -1,9 +1,9 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
-import { __extends, __assign, __spreadArray, __read, __values, __decorate, __metadata } from 'tslib';
+import { __extends, __assign, __spreadArray, __read, __values, __rest, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import { resizeSensor, eachTree, getTreeAncestors, flattenTree, flattenTreeWithLeafNodes, getTreeParent, findTreeIndex, isVisible, highlight, hasAbility, calculateHeight, autobind, themeable, localeable } from 'amis-core';
 import { value2array } from './Select.js';
@@ -45,7 +45,7 @@ var TreeSelector = /** @class */ (function (_super) {
             y: 0
         };
         _this.root = React__default.createRef();
-        _this.virtualListRef = React__default.createRef();
+        _this.virtualListRef = null;
         var value = value2array(props.value, {
             multiple: props.multiple,
             delimiter: props.delimiter,
@@ -64,27 +64,30 @@ var TreeSelector = /** @class */ (function (_super) {
             isEditing: false,
             editingItem: null,
             dropIndicator: undefined,
-            virtualHeight: 0
+            virtualHeight: 0,
+            itemHeight: 0
         };
         _this.syncUnFolded(props, undefined, true);
         _this.flattenOptions(props, true);
         return _this;
     }
     TreeSelector.prototype.componentDidMount = function () {
-        var _this = this;
-        var _a, _b;
+        var _a, _b, _c;
         var enableNodePath = this.props.enableNodePath;
         // onRef只有渲染器的情况才会使用
         (_b = (_a = this.props).onRef) === null || _b === void 0 ? void 0 : _b.call(_a, this);
         enableNodePath && this.expandLazyLoadNodes();
-        this.handleVirtualHeight();
-        this.unSensor = resizeSensor(this.root.current, function () {
-            _this.handleVirtualHeight();
-        }, false, 'height');
+        var treeElement = this.root.current;
+        treeElement =
+            ((_c = treeElement === null || treeElement === void 0 ? void 0 : treeElement.parentElement) === null || _c === void 0 ? void 0 : _c.matches('.cxd-TreeControl')) &&
+                treeElement.parentElement.childElementCount === 1
+                ? treeElement.parentElement
+                : treeElement;
+        this.unSensor = resizeSensor(treeElement, this.handleVirtualHeight, false, 'height');
     };
     TreeSelector.prototype.componentDidUpdate = function (prevProps, prevState) {
         var props = this.props;
-        var state = this.state;
+        this.state;
         if (prevProps.options !== props.options) {
             this.syncUnFolded(props);
             this.flattenOptions(props);
@@ -104,10 +107,6 @@ var TreeSelector = /** @class */ (function (_super) {
                 valueSet: new Set(newValue)
             });
         }
-        if (prevState.isAdding !== state.isAdding ||
-            prevState.flattenedOptions !== state.flattenedOptions) {
-            this.handleVirtualHeight();
-        }
     };
     TreeSelector.prototype.componentWillUnmount = function () {
         // clear data
@@ -127,6 +126,10 @@ var TreeSelector = /** @class */ (function (_super) {
         });
         onExpandTree === null || onExpandTree === void 0 ? void 0 : onExpandTree(nodePathArr);
     };
+    TreeSelector.prototype.virtualListRefSetter = function (ref) {
+        this.virtualListRef = ref;
+        ref && this.handleVirtualHeight();
+    };
     TreeSelector.prototype.syncUnFolded = function (props, unfoldedLevel, initial) {
         // 传入默认展开层级需要重新初始化unfolded
         var initFoldedLevel = typeof unfoldedLevel !== 'undefined';
@@ -792,7 +795,7 @@ var TreeSelector = /** @class */ (function (_super) {
     };
     TreeSelector.prototype.renderItem = function (_a) {
         var _this = this;
-        var index = _a.index, style = _a.style;
+        var index = _a.index, style = _a.style, rest = __rest(_a, ["index", "style"]);
         var _b = this.props, itemClassName = _b.itemClassName, showIcon = _b.showIcon, showRadio = _b.showRadio, multiple = _b.multiple, labelField = _b.labelField, iconField = _b.iconField, deferField = _b.deferField, cascade = _b.cascade, cx = _b.classnames, highlightTxt = _b.highlightTxt, creatable = _b.creatable, editable = _b.editable, removable = _b.removable, createTip = _b.createTip, editTip = _b.editTip, removeTip = _b.removeTip, __ = _b.translate, itemRender = _b.itemRender, draggable = _b.draggable, loadingConfig = _b.loadingConfig, enableDefaultIcon = _b.enableDefaultIcon, valueField = _b.valueField, mobileUI = _b.mobileUI, testIdBuilder = _b.testIdBuilder, itemActionsRender = _b.itemActionsRender, actionClassName = _b.actionClassName;
         var item = this.state.flattenedOptions[index];
         if (!item) {
@@ -870,10 +873,10 @@ var TreeSelector = /** @class */ (function (_super) {
                                 React__default.createElement(Icon, { icon: "new-edit", className: "icon" })))) : null,
                         itemActionsRender && (React__default.createElement("div", { className: cx('Tree-itemActions') }, itemActionsRender(item, __assign(__assign({}, item), { index: index, multiple: multiple, checked: checked, labelField: labelField, onChange: function () { return _this.handleCheck(item, !checked); }, disabled: disabled || item.disabled, classnames: cx })))))) : null)));
         }
-        return (React__default.createElement("li", __assign({ key: "".concat(item[valueField || 'value'], "-").concat(index), className: cx("Tree-item ".concat(itemClassName || ''), {
+        return (React__default.createElement("li", __assign({}, rest, { key: "".concat(item[valueField || 'value'], "-").concat(index), className: cx("Tree-item ".concat(itemClassName || ''), {
                 'Tree-item--isLeaf': isLeaf,
                 'is-child': this.relations.get(item)
-            }), style: __assign(__assign({}, style), { paddingLeft: "calc(".concat(level, " * var(--Tree-indent))") }) }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getTestId()), body));
+            }), style: __assign(__assign({}, style), { '--Tree-depth': level }) }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getTestId()), body));
     };
     TreeSelector.prototype.isEmptyOrNotExist = function (obj) {
         return obj === '' || obj === undefined || obj === null;
@@ -931,38 +934,58 @@ var TreeSelector = /** @class */ (function (_super) {
                 }) },
                 React__default.createElement("span", { className: cx('Tree-itemText') }, __(checkAllLabel)))));
     };
+    TreeSelector.prototype.styleGetter = function (node) {
+        node && this.setState({ itemHeight: (node === null || node === void 0 ? void 0 : node.offsetHeight) || 0 });
+    };
     TreeSelector.prototype.renderList = function (list) {
         var _this = this;
-        var _a = this.props, virtualThreshold = _a.virtualThreshold, _b = _a.itemHeight, itemHeight = _b === void 0 ? 32 : _b;
-        var virtualHeight = this.state.virtualHeight;
+        var virtualThreshold = this.props.virtualThreshold;
+        var _a = this.state, virtualHeight = _a.virtualHeight, itemHeight = _a.itemHeight;
         if (virtualThreshold && list.length > virtualThreshold) {
-            return (React__default.createElement("div", { ref: this.virtualListRef },
-                React__default.createElement(VirtualList, { height: virtualHeight, itemCount: list.length, prefix: this.renderCheckAll(), itemSize: itemHeight, 
-                    //! hack: 让 VirtualList 重新渲染
-                    renderItem: this.renderItem.bind(this) })));
+            return itemHeight ? (React__default.createElement("div", { ref: this.virtualListRefSetter },
+                React__default.createElement(VirtualList, { height: virtualHeight, itemCount: list.length, prefix: this.renderCheckAll(), itemSize: itemHeight, renderItem: this.renderItem }))) : (this.renderItem({ index: 0, ref: this.styleGetter }));
         }
         return (React__default.createElement(React__default.Fragment, null,
             this.renderCheckAll(),
             list.map(function (item, index) { return _this.renderItem({ index: index }); })));
     };
     TreeSelector.prototype.handleVirtualHeight = function () {
-        var _a = this.props, virtualThreshold = _a.virtualThreshold, _b = _a.itemHeight, itemHeight = _b === void 0 ? 32 : _b, height = _a.height;
-        var flattenedOptions = this.state.flattenedOptions;
+        var _a;
+        var virtualThreshold = this.props.virtualThreshold;
+        var _b = this.state, flattenedOptions = _b.flattenedOptions, itemHeight = _b.itemHeight;
         if (virtualThreshold && flattenedOptions.length > virtualThreshold) {
-            if (height && height > 0) {
-                // tree 对应元素
-                var treeElement = this.root.current;
-                // 虚拟列表 对应元素
-                var virtualElement = this.virtualListRef.current;
-                if (treeElement && virtualElement) {
-                    var virtualHeight = treeElement.offsetHeight -
-                        calculateHeight(treeElement, virtualElement);
-                    this.setState({ virtualHeight: virtualHeight });
-                }
+            // tree 对应元素
+            var treeElement = this.root.current;
+            if (!this.virtualListRef ||
+                (!treeElement.offsetHeight && !treeElement.offsetWidth)) {
+                return;
+            }
+            treeElement =
+                ((_a = treeElement === null || treeElement === void 0 ? void 0 : treeElement.parentElement) === null || _a === void 0 ? void 0 : _a.matches('.cxd-TreeControl')) &&
+                    treeElement.parentElement.childElementCount === 1
+                    ? treeElement.parentElement
+                    : treeElement;
+            var styles = getComputedStyle(treeElement);
+            var offsetHeight = 0;
+            if (styles.flexGrow !== '0') {
+                // 当配置了成了动态高度时，根据实际高度来
+                offsetHeight = treeElement.offsetHeight;
             }
             else {
-                this.setState({ virtualHeight: flattenedOptions.length * itemHeight });
+                offsetHeight = itemHeight * flattenedOptions.length;
+            }
+            var virtualElement = this.virtualListRef;
+            // 通常时外围设置了 maxHeight
+            if (virtualElement.offsetHeight &&
+                virtualElement.offsetHeight > treeElement.offsetHeight) {
+                offsetHeight = treeElement.offsetHeight;
             }
+            // 虚拟列表 对应元素
+            // todo 去支持外部滚动也支持虚拟滚动的场景，目前不支持，所以只能让高度最大，其实就没启动虚拟滚动
+            // 目前只有没有配置  heightAuto 的时候
+            // 或者配置了 flexGrow 的时候，才会有虚拟滚动的效果
+            var virtualHeight = offsetHeight - calculateHeight(treeElement, virtualElement);
+            this.setState({ virtualHeight: virtualHeight });
         }
     };
     TreeSelector.prototype.render = function () {
@@ -1049,9 +1072,14 @@ var TreeSelector = /** @class */ (function (_super) {
         pathSeparator: '/',
         nodePath: [],
         virtualThreshold: 100,
-        itemHeight: 32,
         enableDefaultIcon: true
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], TreeSelector.prototype, "virtualListRefSetter", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
@@ -1166,12 +1194,24 @@ var TreeSelector = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Boolean]),
         __metadata("design:returntype", void 0)
     ], TreeSelector.prototype, "handleToggle", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], TreeSelector.prototype, "styleGetter", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], TreeSelector.prototype, "renderList", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TreeSelector.prototype, "handleVirtualHeight", null);
     return TreeSelector;
 }(React__default.Component));
 var Tree = themeable(localeable(TreeSelector));

package/esm/components/TreeSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/UserTabSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/VerificationCode.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/VirtualList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/WithRemoteConfig.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/calendar/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/components/calendar/CalendarContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.2
+ * amis-ui v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */