Skip to content

Dev -> Main - 2.2.0 hotfixes #565

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 9 commits into from
Dec 5, 2023
Merged

Dev -> Main - 2.2.0 hotfixes #565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cbdc580
fix: UI issue on horizonal scrollable table
raheeliftikhar5 Dec 4, 2023
9d68bb7
fix: conditional row height
raheeliftikhar5 Dec 4, 2023
cb8fee7
Fixing 2.2.0 bugs
Dec 5, 2023
de1bc70
feat: table row fixed/auto height + column ellipsis/wrap switch
raheeliftikhar5 Dec 5, 2023
fbcedf2
fix: small update
raheeliftikhar5 Dec 5, 2023
fc8185e
Merge branch 'dev' into table-fixes
FalkWolsky Dec 5, 2023
11bd51c
Merge pull request #564 from raheeliftikhar5/table-fixes
FalkWolsky Dec 5, 2023
3151d73
Fixing 2.2.0 bugs - 2
Dec 5, 2023
dcd674c
Merge branch 'main' into dev
FalkWolsky Dec 5, 2023
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
fix: UI issue on horizonal scrollable table
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Dec 4, 2023
commit cbdc5809ecb9d05110429d95ebc44fef91f93449
4 changes: 4 additions & 0 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 @@ -169,6 +169,10 @@ const TableWrapper = styled.div<{
border-top: none !important;
border-inline-start: none !important;

&::after {
box-shadow: none !important;
}

.ant-table-content {
overflow: unset !important;
}
Expand Down
12 changes: 5 additions & 7 deletions client/packages/lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ const getStyle = (
return css`
background-color: ${style.toolbarBackground};
// Implement horizontal scrollbar and vertical page number selection is not blocked
// padding: ${position === "above" ? "13px 16px 313px 16px" : "313px 16px 13px 16px"};
// margin: ${position === "above" ? "0 0 -300px 0" : "-300px 0 0 0"};
padding: 13px 12px;
${fixedToolbar && `
position: sticky;
postion: -webkit-sticky;
z-index: 99;
`};
position: sticky;
postion: -webkit-sticky;
left: 0;

${fixedToolbar && `z-index: 99;`};
${fixedToolbar && position === 'below' && `bottom: 0;`};
${fixedToolbar && position === 'above' && `top: 0;` };

Expand Down