File tree 2 files changed +25
-0
lines changed
2 files changed +25
-0
lines changed Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ export const ColProps = {
27
27
xl : objectOrNumber ,
28
28
xxl : objectOrNumber ,
29
29
prefixCls : PropTypes . string ,
30
+ flex : stringOrNumber ,
30
31
} ;
31
32
32
33
export default {
@@ -38,13 +39,25 @@ export default {
38
39
default : ( ) => null ,
39
40
} ,
40
41
} ,
42
+ methods : {
43
+ parseFlex ( flex ) {
44
+ if ( typeof flex === 'number' ) {
45
+ return `${ flex } ${ flex } auto` ;
46
+ }
47
+ if ( / ^ \d + ( \. \d + ) ? ( p x | e m | r e m | % ) $ / . test ( flex ) ) {
48
+ return `0 0 ${ flex } ` ;
49
+ }
50
+ return flex ;
51
+ } ,
52
+ } ,
41
53
render ( ) {
42
54
const {
43
55
span,
44
56
order,
45
57
offset,
46
58
push,
47
59
pull,
60
+ flex,
48
61
prefixCls : customizePrefixCls ,
49
62
$slots,
50
63
rowContext,
@@ -105,6 +118,11 @@ export default {
105
118
} ;
106
119
}
107
120
}
121
+
122
+ if ( flex ) {
123
+ divProps . style . flex = this . parseFlex ( flex ) ;
124
+ }
125
+
108
126
return < div { ...divProps } > { $slots . default } </ div > ;
109
127
} ,
110
128
} ;
Original file line number Diff line number Diff line change @@ -19,6 +19,13 @@ export declare class Col extends AntdComponent {
19
19
*/
20
20
order : ColSpanType ;
21
21
22
+ /**
23
+ * the layout fill of flex
24
+ * @default none
25
+ * @type ColSpanType
26
+ */
27
+ flex : ColSpanType ;
28
+
22
29
/**
23
30
* the number of cells to offset Col from the left
24
31
* @default 0
You can’t perform that action at this time.
0 commit comments