Skip to content

Commit 3e84c3b

Browse files
authored
Merge pull request #1054 from MenamAfzal/fix/table-issues
Fix/table issues
2 parents 42a1596 + 74a87f7 commit 3e84c3b

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ const getStyle = (
6969
&,
7070
> td {
7171
background: ${genLinerGradient(rowStyle.background)};
72-
border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
73-
border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
72+
// border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
73+
// border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
7474
}
7575
}
7676
7777
> tr:nth-of-type(2n) {
7878
&,
7979
> td {
8080
background: ${alternateBackground};
81-
border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
82-
border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
81+
// border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
82+
// border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
8383
}
8484
}
8585
@@ -192,11 +192,14 @@ const TableWrapper = styled.div<{
192192
}
193193
194194
.ant-table {
195-
background: ${(props) => props.$style.background};
195+
overflow-y:scroll;
196+
background: ${(props) =>props.$style.background};
196197
.ant-table-container {
197198
border-left: unset;
198199
border-top: none !important;
199200
border-inline-start: none !important;
201+
overflow-y:scroll;
202+
height:300px;
200203
201204
&::after {
202205
box-shadow: none !important;
@@ -221,7 +224,7 @@ const TableWrapper = styled.div<{
221224
border-color: ${(props) => props.$headerStyle.border};
222225
border-width: ${(props) => props.$headerStyle.borderWidth};
223226
color: ${(props) => props.$headerStyle.headerText};
224-
border-inline-end: ${(props) => `${props.$headerStyle.borderWidth} solid ${props.$headerStyle.border}`} !important;
227+
// border-inline-end: ${(props) => `${props.$headerStyle.borderWidth} solid ${props.$headerStyle.border}`} !important;
225228
${(props) =>
226229
props.$fixedHeader && `
227230
position: sticky;
@@ -269,6 +272,7 @@ const TableWrapper = styled.div<{
269272
270273
td {
271274
padding: 0px 0px;
275+
// ${(props) => props.$showHRowGridBorder ?'border-bottom: 1px solid #D7D9E0 !important;': `border-bottom: 0px;`}
272276
}
273277
274278
thead > tr:first-child {
@@ -278,7 +282,7 @@ const TableWrapper = styled.div<{
278282
}
279283
280284
tbody > tr > td:last-child {
281-
border-right: unset;
285+
border-right: unset !important;
282286
}
283287
284288
.ant-empty-img-simple-g {

client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ export type RowHeightViewType = (param: {
192192
const tableChildrenMap = {
193193
// hideBordered: BoolControl,
194194
showHeaderGridBorder: BoolControl,
195-
showRowGridBorder: BoolControl,
196-
showHRowGridBorder: BoolControl,
195+
showRowGridBorder: withDefault(BoolControl,true),
196+
showHRowGridBorder: withDefault(BoolControl,true),
197197
hideHeader: BoolControl,
198198
fixedHeader: BoolControl,
199199
autoHeight: withDefault(AutoHeightControl, "auto"),

0 commit comments

Comments
 (0)