fix_widthCalculator_and_heightCalculator

mousheng · ludomikula · commit 7caae8433794 · 2023-08-28T20:45:22.000+02:00
diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
@@ -959,45 +959,42 @@ export type ResponsiveLayoutRowStyleType = StyleConfigType<typeof ResponsiveLayo
 export type ResponsiveLayoutColStyleType = StyleConfigType<typeof ResponsiveLayoutColStyle>;
 
 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")
     })`;
   }
 }
