rsuite 4.11.0 → 4.11.1

package/es/CheckTreePicker/CheckTreePicker.js

@@ -21,7 +21,7 @@ import { CHECK_STATE } from '../constants';
 import { clone, defaultProps, prefix, defaultClassPrefix, getUnhandledProps, createChainedFunction, mergeRefs } from '../utils';
 import { PickerToggle, getToggleWrapperClassName, onMenuKeyDown, MenuWrapper, SearchBar, SelectedElement, PickerToggleTrigger, createConcatChildrenFunction, shouldDisplay } from '../Picker';
 import { isEveryChildChecked, isSomeChildChecked, isSomeNodeHasChildren, getSiblingNodeUncheckable, getEveryFisrtLevelNodeUncheckable, getUncheckableState, getFormattedTree, getDisabledState } from './utils';
-import { compareArray, shouldShowNodeByExpanded, flattenTree, getNodeParents, getVirtualLisHeight, hasVisibleChildren, treeDeprecatedWarning, getExpandItemValues, getExpandAll, getExpandState, getExpandWhenSearching } from '../utils/treeUtils';
+import { compareArray, shouldShowNodeByExpanded, flattenTree, getNodeParents, hasVisibleChildren, treeDeprecatedWarning, getExpandItemValues, getExpandAll, getExpandState, getExpandWhenSearching } from '../utils/treeUtils';
 import { listPickerPropTypes, listPickerDefaultProps } from '../Picker/propTypes'; // default value for virtualized
 
 var defaultHeight = 360;
