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
Prev Previous commit
Next Next commit
Fixing 2.2.0 bugs - 2
  • Loading branch information
FalkWolsky committed Dec 5, 2023
commit 3151d7372abcf7289b4d57e1c3447f6bd7cceadd
3 changes: 1 addition & 2 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"type": "module",
"private": true,
"workspaces": [
"packages/*",
"packages/lowcoder-dev-utils"
"packages/*"
],
"engines": {
"node": "^14.18.0 || >=16.0.0"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -145,7 +145,7 @@ const RowHeightTempComp = withContext(
.setPropertyViewFn((children) =>
children.height.propertyView({
label: rowHeightLabel,
tooltip: trans("table.rowColorDesc"),
tooltip: trans("table.rowHeightDesc"),
})
)
.build(),
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/textComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { EditorContext } from "comps/editorState";
const getStyle = (style: TextStyleType) => {
return css`
border-radius: ${(style.radius ? style.radius : "4px")};
border: ${(style.borderWidth ? style.borderWidth : "1px")} solid ${style.border};
border: ${(style.borderWidth ? style.borderWidth : "0px")} solid ${style.border};
color: ${style.text};
background-color: ${style.background};
.markdown-body a {
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/controls/styleControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function calcColors<ColorMap extends Record<string, string>>(
res[name] = themeWithDefault[config.radius];
}
if (isBorderWidthConfig(config)) {
res[name] = '1px';
res[name] = '0px';
}
if (isTextSizeConfig(config)) {
// TODO: remove default textSize after added in theme in backend.
Expand Down
2 changes: 2 additions & 0 deletions deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ COPY ./client /lowcoder-client
WORKDIR /lowcoder-client
RUN yarn --immutable

# TODO: build lowcoder-comps

# curl is required for yarn build to succeed, because it calls it while building client
RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates

Expand Down