Skip to content

Commit d571a7f

Browse files
committed
Merge branch 'dev' into tags_component
2 parents 51de3a3 + 48d6d7b commit d571a7f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,8 @@ class TabbedContainerImplComp extends TabbedContainerBaseComp implements IContai
407407
},
408408
} as CompAction;
409409
}
410-
if (value.type === "delete" && this.children.tabs.getView().length <= 1) {
410+
const { path } = action;
411+
if (value.type === "delete" && path[0] === 'tabs' && this.children.tabs.getView().length <= 1) {
411412
messageInstance.warning(trans("tabbedContainer.atLeastOneTabError"));
412413
// at least one tab
413414
return this;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,9 @@ const DrawerView = React.memo((
217217
body: {
218218
padding: 0,
219219
background: props.style.background
220-
}
221-
}), [props.style.background]);
220+
},
221+
mask: props.showMask ? undefined : { background: "transparent" }
222+
}), [props.style.background, props.showMask]);
222223

223224
const rootStyle = useMemo(() =>
224225
props.visible.value ? { overflow: "auto", pointerEvents: "auto" } : {},
@@ -232,7 +233,7 @@ const DrawerView = React.memo((
232233
resizable={resizable}
233234
onResizeStop={onResizeStop}
234235
rootStyle={rootStyle as any}
235-
styles={drawerStyles}
236+
styles={drawerStyles as any}
236237
title={props.title}
237238
$titleAlign={props.titleAlign}
238239
$drawerScrollbar={props.drawerScrollbar}
@@ -248,7 +249,7 @@ const DrawerView = React.memo((
248249
afterOpenChange={afterOpenChange}
249250
zIndex={Layers.drawer}
250251
maskClosable={props.maskClosable}
251-
mask={props.showMask}
252+
mask={true}
252253
className={clsx(`app-${appID}`, props.className)}
253254
data-testid={props.dataTestId as string}
254255
>

client/packages/lowcoder/src/pages/queryLibrary/QueryLibraryEditor.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ export const QueryLibraryEditor = () => {
146146

147147
useEffect(() => {
148148
if (orgId) {
149+
dispatch(fetchDataSourceTypes({ organizationId: orgId }));
149150
dispatch(
150151
fetchDatasource({
151152
organizationId: orgId,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy