github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feat v4 fix type errors (#6285) 

* fix compile type errors

* fix menuprops type import

* fix lint errors

* fix lint errors

* fix format error

* fix node version

* fix run dist error

* fix run lint

* fix as any

* fix string type
pull/6295/head
果冻橙 2023-02-17 22:01:30 +08:00 committed by GitHub
parent 895b43338d
commit 7ddf882a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 98 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/_util/colors.ts
View File

@ -14,7 +14,7 @@ export const PresetStatusColorTypes = [
export type PresetColorType = PresetColorKey | InverseColor; export type PresetColorType = PresetColorKey | InverseColor;
export type PresetStatusColorType = typeof PresetStatusColorTypes[number]; export type PresetStatusColorType = (typeof PresetStatusColorTypes)[number];
/** /**
* determine if the color keyword belongs to the `Ant Design` {@link PresetColors}. * determine if the color keyword belongs to the `Ant Design` {@link PresetColors}.

2
components/_util/statusUtils.tsx
View File

@ -3,7 +3,7 @@ import classNames from './classNames';
const InputStatuses = ['warning', 'error', ''] as const; const InputStatuses = ['warning', 'error', ''] as const;
export type InputStatus = typeof InputStatuses[number]; export type InputStatus = (typeof InputStatuses)[number];
export function getStatusClassNames( export function getStatusClassNames(
prefixCls: string, prefixCls: string,

2
components/_util/transition.tsx
View File

@ -9,7 +9,7 @@ import { nextTick, Transition, TransitionGroup } from 'vue';
import { tuple } from './type'; import { tuple } from './type';
const SelectPlacements = tuple('bottomLeft', 'bottomRight', 'topLeft', 'topRight'); const SelectPlacements = tuple('bottomLeft', 'bottomRight', 'topLeft', 'topRight');
export type SelectCommonPlacement = typeof SelectPlacements[number]; export type SelectCommonPlacement = (typeof SelectPlacements)[number];
const getTransitionDirection = (placement: SelectCommonPlacement | undefined) => { const getTransitionDirection = (placement: SelectCommonPlacement | undefined) => {
if (placement !== undefined && (placement === 'topLeft' || placement === 'topRight')) { if (placement !== undefined && (placement === 'topLeft' || placement === 'topRight')) {

2
components/alert/index.tsx
View File

@ -35,7 +35,7 @@ const iconMapOutlined = {
const AlertTypes = tuple('success', 'info', 'warning', 'error'); const AlertTypes = tuple('success', 'info', 'warning', 'error');
export type AlertType = typeof AlertTypes[number]; export type AlertType = (typeof AlertTypes)[number];
export const alertProps = () => ({ export const alertProps = () => ({
/** /**

8
components/config-provider/index.tsx
View File

@ -44,11 +44,9 @@ function getGlobalIconPrefixCls() {
return globalConfigForApi.iconPrefixCls || defaultIconPrefixCls; return globalConfigForApi.iconPrefixCls || defaultIconPrefixCls;
} }
const globalConfigBySet = reactive<ConfigProviderProps>({}); // 权重最大 const globalConfigBySet = reactive<ConfigProviderProps>({}); // 权重最大
export const globalConfigForApi = reactive< export const globalConfigForApi: ConfigProviderProps & {
ConfigProviderProps & { getRootPrefixCls?: (rootPrefixCls?: string, customizePrefixCls?: string) => string;
getRootPrefixCls?: (rootPrefixCls?: string, customizePrefixCls?: string) => string; } = reactive({});
}
>({});
export const configConsumerProps = [ export const configConsumerProps = [
'getTargetContainer', 'getTargetContainer',

2
components/date-picker/__tests__/other.test.js
View File

@ -3,7 +3,7 @@ import { asyncExpect, sleep } from '../../../tests/utils';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import DatePicker from '../'; import DatePicker from '../';
import LocaleProvider from '../../locale-provider'; import LocaleProvider from '../../locale-provider';
import locale from '../../locale-provider/zh_CN'; import locale from '../../locale/zh_CN';
jest.mock('../../_util/Portal'); jest.mock('../../_util/Portal');
const { MonthPicker, WeekPicker } = DatePicker; const { MonthPicker, WeekPicker } = DatePicker;

4
components/drawer/index.tsx
View File

@ -24,10 +24,10 @@ import type { KeyboardEventHandler, MouseEventHandler } from '../_util/EventInte
type ILevelMove = number | [number, number]; type ILevelMove = number | [number, number];
const PlacementTypes = tuple('top', 'right', 'bottom', 'left'); const PlacementTypes = tuple('top', 'right', 'bottom', 'left');
export type placementType = typeof PlacementTypes[number]; export type placementType = (typeof PlacementTypes)[number];
const SizeTypes = tuple('default', 'large'); const SizeTypes = tuple('default', 'large');
export type sizeType = typeof SizeTypes[number]; export type sizeType = (typeof SizeTypes)[number];
export interface PushState { export interface PushState {
distance: string | number; distance: string | number;

6
components/form/Form.tsx
View File

@ -24,6 +24,7 @@ import type {
Callbacks, Callbacks,
ValidateMessages, ValidateMessages,
Rule, Rule,
FormLabelAlign,
} from './interface'; } from './interface';
import useConfigInject from '../config-provider/hooks/useConfigInject'; import useConfigInject from '../config-provider/hooks/useConfigInject';
import { useProvideForm } from './context'; import { useProvideForm } from './context';
@ -42,7 +43,10 @@ export const formProps = () => ({
labelCol: { type: Object as PropType<ColProps & HTMLAttributes> }, labelCol: { type: Object as PropType<ColProps & HTMLAttributes> },
wrapperCol: { type: Object as PropType<ColProps & HTMLAttributes> }, wrapperCol: { type: Object as PropType<ColProps & HTMLAttributes> },
colon: { type: Boolean, default: undefined }, colon: { type: Boolean, default: undefined },
labelAlign: PropTypes.oneOf(tuple('left', 'right')), labelAlign: {
...PropTypes.oneOf(tuple('left', 'right')),
type: String as PropType<FormLabelAlign>,
},
labelWrap: { type: Boolean, default: undefined }, labelWrap: { type: Boolean, default: undefined },
prefixCls: String, prefixCls: String,
requiredMark: { type: [String, Boolean] as PropType<RequiredMark | ''>, default: undefined }, requiredMark: { type: [String, Boolean] as PropType<RequiredMark | ''>, default: undefined },

16
components/form/FormItem.tsx
View File

@ -32,7 +32,14 @@ import { toArray } from './utils/typeUtil';
import { warning } from '../vc-util/warning'; import { warning } from '../vc-util/warning';
import find from 'lodash-es/find'; import find from 'lodash-es/find';
import { tuple } from '../_util/type'; import { tuple } from '../_util/type';
import type { InternalNamePath, Rule, RuleError, RuleObject, ValidateOptions } from './interface'; import type {
InternalNamePath,
Rule,
RuleError,
RuleObject,
ValidateOptions,
FormLabelAlign,
} from './interface';
import useConfigInject from '../config-provider/hooks/useConfigInject'; import useConfigInject from '../config-provider/hooks/useConfigInject';
import { useInjectForm } from './context'; import { useInjectForm } from './context';
import FormItemLabel from './FormItemLabel'; import FormItemLabel from './FormItemLabel';
@ -44,7 +51,7 @@ import useDebounce from './utils/useDebounce';
import classNames from '../_util/classNames'; import classNames from '../_util/classNames';
const ValidateStatuses = tuple('success', 'warning', 'error', 'validating', ''); const ValidateStatuses = tuple('success', 'warning', 'error', 'validating', '');
export type ValidateStatus = typeof ValidateStatuses[number]; export type ValidateStatus = (typeof ValidateStatuses)[number];
export interface FieldExpose { export interface FieldExpose {
fieldValue: Ref<any>; fieldValue: Ref<any>;
@ -105,7 +112,10 @@ export const formItemProps = () => ({
wrapperCol: { type: Object as PropType<ColProps & HTMLAttributes> }, wrapperCol: { type: Object as PropType<ColProps & HTMLAttributes> },
hasFeedback: { type: Boolean, default: false }, hasFeedback: { type: Boolean, default: false },
colon: { type: Boolean, default: undefined }, colon: { type: Boolean, default: undefined },
labelAlign: PropTypes.oneOf(tuple('left', 'right')), labelAlign: {
...PropTypes.oneOf(tuple('left', 'right')),
type: String as PropType<FormLabelAlign>,
},
prop: { type: [String, Number, Array] as PropType<string | number | Array<string | number>> }, prop: { type: [String, Number, Array] as PropType<string | number | Array<string | number>> },
name: { type: [String, Number, Array] as PropType<string | number | Array<string | number>> }, name: { type: [String, Number, Array] as PropType<string | number | Array<string | number>> },
rules: [Array, Object] as PropType<Rule[] | Rule>, rules: [Array, Object] as PropType<Rule[] | Rule>,

2
components/grid/demo/use-breakpoint.vue
View File

@ -19,7 +19,7 @@ Use `useBreakpoint` Hook provide personalized layout.
<template> <template>
Current break point: Current break point:
<template v-for="(value, key) in screens"> <template v-for="(value, key) in screens">
<a-tag v-if="!!value" color="blue" :key="key"> <a-tag v-if="!!value" :key="key" color="blue">
{{ key }} {{ key }}
</a-tag> </a-tag>
</template> </template>

102
components/locale-provider/__tests__/index.test.js
View File

@ -14,57 +14,57 @@ import {
Transfer, Transfer,
} from '../..'; } from '../..';
import LocaleProvider from '..'; import LocaleProvider from '..';
import arEG from '../ar_EG'; import arEG from '../../locale/ar_EG';
import bgBG from '../bg_BG'; import bgBG from '../../locale/bg_BG';
import caES from '../ca_ES'; import caES from '../../locale/ca_ES';
import csCZ from '../cs_CZ'; import csCZ from '../../locale/cs_CZ';
import daDK from '../da_DK'; import daDK from '../../locale/da_DK';
import deDE from '../de_DE'; import deDE from '../../locale/de_DE';
import elGR from '../el_GR'; import elGR from '../../locale/el_GR';
import enGB from '../en_GB'; import enGB from '../../locale/en_GB';
import enUS from '../en_US'; import enUS from '../../locale/en_US';
import esES from '../es_ES'; import esES from '../../locale/es_ES';
import etEE from '../et_EE'; import etEE from '../../locale/et_EE';
import faIR from '../fa_IR'; import faIR from '../../locale/fa_IR';
import fiFI from '../fi_FI'; import fiFI from '../../locale/fi_FI';
import frBE from '../fr_BE'; import frBE from '../../locale/fr_BE';
import frFR from '../fr_FR'; import frFR from '../../locale/fr_FR';
import heIL from '../he_IL'; import heIL from '../../locale/he_IL';
import hiIN from '../hi_IN'; import hiIN from '../../locale/hi_IN';
import hrHR from '../hr_HR'; import hrHR from '../../locale/hr_HR';
import huHU from '../hu_HU'; import huHU from '../../locale/hu_HU';
import hyAM from '../hy_AM'; import hyAM from '../../locale/hy_AM';
import isIS from '../is_IS'; import isIS from '../../locale/is_IS';
import itIT from '../it_IT'; import itIT from '../../locale/it_IT';
import jaJP from '../ja_JP'; import jaJP from '../../locale/ja_JP';
import knIN from '../kn_IN'; import knIN from '../../locale/kn_IN';
import koKR from '../ko_KR'; import koKR from '../../locale/ko_KR';
import kuIQ from '../ku_IQ'; import kuIQ from '../../locale/ku_IQ';
import mkMK from '../mk_MK'; import mkMK from '../../locale/mk_MK';
import mnMN from '../mn_MN'; import mnMN from '../../locale/mn_MN';
import msMY from '../ms_MY'; import msMY from '../../locale/ms_MY';
import nbNO from '../nb_NO'; import nbNO from '../../locale/nb_NO';
import neNP from '../ne-NP'; import neNP from '../../locale/ne_NP';
import nlBE from '../nl_BE'; import nlBE from '../../locale/nl_BE';
import nlNL from '../nl_NL'; import nlNL from '../../locale/nl_NL';
import plPL from '../pl_PL'; import plPL from '../../locale/pl_PL';
import ptBR from '../pt_BR'; import ptBR from '../../locale/pt_BR';
import ptPT from '../pt_PT'; import ptPT from '../../locale/pt_PT';
import roRO from '../ro_RO'; import roRO from '../../locale/ro_RO';
import ruRU from '../ru_RU'; import ruRU from '../../locale/ru_RU';
import skSK from '../sk_SK'; import skSK from '../../locale/sk_SK';
import slSI from '../sl_SI'; import slSI from '../../locale/sl_SI';
import srRS from '../sr_RS'; import srRS from '../../locale/sr_RS';
import svSE from '../sv_SE'; import svSE from '../../locale/sv_SE';
import taIN from '../ta_IN'; import taIN from '../../locale/ta_IN';
import thTH from '../th_TH'; import thTH from '../../locale/th_TH';
import trTR from '../tr_TR'; import trTR from '../../locale/tr_TR';
import ukUA from '../uk_UA'; import ukUA from '../../locale/uk_UA';
import viVN from '../vi_VN'; import viVN from '../../locale/vi_VN';
import idID from '../id_ID'; import idID from '../../locale/id_ID';
import lvLV from '../lv_LV'; import lvLV from '../../locale/lv_LV';
import zhCN from '../zh_CN'; import zhCN from '../../locale/zh_CN';
import zhTW from '../zh_TW'; import zhTW from '../../locale/zh_TW';
const locales = [ const locales = [
arEG, arEG,

2
components/mentions/index.tsx
View File

@ -279,7 +279,7 @@ const Mentions = defineComponent({
/* istanbul ignore next */ /* istanbul ignore next */
export const MentionsOption = defineComponent({ export const MentionsOption = defineComponent({
compatConfig: { MODE: 3 }, compatConfig: { MODE: 3 },
...Option, ...(Option as any),
name: 'AMentionsOption', name: 'AMentionsOption',
props: optionProps, props: optionProps,
}); });

2
components/menu/src/OverrideContext.ts
View File

@ -1,6 +1,6 @@
import type { ComputedRef, InjectionKey } from 'vue'; import type { ComputedRef, InjectionKey } from 'vue';
import { provide, computed, inject } from 'vue'; import { provide, computed, inject } from 'vue';
import type { MenuProps } from './menu'; import type { MenuProps } from './Menu';
// Used for Dropdown only // Used for Dropdown only
export interface OverrideContextProps { export interface OverrideContextProps {

2
components/radio/Group.tsx
View File

@ -11,7 +11,7 @@ import { useProvideRadioGroupContext } from './context';
const RadioGroupSizeTypes = tuple('large', 'default', 'small'); const RadioGroupSizeTypes = tuple('large', 'default', 'small');
export type RadioGroupSize = typeof RadioGroupSizeTypes[number]; export type RadioGroupSize = (typeof RadioGroupSizeTypes)[number];
export type RadioGroupOption = RadioGroupOptionType; export type RadioGroupOption = RadioGroupOptionType;

6
components/skeleton/Skeleton.tsx
View File

@ -96,9 +96,9 @@ const Skeleton = defineComponent({
const { loading, avatar, title, paragraph, active, round } = props; const { loading, avatar, title, paragraph, active, round } = props;
const pre = prefixCls.value; const pre = prefixCls.value;
if (loading || props.loading === undefined) { if (loading || props.loading === undefined) {
const hasAvatar = !!avatar || avatar === ''; const hasAvatar = !!avatar || (avatar as string) === '';
const hasTitle = !!title || title === ''; const hasTitle = !!title || (title as string) === '';
const hasParagraph = !!paragraph || paragraph === ''; const hasParagraph = !!paragraph || (paragraph as string) === '';
// Avatar // Avatar
let avatarNode; let avatarNode;

4
components/table/index.tsx
View File

@ -16,8 +16,8 @@ export type { ColumnProps } from './Column';
export type { ColumnsType, ColumnType, ColumnGroupType } from './interface'; export type { ColumnsType, ColumnType, ColumnGroupType } from './interface';
export type { TableProps, TablePaginationConfig }; export type { TableProps, TablePaginationConfig };
const TableSummaryRow = defineComponent({ ...SummaryRow, name: 'ATableSummaryRow' }); const TableSummaryRow = defineComponent({ ...(SummaryRow as any), name: 'ATableSummaryRow' });
const TableSummaryCell = defineComponent({ ...SummaryCell, name: 'ATableSummaryCell' }); const TableSummaryCell = defineComponent({ ...(SummaryCell as any), name: 'ATableSummaryCell' });
const TableSummary = Object.assign(Summary, { const TableSummary = Object.assign(Summary, {
Cell: TableSummaryCell, Cell: TableSummaryCell,

2
components/theme/util/genComponentStyleHook.ts
View File

@ -6,7 +6,7 @@ import { genCommonStyle, genLinkStyle } from '../../_style';
import type { UseComponentStyleResult } from '../internal'; import type { UseComponentStyleResult } from '../internal';
import { mergeToken, statisticToken, useToken } from '../internal'; import { mergeToken, statisticToken, useToken } from '../internal';
import type { ComponentTokenMap, GlobalToken } from '../interface'; import type { ComponentTokenMap, GlobalToken } from '../interface';
import useConfigInject from 'ant-design-vue/es/config-provider/hooks/useConfigInject'; import useConfigInject from '../../config-provider/hooks/useConfigInject';
import type { Ref } from 'vue'; import type { Ref } from 'vue';
import { computed } from 'vue'; import { computed } from 'vue';

6
components/tree/index.tsx
View File

@ -26,7 +26,11 @@ export type {
/* istanbul ignore next */ /* istanbul ignore next */
const TreeNode = defineComponent({ ...VcTreeNode, name: 'ATreeNode', props: treeNodeProps }); const TreeNode = defineComponent({
...(VcTreeNode as any),
name: 'ATreeNode',
props: treeNodeProps,
});
export { DirectoryTree, TreeNode }; export { DirectoryTree, TreeNode };

2
components/vc-picker/panels/DatetimePanel/index.tsx
View File

@ -17,7 +17,7 @@ export type DatetimePanelProps<DateType> = {
} & Omit<DatePanelProps<DateType>, 'disabledHours' | 'disabledMinutes' | 'disabledSeconds'>; } & Omit<DatePanelProps<DateType>, 'disabledHours' | 'disabledMinutes' | 'disabledSeconds'>;
const ACTIVE_PANEL = tuple('date', 'time'); const ACTIVE_PANEL = tuple('date', 'time');
type ActivePanelType = typeof ACTIVE_PANEL[number]; type ActivePanelType = (typeof ACTIVE_PANEL)[number];
function DatetimePanel<DateType>(_props: DatetimePanelProps<DateType>) { function DatetimePanel<DateType>(_props: DatetimePanelProps<DateType>) {
const props = useMergeProps(_props); const props = useMergeProps(_props);

2
components/vc-select/BaseSelect.tsx
View File

@ -700,7 +700,7 @@ export default defineComponent({
typeof getRawInputElement === 'function' && getRawInputElement(); typeof getRawInputElement === 'function' && getRawInputElement();
const domProps = { const domProps = {
...restProps, ...restProps,
} as Omit<keyof typeof restProps, typeof DEFAULT_OMIT_PROPS[number]>; } as Omit<keyof typeof restProps, (typeof DEFAULT_OMIT_PROPS)[number]>;
// Used for raw custom input trigger // Used for raw custom input trigger
let onTriggerVisibleChange: null | ((newOpen: boolean) => void); let onTriggerVisibleChange: null | ((newOpen: boolean) => void);

2
components/vc-select/utils/valueUtil.ts
View File

@ -86,7 +86,7 @@ export function flattenOptions<OptionType extends BaseOptionType = DefaultOption
/** /**
* Inject `props` into `option` for legacy usage * Inject `props` into `option` for legacy usage
*/ */
export function injectPropsWithOption<T>(option: T): T { export function injectPropsWithOption<T extends object>(option: T): T {
const newOption = { ...option }; const newOption = { ...option };
if (!('props' in newOption)) { if (!('props' in newOption)) {
Object.defineProperty(newOption, 'props', { Object.defineProperty(newOption, 'props', {

2
webpack.build.conf.js
View File

@ -52,7 +52,7 @@ function externalDayjs(config) {
}); });
config.externals.push(function ({ _context, request }, callback) { config.externals.push(function ({ _context, request }, callback) {
if (/^dayjs\/plugin\//.test(request)) { if (/^dayjs\/plugin\//.test(request)) {
const name = request.replaceAll('/', '_'); const name = request.replace(/\//g, '_');
return callback(null, { return callback(null, {
root: name, root: name,
commonjs2: name, commonjs2: name,