diff --git a/components/drawer/drawer.tsx b/components/drawer/drawer.tsx
index edeb0143..974d217a 100644
--- a/components/drawer/drawer.tsx
+++ b/components/drawer/drawer.tsx
@@ -12,7 +12,8 @@ import {
} from 'vue';
import { isNumber } from 'lodash-es';
import getPrefixCls from '../_util/getPrefixCls';
-import FButton from '../button/button';
+import FButton from '../button';
+import FScrollbar from '../scrollbar';
import { CloseOutlined } from '../icon';
import PopupManager from '../_util/popupManager';
import useLockScreen from '../_util/use/useLockScreen';
@@ -215,9 +216,12 @@ const Drawer = defineComponent({
onClick={(event) => event.stopPropagation()}
>
{getHeader()}
-
+
{ctx.slots.default?.()}
-
+
{getFooter()}
diff --git a/components/drawer/style/index.less b/components/drawer/style/index.less
index 8e66b092..ea94ae98 100644
--- a/components/drawer/style/index.less
+++ b/components/drawer/style/index.less
@@ -21,7 +21,7 @@
.fixed-full();
display: flex;
}
-
+
&-wrapper {
position: relative;
display: flex;
@@ -30,7 +30,7 @@
border-radius: var(--f-border-radius-base);
box-shadow: @shadow-down;
}
-
+
&-header {
position: relative;
display: flex;
@@ -47,10 +47,13 @@
}
}
- &-body {
+ &-body-wrapper {
flex: 1;
+ }
+
+ &-body-container {
+ box-sizing: border-box;
padding: @padding-md calc(@padding-md + @padding-xs);
- overflow: auto;
color: var(--f-sub-head-color);
font-size: var(--f-font-size-base);
}
@@ -78,7 +81,7 @@
&-mask-fade-enter-active {
transition: opacity @animation-duration-slow @ease-base-in;
}
-
+
&-mask-fade-leave-to,
&-mask-fade-enter-from {
opacity: 0;
@@ -155,4 +158,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/components/virtual-list/props.ts b/components/virtual-list/props.ts
index 875532e7..35838880 100644
--- a/components/virtual-list/props.ts
+++ b/components/virtual-list/props.ts
@@ -17,6 +17,7 @@ export const virtualProps = {
dataSources: {
type: Array as PropType,
required: true,
+ default: (): DataSource[] => [],
},
keeps: {
type: Number,
diff --git a/docs/.vitepress/components/drawer/common.vue b/docs/.vitepress/components/drawer/common.vue
index 3ee3a8b9..01c3ac52 100644
--- a/docs/.vitepress/components/drawer/common.vue
+++ b/docs/.vitepress/components/drawer/common.vue
@@ -48,7 +48,7 @@
:footer="true"
@ok="show[4] = false"
>
- 我是内容...
+ 我是内容...
我是内容...
我是内容...