Skip to content

Commit 2d54e21

Browse files
committed
fix: type error
1 parent b5d7d58 commit 2d54e21

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

components/checkbox/Checkbox.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default defineComponent({
3737
});
3838
onMounted(() => {
3939
warning(
40-
props.checked !== undefined || checkboxGroup || props.value === undefined,
40+
!!(props.checked !== undefined || checkboxGroup || props.value === undefined),
4141
'Checkbox',
4242
'`value` is not validate prop, do you mean `checked`?',
4343
);

components/modal/Modal.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { useLocaleReceiver } from '../locale-provider/LocaleReceiver';
1212
import initDefaultProps from '../_util/props-util/initDefaultProps';
1313
import type { Direction } from '../config-provider';
1414
import type { VueNode } from '../_util/type';
15+
import { objectType } from '../_util/type';
1516
import { canUseDocElement } from '../_util/styleChecker';
1617
import useConfigInject from '../config-provider/hooks/useConfigInject';
1718
import { getTransitionName } from '../_util/transition';
@@ -55,8 +56,8 @@ export const modalProps = () => ({
5556
icon: PropTypes.any,
5657
maskClosable: { type: Boolean, default: undefined },
5758
forceRender: { type: Boolean, default: undefined },
58-
okButtonProps: Object as PropType<ButtonPropsType>,
59-
cancelButtonProps: Object as PropType<ButtonPropsType>,
59+
okButtonProps: objectType<ButtonPropsType>(),
60+
cancelButtonProps: objectType<ButtonPropsType>(),
6061
destroyOnClose: { type: Boolean, default: undefined },
6162
wrapClassName: String,
6263
maskTransitionName: String,
@@ -68,8 +69,8 @@ export const modalProps = () => ({
6869
default: undefined,
6970
},
7071
zIndex: Number,
71-
bodyStyle: { type: Object as PropType<CSSProperties>, default: undefined as CSSProperties },
72-
maskStyle: { type: Object as PropType<CSSProperties>, default: undefined as CSSProperties },
72+
bodyStyle: objectType<CSSProperties>(),
73+
maskStyle: objectType<CSSProperties>(),
7374
mask: { type: Boolean, default: undefined },
7475
keyboard: { type: Boolean, default: undefined },
7576
wrapProps: Object,

components/vc-input/inputProps.ts

+23-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { ExtractPropTypes, PropType } from 'vue';
22
import PropTypes from '../_util/vue-types';
33
import type { SizeType } from '../config-provider';
4-
import type { LiteralUnion, VueNode } from '../_util/type';
4+
import type { VueNode } from '../_util/type';
55
import type {
66
ChangeEventHandler,
77
CompositionEventHandler,
@@ -56,31 +56,28 @@ export const inputProps = () => ({
5656
autocomplete: String,
5757
type: {
5858
type: String as PropType<
59-
LiteralUnion<
60-
| 'button'
61-
| 'checkbox'
62-
| 'color'
63-
| 'date'
64-
| 'datetime-local'
65-
| 'email'
66-
| 'file'
67-
| 'hidden'
68-
| 'image'
69-
| 'month'
70-
| 'number'
71-
| 'password'
72-
| 'radio'
73-
| 'range'
74-
| 'reset'
75-
| 'search'
76-
| 'submit'
77-
| 'tel'
78-
| 'text'
79-
| 'time'
80-
| 'url'
81-
| 'week',
82-
string
83-
>
59+
| 'button'
60+
| 'checkbox'
61+
| 'color'
62+
| 'date'
63+
| 'datetime-local'
64+
| 'email'
65+
| 'file'
66+
| 'hidden'
67+
| 'image'
68+
| 'month'
69+
| 'number'
70+
| 'password'
71+
| 'radio'
72+
| 'range'
73+
| 'reset'
74+
| 'search'
75+
| 'submit'
76+
| 'tel'
77+
| 'text'
78+
| 'time'
79+
| 'url'
80+
| 'week'
8481
>,
8582
default: 'text',
8683
},

components/vc-tree/Tree.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ export default defineComponent({
11411141
);
11421142

11431143
// It's better move to hooks but we just simply keep here
1144-
let draggableConfig: DraggableConfig;
1144+
let draggableConfig: DraggableConfig | false;
11451145
if (draggable) {
11461146
if (typeof draggable === 'object') {
11471147
draggableConfig = draggable;
@@ -1152,6 +1152,8 @@ export default defineComponent({
11521152
} else {
11531153
draggableConfig = {};
11541154
}
1155+
} else {
1156+
draggableConfig = false;
11551157
}
11561158
return (
11571159
<TreeContext

components/vc-tree/TreeNode.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ export default defineComponent({
293293
// ==================== Render: Drag Handler ====================
294294
const renderDragHandler = () => {
295295
const { draggable, prefixCls } = context.value;
296-
return draggable?.icon ? (
296+
return draggable && draggable?.icon ? (
297297
<span class={`${prefixCls}-draggable-icon`}>{draggable.icon}</span>
298298
) : null;
299299
};

components/vc-tree/contextTypes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export interface TreeContextProps {
4040
showIcon: boolean;
4141
icon: IconType;
4242
switcherIcon: IconType;
43-
draggable: DraggableConfig;
43+
draggable: DraggableConfig | false;
4444
draggingNodeKey?: Key;
4545
checkable: boolean;
4646
customCheckable: () => any;

0 commit comments

Comments
 (0)