Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/form/Dependency/dependency2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ProFormText,
} from '@ant-design/pro-components';
import { Form } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import type { NamePath } from 'antd/es/form/interface';

const Demo = () => {
const initialValues = {
Expand Down
2 changes: 1 addition & 1 deletion demos/form/QueryFilter/light-filter-footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LightFilter, ProFormText } from '@ant-design/pro-components';
import { Button, Radio, Space } from 'antd';
import type { SizeType } from 'antd/lib/config-provider/SizeContext';
import type { SizeType } from 'antd/es/config-provider/SizeContext';
import React from 'react';

const Demo = () => {
Expand Down
2 changes: 1 addition & 1 deletion demos/form/QueryFilter/light-filter-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
ProFormText,
} from '@ant-design/pro-components';
import { Radio } from 'antd';
import type { SizeType } from 'antd/lib/config-provider/SizeContext';
import type { SizeType } from 'antd/es/config-provider/SizeContext';
import dayjs from 'dayjs';
import React from 'react';

Expand Down
2 changes: 1 addition & 1 deletion demos/form/QueryFilter/light-filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
ProFormTreeSelect,
} from '@ant-design/pro-components';
import { Radio, TreeSelect } from 'antd';
import type { SizeType } from 'antd/lib/config-provider/SizeContext';
import type { SizeType } from 'antd/es/config-provider/SizeContext';
import dayjs from 'dayjs';
import React from 'react';

Expand Down
2 changes: 1 addition & 1 deletion demos/form/config-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
StepsForm,
} from '@ant-design/pro-components';
import { ConfigProvider, Input } from 'antd';
import enUS from 'antd/lib/locale/en_US';
import enUS from 'antd/es/locale/en_US';

const Demo = () => (
<ConfigProvider locale={enUS}>
Expand Down
2 changes: 1 addition & 1 deletion demos/form/form-layout-grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
ProFormTextArea,
} from '@ant-design/pro-components';
import { Col, Row, Space, message } from 'antd';
import type { FormLayout } from 'antd/lib/form/Form';
import type { FormLayout } from 'antd/es/form/Form';
import { useState } from 'react';

const LAYOUT_TYPE_HORIZONTAL = 'horizontal';
Expand Down
30 changes: 15 additions & 15 deletions demos/table/intl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ import { PlusOutlined } from '@ant-design/icons';
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import { ProTable } from '@ant-design/pro-components';
import { Button, ConfigProvider, Select, Space } from 'antd';
import caESIntl from 'antd/lib/locale/ca_ES';
import enGBIntl from 'antd/lib/locale/en_GB';
import enUSIntl from 'antd/lib/locale/en_US';
import esESIntl from 'antd/lib/locale/es_ES';
import frFRIntl from 'antd/lib/locale/fr_FR';
import itITIntl from 'antd/lib/locale/it_IT';
import jaJPIntl from 'antd/lib/locale/ja_JP';
import msMYIntl from 'antd/lib/locale/ms_MY';
import ptBRIntl from 'antd/lib/locale/pt_BR';
import ruRUIntl from 'antd/lib/locale/ru_RU';
import srRSIntl from 'antd/lib/locale/sr_RS';
import thTHIntl from 'antd/lib/locale/th_TH';
import viVNIntl from 'antd/lib/locale/vi_VN';
import zhCNIntl from 'antd/lib/locale/zh_CN';
import zhTWIntl from 'antd/lib/locale/zh_TW';
import caESIntl from 'antd/es/locale/ca_ES';
import enGBIntl from 'antd/es/locale/en_GB';
import enUSIntl from 'antd/es/locale/en_US';
import esESIntl from 'antd/es/locale/es_ES';
import frFRIntl from 'antd/es/locale/fr_FR';
import itITIntl from 'antd/es/locale/it_IT';
import jaJPIntl from 'antd/es/locale/ja_JP';
import msMYIntl from 'antd/es/locale/ms_MY';
import ptBRIntl from 'antd/es/locale/pt_BR';
import ruRUIntl from 'antd/es/locale/ru_RU';
import srRSIntl from 'antd/es/locale/sr_RS';
import thTHIntl from 'antd/es/locale/th_TH';
import viVNIntl from 'antd/es/locale/vi_VN';
import zhCNIntl from 'antd/es/locale/zh_CN';
import zhTWIntl from 'antd/es/locale/zh_TW';
import dayjs from 'dayjs';
import { useRef, useState } from 'react';

Expand Down
2 changes: 1 addition & 1 deletion demos/table/rtl_table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PlusOutlined } from '@ant-design/icons';
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import { ProTable, TableDropdown } from '@ant-design/pro-components';
import { Button, ConfigProvider, Space, Tag } from 'antd';
import arEGIntl from 'antd/lib/locale/ar_EG';
import arEGIntl from 'antd/es/locale/ar_EG';
import { useRef } from 'react';
import request from 'umi-request';

