Skip to content

Commit 8124653

Browse files
committed
fix: grid props
1 parent 5832a70 commit 8124653

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

components/grid/Col.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ function parseFlex(flex: FlexType): string {
4343
return flex;
4444
}
4545

46-
export default defineComponent<ColProps>({
46+
export default defineComponent({
4747
name: 'ACol',
48-
setup(props, { slots }) {
48+
inheritAttrs: false,
49+
setup(_: ColProps, { slots, attrs }) {
4950
const configProvider = inject('configProvider', defaultConfigProvider);
5051
const rowContext = inject<rowContextState>('rowContext', {});
5152

@@ -62,12 +63,12 @@ export default defineComponent<ColProps>({
6263
flex,
6364
style,
6465
...others
65-
} = props;
66+
} = attrs as ColProps;
6667
const prefixCls = configProvider.getPrefixCls('col', customizePrefixCls);
6768
let sizeClassObj = {};
6869
['xs', 'sm', 'md', 'lg', 'xl', 'xxl'].forEach(size => {
6970
let sizeProps: ColSize = {};
70-
const propSize = (props as any)[size];
71+
const propSize = attrs[size];
7172
if (typeof propSize === 'number') {
7273
sizeProps.span = propSize;
7374
} else if (typeof propSize === 'object') {

components/grid/Row.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
onMounted,
99
onBeforeUnmount,
1010
} from 'vue';
11-
import classNames from 'classnames';
11+
import classNames from '../_util/classNames';
1212
import { tuple } from '../_util/type';
1313
import PropTypes from '../_util/vue-types';
1414
import { defaultConfigProvider } from '../config-provider';
@@ -43,12 +43,14 @@ export interface RowProps extends HTMLAttributes {
4343

4444
export default defineComponent<RowProps>({
4545
name: 'ARow',
46-
setup(props, { slots }) {
46+
setup(_: RowProps, { slots, attrs }) {
4747
const rowContext = reactive<rowContextState>({
4848
gutter: undefined,
4949
});
5050
provide('rowContext', rowContext);
5151

52+
const props = attrs as RowProps;
53+
5254
let token: number;
5355

5456
onMounted(() => {

0 commit comments

Comments
 (0)