From 8124653d076e3c8536261aefbdaef6e8d287c772 Mon Sep 17 00:00:00 2001
From: Amour1688 <lcz_1996@foxmail.com>
Date: Fri, 2 Oct 2020 12:14:28 +0800
Subject: [PATCH] fix: grid props

---
 components/grid/Col.tsx | 9 +++++----
 components/grid/Row.tsx | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/grid/Col.tsx b/components/grid/Col.tsx
index 0debb551d..a42e2ca7b 100644
--- a/components/grid/Col.tsx
+++ b/components/grid/Col.tsx
@@ -43,9 +43,10 @@ function parseFlex(flex: FlexType): string {
   return flex;
 }
 
-export default defineComponent<ColProps>({
+export default defineComponent({
   name: 'ACol',
-  setup(props, { slots }) {
+  inheritAttrs: false,
+  setup(_: ColProps, { slots, attrs }) {
     const configProvider = inject('configProvider', defaultConfigProvider);
     const rowContext = inject<rowContextState>('rowContext', {});
 
@@ -62,12 +63,12 @@ export default defineComponent<ColProps>({
         flex,
         style,
         ...others
-      } = props;
+      } = attrs as ColProps;
       const prefixCls = configProvider.getPrefixCls('col', customizePrefixCls);
       let sizeClassObj = {};
       ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'].forEach(size => {
         let sizeProps: ColSize = {};
-        const propSize = (props as any)[size];
+        const propSize = attrs[size];
         if (typeof propSize === 'number') {
           sizeProps.span = propSize;
         } else if (typeof propSize === 'object') {
diff --git a/components/grid/Row.tsx b/components/grid/Row.tsx
index 72324cedd..4b2ac63cc 100644
--- a/components/grid/Row.tsx
+++ b/components/grid/Row.tsx
@@ -8,7 +8,7 @@ import {
   onMounted,
   onBeforeUnmount,
 } from 'vue';
-import classNames from 'classnames';
+import classNames from '../_util/classNames';
 import { tuple } from '../_util/type';
 import PropTypes from '../_util/vue-types';
 import { defaultConfigProvider } from '../config-provider';
@@ -43,12 +43,14 @@ export interface RowProps extends HTMLAttributes {
 
 export default defineComponent<RowProps>({
   name: 'ARow',
-  setup(props, { slots }) {
+  setup(_: RowProps, { slots, attrs }) {
     const rowContext = reactive<rowContextState>({
       gutter: undefined,
     });
     provide('rowContext', rowContext);
 
+    const props = attrs as RowProps;
+
     let token: number;
 
     onMounted(() => {