Skip to content

Commit 792c79b

Browse files
author
FalkWolsky
committed
Fixing Scrollbar Property & Icon position for left menu tree
1 parent 4cdbe2a commit 792c79b

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export class TriContainerComp extends TriContainerBaseComp implements IContainer
125125
this.children.showHeader.propertyView({ label: trans("prop.showHeader") }),
126126
this.children.showBody.propertyView({ label: trans("prop.showBody") }),
127127
this.children.showFooter.propertyView({ label: trans("prop.showFooter") }),
128-
this.children.scrollbars.propertyView({ label: trans("prop.scrollbar") }),
128+
(!this.children.autoHeight.getView()) && this.children.scrollbars.propertyView({ label: trans("prop.scrollbar") }),
129129
];
130130
}
131131

client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -506,17 +506,11 @@ export const MarginStyle = [
506506
export const ContainerStyle = [
507507
// ...BG_STATIC_BORDER_RADIUS,
508508
getStaticBorder(),
509+
getBackground(),
509510
RADIUS,
510511
BORDER_WIDTH,
511512
MARGIN,
512513
PADDING,
513-
{
514-
name: "background",
515-
label: trans("style.background"),
516-
depName: "background",
517-
depType: DEP_TYPE.SELF,
518-
transformer: toSelf,
519-
},
520514
{
521515
name: "backgroundImage",
522516
label: trans("style.backgroundImage"),

client/packages/lowcoder/src/pages/editor/LeftContent.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,11 @@ export const LeftContent = (props: LeftContentProps) => {
435435
<DirectoryTreeStyle
436436
treeData={explorerData}
437437
// icon={(props: NodeItem) => props.type && (CompStateIcon[props.type] || <LeftCommon />)}
438-
icon={(props: any) => props.type && (CompStateIcon[props.type as UICompType] || <LeftCommon />)}
438+
icon={(props: any) => props.type && (
439+
<div style={{ margin: '16px 4px 0 -4px'}}>
440+
{CompStateIcon[props.type as UICompType] || <LeftCommon />}
441+
</div>
442+
)}
439443
// switcherIcon={({ expanded }: { expanded: boolean }) =>
440444
// expanded ? <FoldedIcon /> : <UnfoldIcon />
441445
// }

client/packages/lowcoder/src/pages/editor/LeftLayersContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ export const LeftLayersContent = (props: LeftLayersContentProps) => {
458458
onDrop={(info) => handleDrop(info)}
459459
treeData={componentTreeData}
460460
icon={(props: any) => props.type && (
461-
<div style={{ margin: '3px 4px 0 -4px'}}> {/* Adjust the margin as needed */}
461+
<div style={{ margin: '3px 4px 0 -4px'}}>
462462
{CompStateIcon[props.type as UICompType] || <LeftCommon />}
463463
</div>
464464
)}

0 commit comments

Comments
 (0)