Expand Down
2 changes: 1 addition & 1 deletion src/card/typing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { TabPaneProps, TabsProps } from 'antd';
import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
import type { ReactNode } from 'react';

export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs';
Expand Down
4 changes: 2 additions & 2 deletions src/descriptions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { CheckOutlined, CloseOutlined, EditOutlined } from '@ant-design/icons';
import { get, toArray } from '@rc-component/util';
import type { DescriptionsProps, FormInstance, FormProps } from 'antd';
import { ConfigProvider, Descriptions, Space } from 'antd';
import type { DescriptionsItemType } from 'antd/lib/descriptions';
import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
import type { DescriptionsItemType } from 'antd/es/descriptions';
import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
import React, { useContext, useEffect } from 'react';
import ValueTypeToComponent from '../field/ValueTypeToComponent';
import ProForm, { ProFormField } from '../form';
Expand Down
4 changes: 2 additions & 2 deletions src/field/components/Checkbox/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Checkbox, ConfigProvider, Form, Spin, theme } from 'antd';
import type { CheckboxGroupProps } from 'antd/lib/checkbox';
import { clsx } from 'clsx';
import type { CheckboxGroupProps } from 'antd/es/checkbox';
import classNames from 'classnames';
import React, { useContext, useImperativeHandle, useRef } from 'react';
import { objectToMap, proFieldParsingText, useStyle } from '../../../utils';
import type { ProFieldFC } from '../../PureProField';
Expand Down
4 changes: 2 additions & 2 deletions src/form/BaseForm/BaseForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
import { useUrlSearchParams } from '@umijs/use-params';
import type { FormInstance, FormItemProps, FormProps } from 'antd';
import { ConfigProvider, Form, Spin } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import { clsx } from 'clsx';
import type { NamePath } from 'antd/es/form/interface';
import classNames from 'classnames';
import type dayjs from 'dayjs';
import React, {
useContext,
Expand Down
4 changes: 2 additions & 2 deletions src/form/BaseForm/LightWrapper/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ConfigProvider } from 'antd';
import type { TooltipPlacement } from 'antd/lib/tooltip';
import { clsx } from 'clsx';
import type { TooltipPlacement } from 'antd/es/tooltip';
import classNames from 'classnames';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

ESM 导入路径更新正确,但 classNames 导入存在后续使用问题。

antd/lib/tooltip 改为 antd/es/tooltip 符合 PR 目标。但是,clsx 被替换为 classNames 后,第 143 行仍然引用了 clsx,这会导致运行时错误。

🐛 修复建议
-import classNames from 'classnames';
+import clsx from 'clsx';

或者保持 classNames 导入,并修改第 143 行的使用:

-        className={clsx(`${prefixCls}-container`, hashId, className)}
+        className={classNames(`${prefixCls}-container`, hashId, className)}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
import type { TooltipPlacement } from 'antd/es/tooltip';
import classNames from 'classnames';
import type { TooltipPlacement } from 'antd/es/tooltip';
import clsx from 'clsx';
🤖 Prompt for AI Agents
In `@src/form/BaseForm/LightWrapper/index.tsx` around lines 2 - 3, You imported
classNames but the code still calls clsx, causing a runtime error; update the
usage by replacing any references to clsx with classNames (or rename the import
to clsx if you prefer) so the identifier matches the import; specifically,
change the call site where clsx(...) is used to classNames(...) and ensure the
import remains: import classNames from 'classnames';.

