fix: ts error

pull/4301/head
tangjinzhou 2021-06-30 15:17:53 +08:00
parent e4c737e752
commit e79a930e59
2 changed files with 2 additions and 4 deletions

View File

@ -3,7 +3,6 @@ import { provide, inject, defineComponent } from 'vue';
import Button from '../button'; import Button from '../button';
import classNames from '../_util/classNames'; import classNames from '../_util/classNames';
import buttonTypes from '../button/buttonTypes'; import buttonTypes from '../button/buttonTypes';
import { ButtonGroupProps } from '../button/button-group';
import Dropdown from './dropdown'; import Dropdown from './dropdown';
import PropTypes from '../_util/vue-types'; import PropTypes from '../_util/vue-types';
import { hasProp, getComponent, getSlot } from '../_util/props-util'; import { hasProp, getComponent, getSlot } from '../_util/props-util';
@ -16,7 +15,6 @@ const ButtonTypesProps = buttonTypes();
const DropdownProps = getDropdownProps(); const DropdownProps = getDropdownProps();
const ButtonGroup = Button.Group; const ButtonGroup = Button.Group;
const dropdownButtonProps = { const dropdownButtonProps = {
...ButtonGroupProps,
...DropdownProps, ...DropdownProps,
type: PropTypes.oneOf(tuple('primary', 'ghost', 'dashed', 'danger', 'default')).def('default'), type: PropTypes.oneOf(tuple('primary', 'ghost', 'dashed', 'danger', 'default')).def('default'),
size: PropTypes.oneOf(tuple('small', 'large', 'default')).def('default'), size: PropTypes.oneOf(tuple('small', 'large', 'default')).def('default'),

View File

@ -1,6 +1,6 @@
import { tuple } from '../_util/type';
import type { PropType } from 'vue'; import type { PropType } from 'vue';
import PropTypes from '../_util/vue-types'; import PropTypes from '../_util/vue-types';
import type { SizeType } from '../config-provider';
export default { export default {
prefixCls: PropTypes.string, prefixCls: PropTypes.string,
inputPrefixCls: PropTypes.string, inputPrefixCls: PropTypes.string,
@ -11,7 +11,7 @@ export default {
}, },
type: PropTypes.string.def('text'), type: PropTypes.string.def('text'),
name: PropTypes.string, name: PropTypes.string,
size: PropTypes.oneOf(tuple('small', 'large', 'default')), size: { type: String as PropType<SizeType> },
disabled: PropTypes.looseBool, disabled: PropTypes.looseBool,
readonly: PropTypes.looseBool, readonly: PropTypes.looseBool,
addonBefore: PropTypes.VNodeChild, addonBefore: PropTypes.VNodeChild,