fix(antd/next): fix gridSpan calculate algorithm (#1440)

alibaba · May 19, 2021 · 3b1f1cf · 3b1f1cf
1 parent 48b7d05
commit 3b1f1cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/antd/src/form-grid/index.tsx b/packages/antd/src/form-grid/index.tsx
@@ -264,9 +264,9 @@ export const useGridSpan = (gridSpan = 1) => {
       return gridSpan
     } else {
       if (isValid(maxColumns)) {
-        return Math.min(calc, columns, maxColumns)
+        return Math.min(calc, gridSpan, maxColumns)
       }
-      return Math.min(calc, columns)
+      return Math.min(calc, gridSpan)
     }
   } else {
     if (Math.min(calc, columns) >= gridSpan) {

diff --git a/packages/next/src/form-grid/index.tsx b/packages/next/src/form-grid/index.tsx
@@ -264,9 +264,9 @@ export const useGridSpan = (gridSpan = 1) => {
       return gridSpan
     } else {
       if (isValid(maxColumns)) {
-        return Math.min(calc, columns, maxColumns)
+        return Math.min(calc, gridSpan, maxColumns)
       }
-      return Math.min(calc, columns)
+      return Math.min(calc, gridSpan)
     }
   } else {
     if (Math.min(calc, columns) >= gridSpan) {