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
fix: small update
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Dec 5, 2023
commit fbcedf293a08e73f86b62d01c3867c0fd85fab97
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 @@ -137,7 +137,7 @@ export type RowColorViewType = (param: {
columnTitle: string;
}) => string;

const rowHeightLabel = "Conditional Row Height"; //trans("table.rowColor");
const rowHeightLabel = trans("table.rowHeight");
const RowHeightTempComp = withContext(
new MultiCompBuilder({
height: HeightOrBoolCodeControl,
Expand Down
6 changes: 3 additions & 3 deletions client/packages/lowcoder/src/comps/controls/textOverflowControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { dropdownAbstractControl } from "./dropdownControl";

const overflowOptions = [
{
label: "Ellipsis", // trans("autoHeightProp.auto"),
label: trans("textOverflowProp.ellipsis"),
value: "ellipsis",
},
{
label: "Wrap", // trans("autoHeightProp.fixed"),
label: trans("textOverflowProp.wrap"),
value: "wrap",
},
] as const;
Expand All @@ -20,7 +20,7 @@ export class TextOverflowControl extends TextOverflowTmpControl {
}

override getPropertyView() {
return this.propertyView({ label: "Text Overflow"/*trans("prop.height")*/ });
return this.propertyView({ label: trans("prop.textOverflow") });
}

override propertyView(params: ControlParams) {
Expand Down
13 changes: 10 additions & 3 deletions client/packages/lowcoder/src/i18n/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,17 @@ export const en = {
"showBody": "Show Body",
"showFooter": "Show Footer",
"maskClosable": "Click Outside to Close",
"showMask": "Show Mask"
"showMask": "Show Mask",
"textOverflow": "Text Overflow",
},
"autoHeightProp": {
"auto": "Auto",
"fixed": "Fixed"
},
"textOverflowProp": {
"ellipsis": "Ellipsis",
"wrap": "Wrap"
},
"labelProp": {
"text": "Label",
"tooltip": "Tooltip",
Expand Down Expand Up @@ -1290,9 +1295,11 @@ export const en = {
"sortChange": "Sort Change",
"pageChange": "Page Change",
"refresh": "Refresh",
"rowColor": "Conditional Row Color",
"rowColor": "Conditional row color",
"rowColorDesc": "Conditionally Set the Row Color Based on the Optional Variables: CurrentRow, CurrentOriginalIndex, CurrentIndex, ColumnTitle. For Example: '{{ currentRow.id > 3 ? \"green\" : \"red\" }}'",
"cellColor": "Conditional Cell Color",
"rowHeight": "Conditional row height",
"rowHeightDesc": "Conditionally Set the Row Height Based on the Optional Variables: CurrentRow, CurrentOriginalIndex, CurrentIndex, ColumnTitle. For Example: '{{ currentRow.id > 3 ? \"60px\" : \"40px\" }}'",
"cellColor": "Conditional cell color",
"cellColorDesc": "Conditionally Set the Cell Color Based on the Cell Value Using CurrentCell. For Example: '{{ currentCell == 3 ? \"green\" : \"red\" }}'",
"saveChangesNotBind": "No Event Handler Configured for Saving Changes. Please Bind at Least One Event Handler Before Click.",
"dynamicColumn": "Use Dynamic Column Setting",
Expand Down