import React, { useContext, useMemo, useState } from 'react';
import {
dateArrayFormatter,
Expand Down
2 changes: 1 addition & 1 deletion src/form/FieldContext.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { FormItemProps } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import type { NamePath } from 'antd/es/form/interface';
import React from 'react';
import type {
ProFieldProps,
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/Captcha/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ButtonProps, InputProps } from 'antd';
import { Button, Form, Input } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import type { NamePath } from 'antd/es/form/interface';
import React, { useEffect, useImperativeHandle, useState } from 'react';
import type { ProFormFieldItemProps } from '../../typing';
import { warpField } from '../FormItem/warpField';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/Checkbox/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CheckboxProps, CheckboxRef } from 'antd';
import { Checkbox } from 'antd';
import type { CheckboxGroupProps } from 'antd/lib/checkbox';
import type { CheckboxGroupProps } from 'antd/es/checkbox';
import React from 'react';
import { FieldCheckbox } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/DatePicker/TimePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { DatePickerProps } from 'antd/lib/date-picker';
import type { DatePickerProps } from 'antd/es/date-picker';
import React, { useContext } from 'react';
import { FieldTimePicker } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/DatePicker/WeekPicker.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { WeekPickerProps } from 'antd/lib/date-picker';
import type { WeekPickerProps } from 'antd/es/date-picker';
import React from 'react';
import type { ProFormFieldItemProps } from '../../typing';
import { BaseDatePicker } from './BaseDatePicker';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/DateRangePicker/BaseDateRanger.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React, { useCallback, useContext, useMemo } from 'react';
import { FieldRangePicker } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React from 'react';
import { dateArrayFormatter } from '../../../utils';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React from 'react';
import { dateArrayFormatter } from '../../../utils';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RangePickerProps } from 'antd/lib/date-picker';
import { RangePickerProps } from 'antd/es/date-picker';
import React from 'react';
import { dateArrayFormatter } from '../../../utils';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React from 'react';
import { dateArrayFormatter } from '../../../utils';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React from 'react';
import { dateArrayFormatter } from '../../../utils';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/DateRangePicker/TimeRangePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React, { useContext } from 'react';
import { FieldTimeRangePicker } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/DateRangePicker/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RangePickerProps } from 'antd/lib/date-picker';
import type { RangePickerProps } from 'antd/es/date-picker';
import React from 'react';
import { dateArrayFormatter } from '../../../utils';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/Dependency/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { get, set } from '@rc-component/util';
import type { FormItemProps } from 'antd';
import { Form } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import type { NamePath } from 'antd/es/form/interface';
import { merge } from 'lodash-es';
import React, { useContext, useMemo } from 'react';
import { isDeepEqualReact, ProFormContext } from '../../../utils';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/FieldSet/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { toArray } from '@rc-component/util';
import type { SpaceProps } from 'antd';
import { Space } from 'antd';
import type { GroupProps } from 'antd/lib/input';
import type { GroupProps } from 'antd/es/input';
import React, { useCallback, useImperativeHandle } from 'react';
import { runFunction, useRefFunction } from '../../../utils';
import type { LightWrapperProps } from '../../BaseForm';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/FormItem/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { omit } from '@rc-component/util';
import type { FormItemProps } from 'antd';
import { ConfigProvider, Form } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import type { NamePath } from 'antd/es/form/interface';
import React, { useContext, useEffect, useMemo } from 'react';
import {
isDropdownValueType,
Expand Down
4 changes: 2 additions & 2 deletions src/form/components/List/ListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import type {
FormListFieldData,
FormListOperation,
FormListProps,
} from 'antd/lib/form/FormList';
import { clsx } from 'clsx';
} from 'antd/es/form/FormList';
import classNames from 'classnames';
import type { CSSProperties, ReactNode } from 'react';
import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
import { FormListContext } from '.';
Expand Down
8 changes: 4 additions & 4 deletions src/form/components/List/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import {
import { warning } from '@rc-component/util';
import type { ColProps } from 'antd';
import { ConfigProvider, Form } from 'antd';
import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
import type {
FormListFieldData,
FormListOperation,
FormListProps,
} from 'antd/lib/form/FormList';
import type { NamePath } from 'antd/lib/form/interface';
import { clsx } from 'clsx';
} from 'antd/es/form/FormList';
import type { NamePath } from 'antd/es/form/interface';
import classNames from 'classnames';
import type { ReactNode } from 'react';
import React, {
useContext,
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/SchemaForm/typing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { FormInstance, FormProps } from 'antd';
import type { NamePath } from 'antd/lib/form/interface';
import type { NamePath } from 'antd/es/form/interface';
import type {
ProCoreActionType,
ProSchema,
Expand Down
4 changes: 2 additions & 2 deletions src/form/components/Select/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { SelectProps } from 'antd';
import type { BaseOptionType } from 'antd/lib/cascader';
import type { DefaultOptionType, RefSelectProps } from 'antd/lib/select';
import type { BaseOptionType } from 'antd/es/cascader';
import type { DefaultOptionType, RefSelectProps } from 'antd/es/select';
import React, { useContext } from 'react';
import { FieldSelect } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/Slider/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { SliderSingleProps } from 'antd';
import type { SliderBaseProps, SliderRangeProps } from 'antd/lib/slider';
import type { SliderBaseProps, SliderRangeProps } from 'antd/es/slider';
import React from 'react';
import { FieldSlider } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/Text/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { omit, useMergedState } from '@rc-component/util';
import { Form, Popover, PopoverProps, type InputProps } from 'antd';
import type { InputRef, PasswordProps } from 'antd/lib/input';
import type { InputRef, PasswordProps } from 'antd/es/input';
import React, { useState } from 'react';
import { FieldPassword } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
4 changes: 2 additions & 2 deletions src/form/components/TextArea/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { TextAreaProps } from 'antd/lib/input';
import type { TextAreaRef } from 'antd/lib/input/TextArea';
import type { TextAreaProps } from 'antd/es/input';
import type { TextAreaRef } from 'antd/es/input/TextArea';
import React from 'react';
import { FieldTextArea } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/TreeSelect/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { TreeSelectProps } from 'antd';
import type { RefSelectProps } from 'antd/lib/select';
import type { RefSelectProps } from 'antd/es/select';
import React from 'react';
import { FieldTreeSelect } from '../../../field';
import { ProConfigProvider } from '../../../provider';
Expand Down
2 changes: 1 addition & 1 deletion src/form/components/UploadDragger/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InboxOutlined } from '@ant-design/icons';
import { ConfigProvider, Upload } from 'antd';
import type { DraggerProps, UploadProps } from 'antd/lib/upload';
import type { DraggerProps, UploadProps } from 'antd/es/upload';
import React, { useContext } from 'react';
import { EditOrReadOnlyContext } from '../../BaseForm/EditOrReadOnlyContext';
import type { ProFormFieldItemProps } from '../../typing';
Expand Down
4 changes: 2 additions & 2 deletions src/form/layouts/LightFilter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { FilterOutlined } from '@ant-design/icons';
import { omit } from '@rc-component/util';
import type { FormProps, PopoverProps } from 'antd';
import { ConfigProvider } from 'antd';
import type { SizeType } from 'antd/lib/config-provider/SizeContext';
import type { TooltipPlacement } from 'antd/lib/tooltip';
import type { SizeType } from 'antd/es/config-provider/SizeContext';
import type { TooltipPlacement } from 'antd/es/tooltip';
import { clsx } from 'clsx';
import React, {
useContext,
Expand Down
2 changes: 1 addition & 1 deletion src/form/layouts/QueryFilter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import RcResizeObserver from '@rc-component/resize-observer';
import { useMergedState } from '@rc-component/util';
import type { ColProps, FormItemProps, RowProps } from 'antd';
import { Col, ConfigProvider, Form, Row } from 'antd';
import type { FormInstance, FormProps } from 'antd/lib/form/Form';
import type { FormInstance, FormProps } from 'antd/es/form/Form';
import { clsx } from 'clsx';
import type { ReactElement } from 'react';
import React, { useContext, useMemo, useState } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion src/form/layouts/StepsForm/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { toArray, useMergedState } from '@rc-component/util';
import type { FormInstance, StepsProps } from 'antd';
import { Button, Col, ConfigProvider, Form, Row, Space, Steps } from 'antd';
import type { FormProviderProps } from 'antd/lib/form/context';
import type { FormProviderProps } from 'antd/es/form/context';
import { clsx } from 'clsx';
import React, {
useCallback,
Expand Down
4 changes: 2 additions & 2 deletions src/layout/ProLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { omit, useMergedState, warning } from '@rc-component/util';
import { getMatchMenu } from '@umijs/route-utils';
import type { BreadcrumbProps, WatermarkProps } from 'antd';
import { ConfigProvider, Layout } from 'antd';
import type { AnyObject } from 'antd/lib/_util/type';
import type { ItemType } from 'antd/lib/breadcrumb/Breadcrumb';
import type { AnyObject } from 'antd/es/_util/type';
import type { ItemType } from 'antd/es/breadcrumb/Breadcrumb';
import { clsx } from 'clsx';
import type { CSSProperties } from 'react';
import React, {
Expand Down
2 changes: 1 addition & 1 deletion src/layout/components/PageHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ArrowLeftOutlined, ArrowRightOutlined } from '@ant-design/icons';
import ResizeObserver from '@rc-component/resize-observer';
import type { AvatarProps, BreadcrumbProps, TagType } from 'antd';
import { Avatar, Breadcrumb, ConfigProvider, Space } from 'antd';
import type { DirectionType } from 'antd/lib/config-provider';
import type { DirectionType } from 'antd/es/config-provider';
import { clsx } from 'clsx';
import React from 'react';
import type { ContentWidth } from '../../defaultSettings';
Expand Down
2 changes: 1 addition & 1 deletion src/layout/components/SiderMenu/BaseMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
import { useMergedState } from '@rc-component/util';
import type { MenuProps } from 'antd';
import { Menu, Skeleton, Tooltip } from 'antd';
import { ItemType } from 'antd/lib/menu/interface';
import { ItemType } from 'antd/es/menu/interface';
import { clsx } from 'clsx';
import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
import type { ProTokenType } from '../../../provider';
Expand Down
Loading