Skip to content

improve_widthCalculator_and_heightCalculator #339

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
Aug 21, 2023
Merged

improve_widthCalculator_and_heightCalculator #339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7814e1
fix_widthCalculator_and_heightCalculator
mousheng Aug 7, 2023
e9c5fcc
Merge branch 'main' into improve_widthCalculator_and_heightCalculator
aaron1604 Aug 21, 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
27 changes: 12 additions & 15 deletions client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,45 +945,42 @@ export type CarouselStyleType = StyleConfigType<typeof CarouselStyle>;
export type RichTextEditorStyleType = StyleConfigType<typeof RichTextEditorStyle>;

export function widthCalculator(margin: string) {
const marginArr = margin?.trim().split(" ") || "";
const marginArr = margin?.trim().replace(/\s+/g,' ').split(" ") || "";
if (marginArr.length === 1) {
return `calc(100% - ${
parseInt(margin.replace(/[^\d.]/g, "")) * 2 + margin.replace(/[0-9]/g, "")
parseInt(margin.replace(/[^\d.]/g, "")) * 2 +
(margin.replace(/[0-9]/g, "") || "px")
})`;
} else if (marginArr.length === 2 || marginArr.length === 3) {
return `calc(100% - ${
parseInt(marginArr[1].replace(/[^\d.]/g, "")) * 2 +
marginArr[1].replace(/[0-9]/g, "")
(marginArr[1].replace(/[0-9]/g, "") || 'px')
})`;
} else {
return `calc(100% - ${
parseInt(marginArr[1]?.replace(/[^\d.]/g, "") || "0") +
marginArr[1]?.replace(/[0-9]/g, "" || "px")
(marginArr[1]?.replace(/[0-9]/g, "") || "px")
} - ${
parseInt(marginArr[3]?.replace(/[^\d.]/g, "") || "0") +
marginArr[3]?.replace(/[0-9]/g, "" || "px")
(marginArr[3]?.replace(/[0-9]/g, "") || "px")
})`;
}
}

export function heightCalculator(margin: string) {
const marginArr = margin?.trim().split(" ") || "";
if (marginArr.length === 1) {
return `calc(100% - ${
parseInt(margin.replace(/[^\d.]/g, "")) * 2 + margin.replace(/[0-9]/g, "")
})`;
} else if (marginArr.length === 2) {
if (marginArr.length === 1 || marginArr.length === 2) {
return `calc(100% - ${
parseInt(marginArr[0].replace(/[^\d.]/g, "")) * 2 +
marginArr[0].replace(/[0-9]/g, "")
parseInt(marginArr[0].replace(/[^\d.]/g, "")) * 2 +
(marginArr[0].replace(/[0-9]/g, "") || 'px')
})`;
} else {
}else if(marginArr.length >2){
return `calc(100% - ${
parseInt(marginArr[0]?.replace(/[^\d.]/g, "") || "0") +
marginArr[0]?.replace(/[0-9]/g, "") || "px"
(marginArr[0]?.replace(/[0-9]/g, "") || "px")
} - ${
parseInt(marginArr[2]?.replace(/[^\d.]/g, "") || "0") +
marginArr[2]?.replace(/[0-9]/g, "") || "px"
(marginArr[2]?.replace(/[0-9]/g, "") || "px")
})`;
}
}
Expand Down