From f08b5b922947f03f9f2e02b1dbfdaa6a872563cc Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Thu, 12 Nov 2020 21:33:24 +0800
Subject: [PATCH] fix(select-menu): max-height not correct when virtual

---
 src/_base/select-menu/src/SelectMenu.vue        | 4 ++--
 src/_base/select-menu/src/styles/themed-size.js | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/_base/select-menu/src/SelectMenu.vue b/src/_base/select-menu/src/SelectMenu.vue
index 07d40b3bd..d08aef486 100644
--- a/src/_base/select-menu/src/SelectMenu.vue
+++ b/src/_base/select-menu/src/SelectMenu.vue
@@ -15,8 +15,8 @@
       v-if="!empty"
       ref="scrollbarRef"
       :scrollable="scrollable"
-      :container="virtualListContainer"
-      :content="virtualListContent"
+      :container="virtualScroll && virtualListContainer"
+      :content="virtualScroll && virtualListContent"
       @scroll="doScroll"
     >
       <virtual-list
diff --git a/src/_base/select-menu/src/styles/themed-size.js b/src/_base/select-menu/src/styles/themed-size.js
index cb689494c..f3d9251c5 100644
--- a/src/_base/select-menu/src/styles/themed-size.js
+++ b/src/_base/select-menu/src/styles/themed-size.js
@@ -13,6 +13,9 @@ export default c([
       cM(size + '-size', {
         padding
       }, [
+        cB('scrollbar', {
+          maxHeight: menuHeight
+        }),
         cB('virtual-list', {
           maxHeight: menuHeight
         }),