Skip to content

Commit 9eebd8d

Browse files
author
undefined
committed
Merge branch 'feat-vue3' of github.com:vueComponent/ant-design-vue into feat-vue3
2 parents da09b87 + 32bedc9 commit 9eebd8d

File tree

8 files changed

+265
-251
lines changed

8 files changed

+265
-251
lines changed

‎types/card.d.ts‎

Lines changed: 90 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Definitions by: akki-jat <https://github.com/akki-jat>
33
// Definitions: https://github.com/vueComponent/ant-design-vue/types
44

5+
import { VNodeChild, CSSProperties } from 'vue';
56
import { AntdComponent } from './component';
67
import { Meta } from './meta';
78

@@ -11,91 +12,93 @@ export declare class Card extends AntdComponent {
1112
static Grid: any;
1213
static Meta: typeof Meta;
1314

14-
tabBarExtraContent: any;
15-
/**
16-
* The action list, shows at the bottom of the Card.
17-
* @type any (slots)
18-
*/
19-
actions: any;
20-
21-
/**
22-
* Current TabPane's key
23-
* @type string
24-
*/
25-
activeTabKey: string;
26-
27-
/**
28-
* Inline style to apply to the card head
29-
* @type object
30-
*/
31-
headStyle: object;
32-
33-
/**
34-
* Inline style to apply to the card content
35-
* @type object
36-
*/
37-
bodyStyle: object;
38-
39-
/**
40-
* Toggles rendering of the border around the card
41-
* @default true
42-
* @type boolean
43-
*/
44-
bordered: boolean;
45-
46-
/**
47-
* Card cover
48-
* @type any (slot)
49-
*/
50-
cover: any;
51-
52-
/**
53-
* Initial active TabPane's key, if activeTabKey is not set.
54-
* @type string
55-
*/
56-
defaultActiveTabKey: string;
57-
58-
/**
59-
* Content to render in the top-right corner of the card
60-
* @type any (string | slot)
61-
*/
62-
extra: any;
63-
64-
/**
65-
* Lift up when hovering card
66-
* @default false
67-
* @type boolean
68-
*/
69-
hoverable: boolean;
70-
71-
/**
72-
* Shows a loading indicator while the contents of the card are being fetched
73-
* @default false
74-
* @type boolean
75-
*/
76-
loading: boolean;
77-
78-
/**
79-
* List of TabPane's head, Custom tabs can be created with the scopedSlots property
80-
* @type Array<{key: string, tab: any, scopedSlots: {tab: string}}>
81-
*/
82-
tabList: Array<{ key: string; tab: any; scopedSlots: { tab: string } }>;
83-
84-
/**
85-
* Card title
86-
* @type any (string | slot)
87-
*/
88-
title: any;
89-
90-
/**
91-
* Card style type, can be set to inner or not set
92-
* @type string
93-
*/
94-
type: string;
95-
96-
/**
97-
* Size of card
98-
* @type string
99-
*/
100-
size: CardSize;
15+
$props: {
16+
tabBarExtraContent: any;
17+
/**
18+
* The action list, shows at the bottom of the Card.
19+
* @type any (slots)
20+
*/
21+
actions: VNodeChild | JSX.Element;
22+
23+
/**
24+
* Current TabPane's key
25+
* @type string
26+
*/
27+
activeTabKey?: string;
28+
29+
/**
30+
* Inline style to apply to the card head
31+
* @type object
32+
*/
33+
headStyle?: CSSProperties;
34+
35+
/**
36+
* Inline style to apply to the card content
37+
* @type object
38+
*/
39+
bodyStyle?: CSSProperties;
40+
41+
/**
42+
* Toggles rendering of the border around the card
43+
* @default true
44+
* @type boolean
45+
*/
46+
bordered?: boolean;
47+
48+
/**
49+
* Card cover
50+
* @type any (slot)
51+
*/
52+
cover?: VNodeChild | JSX.Element;
53+
54+
/**
55+
* Initial active TabPane's key, if activeTabKey is not set.
56+
* @type string
57+
*/
58+
defaultActiveTabKey?: string;
59+
60+
/**
61+
* Content to render in the top-right corner of the card
62+
* @type any (string | slot)
63+
*/
64+
extra?: VNodeChild | JSX.Element;
65+
66+
/**
67+
* Lift up when hovering card
68+
* @default false
69+
* @type boolean
70+
*/
71+
hoverable?: boolean;
72+
73+
/**
74+
* Shows a loading indicator while the contents of the card are being fetched
75+
* @default false
76+
* @type boolean
77+
*/
78+
loading?: boolean;
79+
80+
/**
81+
* List of TabPane's head, Custom tabs can be created with the scopedSlots property
82+
* @type Array<{key: string, tab: any, scopedSlots: {tab: string}}>
83+
*/
84+
tabList?: Array<{ key: string; tab: any; scopedSlots: { tab: string } }>;
85+
86+
/**
87+
* Card title
88+
* @type any (string | slot)
89+
*/
90+
title?: VNodeChild | JSX.Element;
91+
92+
/**
93+
* Card style type, can be set to inner or not set
94+
* @type string
95+
*/
96+
type?: string;
97+
98+
/**
99+
* Size of card
100+
* @type string
101+
*/
102+
size?: CardSize;
103+
};
101104
}

