Skip to content

Commit 39b0370

Browse files
fix drawer comp issues
1 parent 3880389 commit 39b0370

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

client/packages/lowcoder/src/comps/hooks/drawerComp.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,19 @@ const StyledDrawer = styled(Drawer)<{$titleAlign?: string, $drawerScrollbar: boo
4545
.ant-drawer-header-title {
4646
margin: 0px 20px !important;
4747
text-align: ${(props) => props.$titleAlign || "center"};
48+
49+
.ant-drawer-title {
50+
position: relative;
51+
z-index: 11;
52+
}
4853
}
49-
div.ant-drawer-body div.react-grid-layout::-webkit-scrollbar {
50-
display: ${(props) => props.$drawerScrollbar ? "block" : "none"};
54+
55+
div.ant-drawer-body div.react-grid-layout {
56+
overflow: auto;
57+
58+
&::-webkit-scrollbar {
59+
display: ${(props) => props.$drawerScrollbar ? "block" : "none"};
60+
}
5161
}
5262
`;
5363

@@ -102,7 +112,8 @@ let TmpDrawerComp = (function () {
102112
closePosition: withDefault(LeftRightControl, "left"),
103113
maskClosable: withDefault(BoolControl, true),
104114
showMask: withDefault(BoolControl, true),
105-
toggleClose:withDefault(BoolControl,true)
115+
toggleClose:withDefault(BoolControl,true),
116+
escapeClosable: withDefault(BoolControl, true),
106117
},
107118
(props, dispatch) => {
108119
const isTopBom = ["top", "bottom"].includes(props.placement);
@@ -143,6 +154,7 @@ let TmpDrawerComp = (function () {
143154
$titleAlign={props.titleAlign}
144155
$drawerScrollbar={props.drawerScrollbar}
145156
closable={false}
157+
keyboard={props.escapeClosable}
146158
placement={props.placement}
147159
open={props.visible.value}
148160
getContainer={() => document.querySelector(`#${CanvasContainerID}`) || document.body}
@@ -224,6 +236,9 @@ let TmpDrawerComp = (function () {
224236
{children.toggleClose.propertyView({
225237
label: trans("prop.toggleClose"),
226238
})}
239+
{children.escapeClosable.propertyView({
240+
label: trans("prop.escapeClose"),
241+
})}
227242
</Section>
228243
<Section name={sectionNames.interaction}>{children.onEvent.getPropertyView()}</Section>
229244
<Section name={sectionNames.style}>{children.style.getPropertyView()}</Section>

client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ export const en = {
198198
"innerSider" : "Inner Sider",
199199
"showFooter": "Show Footer",
200200
"maskClosable": "Click Outside to Close",
201+
"escapeClose": "Enable Close on Escape key",
201202
"toggleClose": "Enable Close Button",
202203
"showMask": "Show Mask",
203204
"textOverflow": "Text Overflow",

0 commit comments

Comments
 (0)