Skip to content

Commit e79a930

Browse files
committed
fix: ts error
1 parent e4c737e commit e79a930

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

components/dropdown/dropdown-button.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { provide, inject, defineComponent } from 'vue';
33
import Button from '../button';
44
import classNames from '../_util/classNames';
55
import buttonTypes from '../button/buttonTypes';
6-
import { ButtonGroupProps } from '../button/button-group';
76
import Dropdown from './dropdown';
87
import PropTypes from '../_util/vue-types';
98
import { hasProp, getComponent, getSlot } from '../_util/props-util';
@@ -16,7 +15,6 @@ const ButtonTypesProps = buttonTypes();
1615
const DropdownProps = getDropdownProps();
1716
const ButtonGroup = Button.Group;
1817
const dropdownButtonProps = {
19-
...ButtonGroupProps,
2018
...DropdownProps,
2119
type: PropTypes.oneOf(tuple('primary', 'ghost', 'dashed', 'danger', 'default')).def('default'),
2220
size: PropTypes.oneOf(tuple('small', 'large', 'default')).def('default'),

components/input/inputProps.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { tuple } from '../_util/type';
21
import type { PropType } from 'vue';
32
import PropTypes from '../_util/vue-types';
3+
import type { SizeType } from '../config-provider';
44
export default {
55
prefixCls: PropTypes.string,
66
inputPrefixCls: PropTypes.string,
@@ -11,7 +11,7 @@ export default {
1111
},
1212
type: PropTypes.string.def('text'),
1313
name: PropTypes.string,
14-
size: PropTypes.oneOf(tuple('small', 'large', 'default')),
14+
size: { type: String as PropType<SizeType> },
1515
disabled: PropTypes.looseBool,
1616
readonly: PropTypes.looseBool,
1717
addonBefore: PropTypes.VNodeChild,

0 commit comments

Comments
 (0)