@@ -36,12 +36,13 @@ import {
36
36
HorizontalIcon ,
37
37
VerticalIcon ,
38
38
} from "lowcoder-design/src/icons" ;
39
- import { BackgroundColor } from "@lowcoder-ee/constants/style" ;
40
39
41
- const SplitPanelWrapper = styled ( Splitter . Panel ) < { } > `
40
+ const SplitPanelWrapper = styled ( Splitter . Panel ) `
41
+ overflow: hidden;
42
42
` ;
43
43
44
44
const SplitterWrapper = styled . div < { $style : SplitLayoutRowStyleType } > `
45
+ height: 100%;
45
46
border-radius: ${ ( props ) => props . $style ?. radius || "0px" } ;
46
47
border-width: ${ ( props ) => props . $style ?. borderWidth || "0px" } ;
47
48
border-color: ${ ( props ) => props . $style ?. border || "transparent" } ;
@@ -103,7 +104,8 @@ const ColumnContainer = (props: ColumnContainerProps) => {
103
104
...props . style ,
104
105
height : props . orientation === "horizontal"
105
106
? ( props . matchColumnsHeight ? heightCalculator ( props . margin ) : "auto" )
106
- : ( props . autoHeight ? "100%" : "auto" ) ,
107
+ : ( props . autoHeight ? heightCalculator ( props . margin ) : heightCalculator ( props . margin ) ) ,
108
+ overflow : 'auto' ,
107
109
} }
108
110
/>
109
111
) ;
@@ -115,19 +117,26 @@ const SplitLayout = (props: SplitLayoutProps) => {
115
117
< BackgroundColorContext . Provider value = { props . columnStyle . background } >
116
118
< DisabledContext . Provider value = { props . disabled } >
117
119
< SplitterWrapper $style = { props . bodyStyle } >
118
- < Splitter style = { { overflow : props . mainScrollbar ? "auto" : "hidden" } } layout = { props . orientation } >
120
+ < Splitter
121
+ style = { {
122
+ overflow : props . mainScrollbar ? "auto" : "hidden" ,
123
+ height : props . autoHeight && props . orientation === 'vertical' ? '500px' : '100%' ,
124
+ } }
125
+ layout = { props . orientation }
126
+ >
119
127
{ props . columns . map ( ( col , index ) => {
120
128
const id = String ( col . id ) ;
121
129
const childDispatch = wrapDispatch ( wrapDispatch ( props . dispatch , "containers" ) , id ) ;
122
130
const containerProps = props . containers [ id ] ?. children ;
131
+
123
132
return (
124
133
< SplitPanelWrapper
125
134
key = { id }
126
135
collapsible = { col . collapsible }
127
136
{ ...( col . minWidth !== undefined ? { min : col . minWidth } : { } ) }
128
137
{ ...( col . maxWidth !== undefined ? { max : col . maxWidth } : { } ) }
129
138
{ ...( col . width !== undefined ? { defaultSize : col . width } : { } ) }
130
- >
139
+ >
131
140
< ColumnContainer
132
141
layout = { containerProps . layout . getView ( ) }
133
142
items = { gridItemCompToGridItems ( containerProps . items . getView ( ) ) }
0 commit comments