Skip to content

Fix/table issues #1054

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

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Fix/table issues #1054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce35ed4
horizontal and vertical border fixed
MenamAfzal Jul 22, 2024
74a87f7
scroll added
MenamAfzal Jul 22, 2024
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
Next Next commit
horizontal and vertical border fixed
  • Loading branch information
@MenamAfzal
MenamAfzal committed Jul 22, 2024
commit ce35ed4769480b4d58e5bf4859f8dbf3539e8e7f
15 changes: 8 additions & 7 deletions client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ const getStyle = (
&,
> td {
background: ${genLinerGradient(rowStyle.background)};
border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
// border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
// border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
}
}

> tr:nth-of-type(2n) {
&,
> td {
background: ${alternateBackground};
border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
// border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
// border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
}
}

Expand Down Expand Up @@ -192,7 +192,7 @@ const TableWrapper = styled.div<{
}

.ant-table {
background: ${(props) => props.$style.background};
background: ${(props) =>props.$style.background};
.ant-table-container {
border-left: unset;
border-top: none !important;
Expand Down Expand Up @@ -221,7 +221,7 @@ const TableWrapper = styled.div<{
border-color: ${(props) => props.$headerStyle.border};
border-width: ${(props) => props.$headerStyle.borderWidth};
color: ${(props) => props.$headerStyle.headerText};
border-inline-end: ${(props) => `${props.$headerStyle.borderWidth} solid ${props.$headerStyle.border}`} !important;
// border-inline-end: ${(props) => `${props.$headerStyle.borderWidth} solid ${props.$headerStyle.border}`} !important;
${(props) =>
props.$fixedHeader && `
position: sticky;
Expand Down Expand Up @@ -269,6 +269,7 @@ const TableWrapper = styled.div<{

td {
padding: 0px 0px;
// ${(props) => props.$showHRowGridBorder ?'border-bottom: 1px solid #D7D9E0 !important;': `border-bottom: 0px;`}
}

thead > tr:first-child {
Expand All @@ -278,7 +279,7 @@ const TableWrapper = styled.div<{
}

tbody > tr > td:last-child {
border-right: unset;
border-right: unset !important;
}

.ant-empty-img-simple-g {
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ export type RowHeightViewType = (param: {
const tableChildrenMap = {
// hideBordered: BoolControl,
showHeaderGridBorder: BoolControl,
showRowGridBorder: BoolControl,
showHRowGridBorder: BoolControl,
showRowGridBorder: withDefault(BoolControl,true),
showHRowGridBorder: withDefault(BoolControl,true),
hideHeader: BoolControl,
fixedHeader: BoolControl,
autoHeight: withDefault(AutoHeightControl, "auto"),
Expand Down