fix(grid): fix calcSatisfyColumns

alibaba · Oct 21, 2021 · 04dead3 · 04dead3
1 parent 9e468fa
commit 04dead3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/grid/src/index.ts b/packages/grid/src/index.ts
@@ -68,9 +68,9 @@ const calcSatisfyColumns = (
     if (columnWidth >= minWidth && columnWidth <= maxWidth) {
       results.push(columns)
     } else if (columnWidth < minWidth) {
-      results.push(Math.floor(innerWidth / minWidth))
+      results.push(Math.min(Math.floor(innerWidth / minWidth), maxColumns))
     } else if (columnWidth > maxWidth) {
-      results.push(Math.floor(innerWidth / maxWidth))
+      results.push(Math.min(Math.floor(innerWidth / maxWidth), maxColumns))
     }
   }
   return Math.max(...results)