Skip to content

[Fix]: #1290 add zindex property for stacking issue #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[Fix]: #1290 add zindex property for stacking issue #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions client/packages/lowcoder/src/comps/hooks/drawerComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ContainerCompBuilder } from "comps/comps/containerBase/containerCompBui
import { gridItemCompToGridItems, InnerGrid } from "comps/comps/containerComp/containerView";
import { AutoHeightControl } from "comps/controls/autoHeightControl";
import { BoolControl } from "comps/controls/boolControl";
import { StringControl } from "comps/controls/codeControl";
import { StringControl, NumberControl } from "comps/controls/codeControl";
import { booleanExposingStateControl } from "comps/controls/codeStateControl";
import { PositionControl, LeftRightControl, HorizontalAlignmentControl } from "comps/controls/dropdownControl";
import { eventHandlerControl } from "comps/controls/eventHandlerControl";
Expand Down Expand Up @@ -122,6 +122,7 @@ const childrenMap = {
showMask: withDefault(BoolControl, true),
toggleClose:withDefault(BoolControl,true),
escapeClosable: withDefault(BoolControl, true),
zIndex: withDefault(NumberControl, Layers.drawer),
};

type ChildrenType = NewChildren<RecordConstructorToComp<typeof childrenMap>> & {
Expand Down Expand Up @@ -168,6 +169,9 @@ const DrawerPropertyView = React.memo((props: {
{props.children.escapeClosable.propertyView({
label: trans("prop.escapeClose"),
})}
{props.children.zIndex.propertyView({
label: trans("prop.zIndex"),
})}
</Section>
<Section name={sectionNames.interaction}>{props.children.onEvent.getPropertyView()}</Section>
<Section name={sectionNames.style}>{props.children.style.getPropertyView()}</Section>
Expand Down Expand Up @@ -251,7 +255,7 @@ const DrawerView = React.memo((
height={!props.autoHeight ? transToPxSize(props.height || DEFAULT_SIZE) : ""}
onClose={onClose}
afterOpenChange={afterOpenChange}
zIndex={Layers.drawer}
zIndex={props.zIndex}
maskClosable={props.maskClosable}
mask={true}
className={clsx(`app-${appID}`, props.className)}
Expand Down
10 changes: 7 additions & 3 deletions client/packages/lowcoder/src/comps/hooks/modalComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ContainerCompBuilder } from "comps/comps/containerBase/containerCompBuilder";
import { gridItemCompToGridItems, InnerGrid } from "comps/comps/containerComp/containerView";
import { AutoHeightControl } from "comps/controls/autoHeightControl";
import { StringControl } from "comps/controls/codeControl";
import { StringControl, NumberControl } from "comps/controls/codeControl";
import { booleanExposingStateControl } from "comps/controls/codeStateControl";
import { eventHandlerControl } from "comps/controls/eventHandlerControl";
import { styleControl } from "comps/controls/styleControl";
Expand Down Expand Up @@ -117,7 +117,8 @@ const childrenMap = {
style: styleControl(ModalStyle),
maskClosable: withDefault(BoolControl, true),
showMask: withDefault(BoolControl, true),
toggleClose:withDefault(BoolControl,true)
toggleClose:withDefault(BoolControl,true),
zIndex: withDefault(NumberControl, Layers.modal)
};

const ModalPropertyView = React.memo((props: {
Expand Down Expand Up @@ -156,6 +157,9 @@ const ModalPropertyView = React.memo((props: {
{props.children.toggleClose.propertyView({
label: trans("prop.toggleClose"),
})}
{props.children.zIndex.propertyView({
label: trans("prop.zIndex"),
})}
</Section>
<Section name={sectionNames.interaction}>{props.children.onEvent.getPropertyView()}</Section>
<Section name={sectionNames.style}>{props.children.style.getPropertyView()}</Section>
Expand Down Expand Up @@ -278,7 +282,7 @@ const ModalView = React.memo((
onCancel={handleCancel}
afterClose={handleAfterClose}
afterOpenChange={handleAfterOpenChange}
zIndex={Layers.modal}
zIndex={props.zIndex}
modalRender={modalRender}
mask={props.showMask}
className={clsx(`app-${appID}`, props.className)}
Expand Down
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/i18n/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ export const en = {
"timeZone": "TimeZone",
"pickerMode": "Picker Mode",
"customTags": "Allow Custom Tags",
"customTagsTooltip": "Allow users to enter custom tags that are not in the options list."
"customTagsTooltip": "Allow users to enter custom tags that are not in the options list.",
"zIndex": "z-Index"
},
"autoHeightProp": {
"auto": "Auto",
Expand Down
Loading