Commit 730c161

authored

Merge pull request #339 from mousheng/improve_widthCalculator_and_heightCalculator

improve_widthCalculator_and_heightCalculator

2 parents 1974df2 + e9c5fcc commit 730c161Copy full SHA for 730c161

File tree

1 file changed

+12

-15

lines changed

client/packages/lowcoder/src/comps/controls
- styleControlConstants.tsx

1 file changed

+12

-15

lines changed

`‎client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx‎`

Lines changed: 12 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -945,45 +945,42 @@ export type CarouselStyleType = StyleConfigType<typeof CarouselStyle>;`
`945`	`945`	`export type RichTextEditorStyleType = StyleConfigType<typeof RichTextEditorStyle>;`
`946`	`946`
`947`	`947`	`export function widthCalculator(margin: string) {`
`948`		`- const marginArr = margin?.trim().split(" ") \|\| "";`
	`948`	`+ const marginArr = margin?.trim().replace(/\s+/g,' ').split(" ") \|\| "";`
`949`	`949`	`if (marginArr.length === 1) {`
`950`	`950`	return `calc(100% - ${
`951`		`- parseInt(margin.replace(/[^\d.]/g, "")) * 2 + margin.replace(/[0-9]/g, "")`
	`951`	`+ parseInt(margin.replace(/[^\d.]/g, "")) * 2 +`
	`952`	`+ (margin.replace(/[0-9]/g, "") \|\| "px")`
`952`	`953`	})`;
`953`	`954`	`} else if (marginArr.length === 2 \|\| marginArr.length === 3) {`
`954`	`955`	return `calc(100% - ${
`955`	`956`	`parseInt(marginArr[1].replace(/[^\d.]/g, "")) * 2 +`
`956`		`- marginArr[1].replace(/[0-9]/g, "")`
	`957`	`+ (marginArr[1].replace(/[0-9]/g, "")\|\|'px')`
`957`	`958`	})`;
`958`	`959`	`} else {`
`959`	`960`	return `calc(100% - ${
`960`	`961`	`parseInt(marginArr[1]?.replace(/[^\d.]/g, "") \|\| "0") +`
`961`		`- marginArr[1]?.replace(/[0-9]/g, "" \|\| "px")`
	`962`	`+ (marginArr[1]?.replace(/[0-9]/g, "") \|\| "px")`
`962`	`963`	`} - ${`
`963`	`964`	`parseInt(marginArr[3]?.replace(/[^\d.]/g, "") \|\| "0") +`
`964`		`- marginArr[3]?.replace(/[0-9]/g, "" \|\| "px")`
	`965`	`+ (marginArr[3]?.replace(/[0-9]/g, "") \|\| "px")`
`965`	`966`	})`;
`966`	`967`	`}`
`967`	`968`	`}`
`968`	`969`
`969`	`970`	`export function heightCalculator(margin: string) {`
`970`	`971`	`const marginArr = margin?.trim().split(" ") \|\| "";`
`971`		`- if (marginArr.length === 1) {`
`972`		- return `calc(100% - ${
`973`		`- parseInt(margin.replace(/[^\d.]/g, "")) * 2 + margin.replace(/[0-9]/g, "")`
`974`		- })`;
`975`		`- } else if (marginArr.length === 2) {`
	`972`	`+ if (marginArr.length === 1 \|\| marginArr.length === 2) {`
`976`	`973`	return `calc(100% - ${
`977`		`- parseInt(marginArr[0].replace(/[^\d.]/g, "")) * 2 +`
`978`		`- marginArr[0].replace(/[0-9]/g, "")`
	`974`	`+ parseInt(marginArr[0].replace(/[^\d.]/g, "")) * 2 +`
	`975`	`+ (marginArr[0].replace(/[0-9]/g, "")\|\|'px')`
`979`	`976`	})`;
`980`		`- }else {`
	`977`	`+ }else if(marginArr.length>2){`
`981`	`978`	return `calc(100% - ${
`982`	`979`	`parseInt(marginArr[0]?.replace(/[^\d.]/g, "") \|\| "0") +`
`983`		`- marginArr[0]?.replace(/[0-9]/g, "") \|\| "px"`
	`980`	`+ (marginArr[0]?.replace(/[0-9]/g, "") \|\| "px")`
`984`	`981`	`} - ${`
`985`	`982`	`parseInt(marginArr[2]?.replace(/[^\d.]/g, "") \|\| "0") +`
`986`		`- marginArr[2]?.replace(/[0-9]/g, "") \|\| "px"`
	`983`	`+ (marginArr[2]?.replace(/[0-9]/g, "") \|\| "px")`
`987`	`984`	})`;
`988`	`985`	`}`
`989`	`986`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 730c161

File tree

1 file changed

1 file changed

`‎client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx‎`

0 commit comments