‎types/meta.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ export declare class Meta {
1616
* The description of list item
1717
* @type any (string | slot)
1818
*/
19-
description?: string | VNodeChild;
19+
description?: VNodeChild | JSX.Element;
2020

2121
/**
2222
* The title of list item
2323
* @type any (string | slot)
2424
*/
25-
title?: string | VNodeChild;
25+
title?: VNodeChild | JSX.Element;
2626
};
2727
}

‎types/popconfirm.d.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import { TooltipCommon } from './tootip/common';
66
import { VNodeChild } from 'vue';
7-
export declare class Popconfirm extends TooltipCommon {
7+
import { AntdComponent } from './component';
8+
export declare class Popconfirm extends AntdComponent {
89
$props: {
910
/**
1011
* text of the Cancel button
@@ -45,6 +46,6 @@ export declare class Popconfirm extends TooltipCommon {
4546
* @type boolean
4647
*/
4748
disabled?: boolean;
48-
}
49+
} & TooltipCommon
4950

5051
}

‎types/popover.d.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import { TooltipCommon } from './tootip/common';
66
import { VNodeChild } from 'vue';
7-
export declare class Popover extends TooltipCommon {
7+
import { AntdComponent } from './component';
8+
export declare class Popover extends AntdComponent {
89
$props: {
910
/**
1011
* Content of the card
@@ -17,5 +18,5 @@ export declare class Popover extends TooltipCommon {
1718
* @type any (string | slot | VNode)
1819
*/
1920
title?: VNodeChild | JSX.Element;
20-
}
21+
} & TooltipCommon
2122
}

‎types/tabs/tab-pane.d.ts‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,27 @@
33
// Definitions: https://github.com/vueComponent/ant-design-vue/types
44

55
import { AntdComponent } from '../component';
6+
import { VNodeChild } from 'vue';
67

78
export declare class TabPane extends AntdComponent {
8-
/**
9-
* Forced render of content in tabs, not lazy render after clicking on tabs
10-
* @default false
11-
* @type boolean
12-
*/
13-
forceRender: boolean;
9+
$props: {
10+
/**
11+
* Forced render of content in tabs, not lazy render after clicking on tabs
12+
* @default false
13+
* @type boolean
14+
*/
15+
forceRender?: boolean;
1416

15-
/**
16-
* TabPane's key
17-
* @type string
18-
*/
19-
key: string;
17+
/**
18+
* TabPane's key
19+
* @type string
20+
*/
21+
key?: string;
2022

21-
/**
22-
* Show text in TabPane's head
23-
* @type any (string | slot)
24-
*/
25-
tab: any;
23+
/**
24+
* Show text in TabPane's head
25+
* @type any (string | slot)
26+
*/
27+
tab?: VNodeChild | JSX.Element;
28+
}
2629
}

0 commit comments

Comments
 (0)