@@ -1028,13 +1028,10 @@ function (_React$Component) {
 
   _proto.renderDropdownMenu = function renderDropdownMenu() {
     var _this$props10 = this.props,
-        _this$props10$height = _this$props10.height,
-        height = _this$props10$height === void 0 ? defaultHeight : _this$props10$height,
         locale = _this$props10.locale,
         menuStyle = _this$props10.menuStyle,
         searchable = _this$props10.searchable,
         renderMenu = _this$props10.renderMenu,
-        virtualized = _this$props10.virtualized,
         searchKeyword = _this$props10.searchKeyword,
         renderExtraFooter = _this$props10.renderExtraFooter,
         menuClassName = _this$props10.menuClassName,
@@ -1042,13 +1039,10 @@ function (_React$Component) {
     var keyword = !_isUndefined(searchKeyword) ? searchKeyword : this.state.searchKeyword;
     var classes = classNames(menuClassName, this.addPrefix('check-tree-menu'));
     var menu = this.renderCheckTree();
-    var styles = virtualized ? _extends({
-      height: height
-    }, menuStyle) : menuStyle;
     return React.createElement(MenuWrapper, {
       autoWidth: menuAutoWidth,
       className: classes,
-      style: styles,
+      style: menuStyle,
       ref: this.menuRef,
       getToggleInstance: this.getToggleInstance,
       getPositionInstance: this.getPositionInstance
@@ -1196,8 +1190,7 @@ function (_React$Component) {
         className = _this$props13.className,
         onScroll = _this$props13.onScroll,
         locale = _this$props13.locale,
-        virtualized = _this$props13.virtualized,
-        searchable = _this$props13.searchable; // 树节点的层级
+        virtualized = _this$props13.virtualized; // 树节点的层级
 
     var layer = 0;
     var classes = classNames(defaultClassPrefix('check-tree'), (_classNames2 = {}, _classNames2[className] = inline, _classNames2['without-children'] = !isSomeNodeHasChildren, _classNames2));
@@ -1225,34 +1218,37 @@ function (_React$Component) {
           className: this.addPrefix('none')
         }, locale.noResultsText);
       }
-    } // 当未定义 height 且 设置了 virtualized 为 true，treeHeight 设置默认高度
+    } // The height of virtualized tree should be subtract the value of paddingBottom
 
 
-    var treeHeight = _isUndefined(height) && virtualized ? defaultHeight : height;
+    var treeHeight = height - 12;
     var treeWidth = _isUndefined(style === null || style === void 0 ? void 0 : style.width) ? defaultWidth : style.width;
-    var styles = inline ? _extends({
-      height: treeHeight
-    }, style) : {};
+    var listStyles = inline ? _extends({
+      height: height
+    }, style) : style;
     var treeNodesClass = classNames(this.addTreePrefix('nodes'), (_classNames3 = {}, _classNames3[this.addTreePrefix('all-uncheckable')] = getEveryFisrtLevelNodeUncheckable(this.nodes), _classNames3));
-    var listHeight = getVirtualLisHeight(inline, searchable, treeHeight);
     return React.createElement("div", {
       ref: this.treeViewRef,
       className: classes,
-      style: styles,
+      style: listStyles,
       onScroll: onScroll,
       onKeyDown: this.handleKeyDown
     }, React.createElement("div", {
       className: treeNodesClass
     }, virtualized ? React.createElement(AutoSizer, {
-      defaultHeight: listHeight,
-      defaultWidth: treeWidth
+      defaultHeight: treeHeight,
+      defaultWidth: treeWidth,
+      style: {
+        width: 'auto',
+        height: 'auto'
+      }
     }, function (_ref3) {
       var height = _ref3.height,
           width = _ref3.width;
       return React.createElement(List, {
         ref: _this11.listRef,
         width: width || treeWidth,
-        height: height || listHeight,
+        height: height,
         rowHeight: 36,
         rowCount: formattedNodes.length,
         rowRenderer: _this11.measureRowRenderer(formattedNodes)
@@ -1373,6 +1369,7 @@ CheckTreePicker.propTypes = _extends({}, listPickerPropTypes, {
   searchBy: PropTypes.func
 });
 CheckTreePicker.defaultProps = _extends({}, listPickerDefaultProps, {
+  height: defaultHeight,
   cascade: true,
   countable: true,
   searchable: true,

package/es/TreePicker/TreePicker.js

@@ -20,7 +20,7 @@ import { polyfill } from 'react-lifecycles-compat';
 import shallowEqual from '../utils/shallowEqual';
 import TreeNode from './TreeNode';
 import { defaultProps, prefix, defaultClassPrefix, getUnhandledProps, createChainedFunction, mergeRefs } from '../utils';
-import { flattenTree, getExpandWhenSearching, getNodeParents, shouldShowNodeByExpanded, getVirtualLisHeight, treeDeprecatedWarning, hasVisibleChildren, compareArray, getExpandAll, getExpandItemValues, getExpandState, getDragNodeKeys, calDropNodePosition, createUpdateTreeDataFunction } from '../utils/treeUtils';
+import { flattenTree, getExpandWhenSearching, getNodeParents, shouldShowNodeByExpanded, treeDeprecatedWarning, hasVisibleChildren, compareArray, getExpandAll, getExpandItemValues, getExpandState, getDragNodeKeys, calDropNodePosition, createUpdateTreeDataFunction } from '../utils/treeUtils';
 import { PickerToggle, getToggleWrapperClassName, onMenuKeyDown, MenuWrapper, SearchBar, PickerToggleTrigger, createConcatChildrenFunction, shouldDisplay } from '../Picker';
 import { TREE_NODE_DROP_POSITION } from '../constants';
 import { listPickerPropTypes, listPickerDefaultProps } from '../Picker/propTypes'; // default value for virtualized
@@ -547,7 +547,7 @@ function (_React$Component) {
       nextState.selectedValue = value;
     }
 
-    if (compareArray(expandItemValues, prevState.expandItemValues)) {
+    if (compareArray(expandItemValues, prevState.expandItemValues) && Array.isArray(expandItemValues)) {
       nextState.expandItemValues = expandItemValues;
     }
 
@@ -639,7 +639,7 @@ function (_React$Component) {
   _proto.updateExpandItemValuesChange = function updateExpandItemValuesChange(prevState) {
     var expandItemValues = this.props.expandItemValues;
 
-    if (compareArray(expandItemValues, prevState.expandItemValues)) {
+    if (compareArray(expandItemValues, prevState.expandItemValues) && Array.isArray(expandItemValues)) {
       this.unserializeLists('expand', expandItemValues);
       this.setState({
         expandItemValues: expandItemValues
@@ -1002,26 +1002,20 @@ function (_React$Component) {
 
   _proto.renderDropdownMenu = function renderDropdownMenu() {
     var _this$props16 = this.props,
-        _this$props16$height = _this$props16.height,
-        height = _this$props16$height === void 0 ? defaultHeight : _this$props16$height,
         searchable = _this$props16.searchable,
         searchKeyword = _this$props16.searchKeyword,
         renderExtraFooter = _this$props16.renderExtraFooter,
         locale = _this$props16.locale,
         renderMenu = _this$props16.renderMenu,
         menuStyle = _this$props16.menuStyle,
-        virtualized = _this$props16.virtualized,
         menuClassName = _this$props16.menuClassName,
         menuAutoWidth = _this$props16.menuAutoWidth;
     var keyword = !_isUndefined(searchKeyword) ? searchKeyword : this.state.searchKeyword;
     var classes = classNames(menuClassName, this.addPrefix('tree-menu'));
-    var styles = virtualized ? _extends({
-      height: height
-    }, menuStyle) : menuStyle;
     return React.createElement(MenuWrapper, {
       autoWidth: menuAutoWidth,
       className: classes,
-      style: styles,
+      style: menuStyle,
       ref: this.menuRef,
       getToggleInstance: this.getToggleInstance,
       getPositionInstance: this.getPositionInstance
@@ -1122,8 +1116,7 @@ function (_React$Component) {
         inline = _this$props18.inline,
         style = _this$props18.style,
         locale = _this$props18.locale,
-        virtualized = _this$props18.virtualized,
-        searchable = _this$props18.searchable;
+        virtualized = _this$props18.virtualized;
     var layer = 0;
     var classes = classNames(defaultClassPrefix('tree'), (_classNames2 = {}, _classNames2[className] = inline, _classNames2));
     var nodes = [];
@@ -1150,33 +1143,36 @@ function (_React$Component) {
           className: this.addPrefix('none')
         }, locale.noResultsText);
       }
-    } // 当未定义 height 且 设置了 virtualized 为 true，treeHeight 设置默认高度
+    } // The height of virtualized tree should be subtract the value of paddingBottom
 
 
-    var treeHeight = _isUndefined(height) && virtualized ? defaultHeight : height;
+    var treeHeight = height - 12;
     var treeWidth = _isUndefined(style === null || style === void 0 ? void 0 : style.width) ? defaultWidth : style.width;
-    var styles = inline ? _extends({
-      height: treeHeight
-    }, style) : {};
-    var listHeight = getVirtualLisHeight(inline, searchable, treeHeight);
+    var listStyles = inline ? _extends({
+      height: height
+    }, style) : style;
     return React.createElement(React.Fragment, null, React.createElement("div", {
       ref: this.treeViewRef,
       className: classes,
-      style: styles,
+      style: listStyles,
       onKeyDown: this.handleKeyDown
     }, React.createElement("div", {
       className: this.addTreePrefix('nodes')
     }, virtualized ? React.createElement(AutoSizer, {
-      defaultHeight: listHeight,
-      defaultWidth: treeWidth
+      defaultHeight: treeHeight,
+      defaultWidth: treeWidth,
+      style: {
+        width: 'auto',
+        height: 'auto'
+      }
     }, function (_ref4) {
       var height = _ref4.height,
           width = _ref4.width;
       return React.createElement(List, {
         ref: _this9.listRef,
         width: width || treeWidth,
-        height: height || listHeight,
-        rowHeight: 38,
+        height: height,
+        rowHeight: 36,
         rowCount: nodes.length,
         rowRenderer: _this9.measureRowRenderer(nodes)
       });
@@ -1306,6 +1302,7 @@ TreePicker.propTypes = _extends({}, listPickerPropTypes, {
   searchBy: PropTypes.func
 });
 TreePicker.defaultProps = _extends({}, listPickerDefaultProps, {
+  height: defaultHeight,
   searchable: true,
   menuAutoWidth: true,
   locale: {

package/es/utils/treeUtils.js

@@ -8,12 +8,11 @@ import _intersection from "lodash/intersection";
 import shallowEqual from '../utils/shallowEqual';
 import shallowEqualArray from '../utils/shallowEqualArray';
 import { TREE_NODE_DROP_POSITION } from '../constants';
-var SEARCH_BAR_HEIGHT = 48;
-var MENU_PADDING = 12; // Tree Node 之间的 间隔
-
+// Tree Node 之间的 间隔
 var TREE_NODE_GAP = 4;
 /**
- * 判断当前节点是否应该显示
+ * Whether current node is visible
+ * when all the parents of the current node is expanded, the current node should be visible
  * @param {*} expandItemValues
  * @param {*} parentKeys
  */
@@ -95,20 +94,6 @@ export function getNodeParents(node, parentKey, valueKey) {
   traverse(node);
   return parents;
 }
-/**
- * 获取 VirtualList 的高度
- * @param {*} inline
- * @param {*} height
- */
-
-export function getVirtualLisHeight(inline, searchable, height) {
-  if (height === void 0) {
-    height = 0;
-  }
-
-  var searchBarHeight = searchable ? SEARCH_BAR_HEIGHT : 0;
-  return inline ? height - MENU_PADDING * 2 : height - searchBarHeight - MENU_PADDING * 2;
-}
 /**
  * 判断节点是否存在可见的子节点。
  * @param node

package/lib/CheckTreePicker/CheckTreePicker.js

@@ -1062,13 +1062,10 @@ function (_React$Component) {
 
   _proto.renderDropdownMenu = function renderDropdownMenu() {
     var _this$props10 = this.props,
-        _this$props10$height = _this$props10.height,
-        height = _this$props10$height === void 0 ? defaultHeight : _this$props10$height,
         locale = _this$props10.locale,
         menuStyle = _this$props10.menuStyle,
         searchable = _this$props10.searchable,
         renderMenu = _this$props10.renderMenu,
-        virtualized = _this$props10.virtualized,
         searchKeyword = _this$props10.searchKeyword,
         renderExtraFooter = _this$props10.renderExtraFooter,
         menuClassName = _this$props10.menuClassName,
@@ -1076,13 +1073,10 @@ function (_React$Component) {
     var keyword = !(0, _isUndefined2.default)(searchKeyword) ? searchKeyword : this.state.searchKeyword;
     var classes = (0, _classnames.default)(menuClassName, this.addPrefix('check-tree-menu'));
     var menu = this.renderCheckTree();
-    var styles = virtualized ? (0, _extends2.default)({
-      height: height
-    }, menuStyle) : menuStyle;
     return React.createElement(_Picker.MenuWrapper, {
       autoWidth: menuAutoWidth,
       className: classes,
-      style: styles,
+      style: menuStyle,
       ref: this.menuRef,
       getToggleInstance: this.getToggleInstance,
       getPositionInstance: this.getPositionInstance
@@ -1230,8 +1224,7 @@ function (_React$Component) {
         className = _this$props13.className,
         onScroll = _this$props13.onScroll,
         locale = _this$props13.locale,
-        virtualized = _this$props13.virtualized,
-        searchable = _this$props13.searchable; // 树节点的层级
+        virtualized = _this$props13.virtualized; // 树节点的层级
 
     var layer = 0;
     var classes = (0, _classnames.default)((0, _utils.defaultClassPrefix)('check-tree'), (_classNames2 = {}, _classNames2[className] = inline, _classNames2['without-children'] = !isSomeNodeHasChildren, _classNames2));
@@ -1259,34 +1252,37 @@ function (_React$Component) {
           className: this.addPrefix('none')
         }, locale.noResultsText);
       }
-    } // 当未定义 height 且 设置了 virtualized 为 true，treeHeight 设置默认高度
+    } // The height of virtualized tree should be subtract the value of paddingBottom
 
 
-    var treeHeight = (0, _isUndefined2.default)(height) && virtualized ? defaultHeight : height;
+    var treeHeight = height - 12;
     var treeWidth = (0, _isUndefined2.default)(style === null || style === void 0 ? void 0 : style.width) ? defaultWidth : style.width;
-    var styles = inline ? (0, _extends2.default)({
-      height: treeHeight
-    }, style) : {};
+    var listStyles = inline ? (0, _extends2.default)({
+      height: height
+    }, style) : style;
     var treeNodesClass = (0, _classnames.default)(this.addTreePrefix('nodes'), (_classNames3 = {}, _classNames3[this.addTreePrefix('all-uncheckable')] = (0, _utils2.getEveryFisrtLevelNodeUncheckable)(this.nodes), _classNames3));
-    var listHeight = (0, _treeUtils.getVirtualLisHeight)(inline, searchable, treeHeight);
     return React.createElement("div", {
       ref: this.treeViewRef,
       className: classes,
-      style: styles,
+      style: listStyles,
       onScroll: onScroll,
       onKeyDown: this.handleKeyDown
     }, React.createElement("div", {
       className: treeNodesClass
     }, virtualized ? React.createElement(_AutoSizer.default, {
-      defaultHeight: listHeight,
-      defaultWidth: treeWidth
+      defaultHeight: treeHeight,
+      defaultWidth: treeWidth,
+      style: {
+        width: 'auto',
+        height: 'auto'
+      }
     }, function (_ref3) {
       var height = _ref3.height,
           width = _ref3.width;
       return React.createElement(_List.default, {
         ref: _this11.listRef,
         width: width || treeWidth,
-        height: height || listHeight,
+        height: height,
         rowHeight: 36,
         rowCount: formattedNodes.length,
         rowRenderer: _this11.measureRowRenderer(formattedNodes)
@@ -1404,6 +1400,7 @@ CheckTreePicker.propTypes = (0, _extends2.default)({}, _propTypes2.listPickerPro
   searchBy: _propTypes.default.func
 });
 CheckTreePicker.defaultProps = (0, _extends2.default)({}, _propTypes2.listPickerDefaultProps, {
+  height: defaultHeight,
   cascade: true,
   countable: true,
   searchable: true,

package/lib/TreePicker/TreePicker.js

@@ -581,7 +581,7 @@ function (_React$Component) {
       nextState.selectedValue = value;
     }
 
-    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues)) {
+    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues) && Array.isArray(expandItemValues)) {
       nextState.expandItemValues = expandItemValues;
     }
 
@@ -673,7 +673,7 @@ function (_React$Component) {
   _proto.updateExpandItemValuesChange = function updateExpandItemValuesChange(prevState) {
     var expandItemValues = this.props.expandItemValues;
 
-    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues)) {
+    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues) && Array.isArray(expandItemValues)) {
       this.unserializeLists('expand', expandItemValues);
       this.setState({
         expandItemValues: expandItemValues
@@ -1034,26 +1034,20 @@ function (_React$Component) {
 
   _proto.renderDropdownMenu = function renderDropdownMenu() {
     var _this$props16 = this.props,
-        _this$props16$height = _this$props16.height,
-        height = _this$props16$height === void 0 ? defaultHeight : _this$props16$height,
         searchable = _this$props16.searchable,
         searchKeyword = _this$props16.searchKeyword,
         renderExtraFooter = _this$props16.renderExtraFooter,
         locale = _this$props16.locale,
         renderMenu = _this$props16.renderMenu,
         menuStyle = _this$props16.menuStyle,
-        virtualized = _this$props16.virtualized,
         menuClassName = _this$props16.menuClassName,
         menuAutoWidth = _this$props16.menuAutoWidth;
     var keyword = !(0, _isUndefined2.default)(searchKeyword) ? searchKeyword : this.state.searchKeyword;
     var classes = (0, _classnames.default)(menuClassName, this.addPrefix('tree-menu'));
-    var styles = virtualized ? (0, _extends3.default)({
-      height: height
-    }, menuStyle) : menuStyle;
     return React.createElement(_Picker.MenuWrapper, {
       autoWidth: menuAutoWidth,
       className: classes,
-      style: styles,
+      style: menuStyle,
       ref: this.menuRef,
       getToggleInstance: this.getToggleInstance,
       getPositionInstance: this.getPositionInstance
@@ -1152,8 +1146,7 @@ function (_React$Component) {
         inline = _this$props18.inline,
         style = _this$props18.style,
         locale = _this$props18.locale,
-        virtualized = _this$props18.virtualized,
-        searchable = _this$props18.searchable;
+        virtualized = _this$props18.virtualized;
     var layer = 0;
     var classes = (0, _classnames.default)((0, _utils.defaultClassPrefix)('tree'), (_classNames2 = {}, _classNames2[className] = inline, _classNames2));
     var nodes = [];
@@ -1180,33 +1173,36 @@ function (_React$Component) {
           className: this.addPrefix('none')
         }, locale.noResultsText);
       }
-    } // 当未定义 height 且 设置了 virtualized 为 true，treeHeight 设置默认高度
+    } // The height of virtualized tree should be subtract the value of paddingBottom
 
 
-    var treeHeight = (0, _isUndefined2.default)(height) && virtualized ? defaultHeight : height;
+    var treeHeight = height - 12;
     var treeWidth = (0, _isUndefined2.default)(style === null || style === void 0 ? void 0 : style.width) ? defaultWidth : style.width;
-    var styles = inline ? (0, _extends3.default)({
-      height: treeHeight
-    }, style) : {};
-    var listHeight = (0, _treeUtils.getVirtualLisHeight)(inline, searchable, treeHeight);
+    var listStyles = inline ? (0, _extends3.default)({
+      height: height
+    }, style) : style;
     return React.createElement(React.Fragment, null, React.createElement("div", {
       ref: this.treeViewRef,
       className: classes,
-      style: styles,
+      style: listStyles,
       onKeyDown: this.handleKeyDown
     }, React.createElement("div", {
       className: this.addTreePrefix('nodes')
     }, virtualized ? React.createElement(_AutoSizer.default, {
-      defaultHeight: listHeight,
-      defaultWidth: treeWidth
+      defaultHeight: treeHeight,
+      defaultWidth: treeWidth,
+      style: {
+        width: 'auto',
+        height: 'auto'
+      }
     }, function (_ref4) {
       var height = _ref4.height,
           width = _ref4.width;
       return React.createElement(_List.default, {
         ref: _this9.listRef,
         width: width || treeWidth,
-        height: height || listHeight,
-        rowHeight: 38,
+        height: height,
+        rowHeight: 36,
         rowCount: nodes.length,
         rowRenderer: _this9.measureRowRenderer(nodes)
       });
@@ -1333,6 +1329,7 @@ TreePicker.propTypes = (0, _extends3.default)({}, _propTypes2.listPickerPropType
   searchBy: _propTypes.default.func
 });
 TreePicker.defaultProps = (0, _extends3.default)({}, _propTypes2.listPickerDefaultProps, {
+  height: defaultHeight,
   searchable: true,
   menuAutoWidth: true,
   locale: {

package/lib/utils/treeUtils.js

@@ -6,7 +6,6 @@ exports.__esModule = true;
 exports.shouldShowNodeByExpanded = shouldShowNodeByExpanded;
 exports.flattenTree = flattenTree;
 exports.getNodeParents = getNodeParents;
-exports.getVirtualLisHeight = getVirtualLisHeight;
 exports.hasVisibleChildren = hasVisibleChildren;
 exports.treeDeprecatedWarning = treeDeprecatedWarning;
 exports.compareArray = compareArray;
@@ -41,12 +40,11 @@ var _shallowEqualArray = _interopRequireDefault(require("../utils/shallowEqualAr
 
 var _constants = require("../constants");
 
-var SEARCH_BAR_HEIGHT = 48;
-var MENU_PADDING = 12; // Tree Node 之间的 间隔
-
+// Tree Node 之间的 间隔
 var TREE_NODE_GAP = 4;
 /**
- * 判断当前节点是否应该显示
+ * Whether current node is visible
+ * when all the parents of the current node is expanded, the current node should be visible
  * @param {*} expandItemValues
  * @param {*} parentKeys
  */
@@ -130,21 +128,6 @@ function getNodeParents(node, parentKey, valueKey) {
   traverse(node);
   return parents;
 }
-/**
- * 获取 VirtualList 的高度
- * @param {*} inline
- * @param {*} height
- */
-
-
-function getVirtualLisHeight(inline, searchable, height) {
-  if (height === void 0) {
-    height = 0;
-  }
-
-  var searchBarHeight = searchable ? SEARCH_BAR_HEIGHT : 0;
-  return inline ? height - MENU_PADDING * 2 : height - searchBarHeight - MENU_PADDING * 2;
-}
 /**
  * 判断节点是否存在可见的子节点。
  * @param node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "A suite of react components",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

package/src/CheckTreePicker/CheckTreePicker.tsx

@@ -50,7 +50,6 @@ import {
   shouldShowNodeByExpanded,
   flattenTree,
   getNodeParents,
-  getVirtualLisHeight,
   hasVisibleChildren,
   treeDeprecatedWarning,
   getExpandItemValues,
@@ -111,6 +110,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
   };
   static defaultProps = {
     ...listPickerDefaultProps,
+    height: defaultHeight,
     cascade: true,
     countable: true,
     searchable: true,
@@ -904,12 +904,10 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
 
   renderDropdownMenu() {
     const {
-      height = defaultHeight,
       locale,
       menuStyle,
       searchable,
       renderMenu,
-      virtualized,
       searchKeyword,
       renderExtraFooter,
       menuClassName,
@@ -919,13 +917,12 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
     const keyword = !_.isUndefined(searchKeyword) ? searchKeyword : this.state.searchKeyword;
     const classes = classNames(menuClassName, this.addPrefix('check-tree-menu'));
     const menu = this.renderCheckTree();
-    const styles = virtualized ? { height, ...menuStyle } : menuStyle;
 
     return (
       <MenuWrapper
         autoWidth={menuAutoWidth}
         className={classes}
-        style={styles}
+        style={menuStyle}
         ref={this.menuRef}
         getToggleInstance={this.getToggleInstance}
         getPositionInstance={this.getPositionInstance}
@@ -1078,16 +1075,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
 
   renderCheckTree() {
     const { filterData, isSomeNodeHasChildren } = this.state;
-    const {
-      inline,
-      style,
-      height,
-      className,
-      onScroll,
-      locale,
-      virtualized,
-      searchable
-    } = this.props;
+    const { inline, style, height, className, onScroll, locale, virtualized } = this.props;
 
     // 树节点的层级
     const layer = 0;
@@ -1097,7 +1085,6 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
     });
 
     let formattedNodes = [];
-
     if (!virtualized) {
       formattedNodes = getFormattedTree(filterData, this.nodes, this.props).map(node =>
         this.renderNode(node, layer)
@@ -1113,31 +1100,34 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
       }
     }
 
-    // 当未定义 height 且 设置了 virtualized 为 true，treeHeight 设置默认高度
-    const treeHeight = _.isUndefined(height) && virtualized ? defaultHeight : height;
+    // The height of virtualized tree should be subtract the value of paddingBottom
+    const treeHeight = height - 12;
     const treeWidth = _.isUndefined(style?.width) ? defaultWidth : style.width;
-    const styles = inline ? { height: treeHeight, ...style } : {};
+    const listStyles = inline ? { height: height, ...style } : style;
 
     const treeNodesClass = classNames(this.addTreePrefix('nodes'), {
       [this.addTreePrefix('all-uncheckable')]: getEveryFisrtLevelNodeUncheckable(this.nodes)
     });
-    const listHeight = getVirtualLisHeight(inline, searchable, treeHeight);
     return (
       <div
         ref={this.treeViewRef}
         className={classes}
-        style={styles}
+        style={listStyles}
         onScroll={onScroll}
         onKeyDown={this.handleKeyDown}
       >
         <div className={treeNodesClass}>
           {virtualized ? (
-            <AutoSizer defaultHeight={listHeight} defaultWidth={treeWidth}>
+            <AutoSizer
+              defaultHeight={treeHeight}
+              defaultWidth={treeWidth}
+              style={{ width: 'auto', height: 'auto' }}
+            >
               {({ height, width }) => (
                 <List
                   ref={this.listRef}
                   width={width || treeWidth}
-                  height={height || listHeight}
+                  height={height}
                   rowHeight={36}
                   rowCount={formattedNodes.length}
                   rowRenderer={this.measureRowRenderer(formattedNodes)}