Grid新的一行不满columnNum时，如果自定义了itemStyle，用来填充columnNum的item样式会和正常的item不一样…

…的问题 (ant-design#583) * 不满一行时，填充的item样式问题 * update test snapshots
hunson1990 · Jul 24, 2019 · 23986b8 · 23986b8
1 parent f42449a
commit 23986b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/components/grid/__tests__/__snapshots__/demo.test.js.snap b/components/grid/__tests__/__snapshots__/demo.test.js.snap
@@ -828,6 +828,7 @@ exports[`renders ./components/grid/demo/basic.tsx correctly 1`] = `
                     "borderRightWidth": 0,
                     "height": 187.5,
                   },
+                  Object {},
                 ],
               ]
             }
@@ -846,6 +847,7 @@ exports[`renders ./components/grid/demo/basic.tsx correctly 1`] = `
                     "borderRightWidth": 0,
                     "height": 187.5,
                   },
+                  Object {},
                 ],
               ]
             }
@@ -864,6 +866,7 @@ exports[`renders ./components/grid/demo/basic.tsx correctly 1`] = `
                     "borderRightWidth": 0,
                     "height": 187.5,
                   },
+                  Object {},
                 ],
               ]
             }

diff --git a/components/grid/index.tsx b/components/grid/index.tsx
@@ -95,7 +95,7 @@ export default class Grid extends React.Component<GridProps, any> {
                 rowArr.push(
                   <Flex.Item
                     key={j}
-                    style={[styles.grayBorderBox, flexItemStyle]}
+                    style={[styles.grayBorderBox, flexItemStyle, customItemStyle]}
                   />,
                 );
               }