fix(layout): fix menu item icon style error (#6745)

* fix(layout): fix menu item icon style error

* fix build error

* fix build error

* chore: best test case

* chore: best test case

* chore: best test case

.eslintignore

@@ -8,4 +8,5 @@ es
 .umi
 .github
 scripts
-webpack.config.js
+webpack.config.js
+server

.fatherrc.base.ts

@@ -5,12 +5,13 @@ export default defineConfig({
   esm: {
     input: 'src', // 默认编译目录
     output: 'es',
+    extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), {}]],
     platform: 'browser', // 默认构建为 Browser 环境的产物
     transformer: 'babel', // 默认使用 babel 以提供更好的兼容性
   },
   // 以下为 cjs 配置项启用时的默认值，有自定义需求时才需配置
   cjs: {
-    extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), { 3: 'b' }]],
+    extraBabelPlugins: [[require.resolve('./scripts/replaceEs'), {}]],
     input: 'src', // 默认编译目录
     output: 'lib',
     platform: 'browser', // 默认构建为 Node.js 环境的产物

.prettierignore

@@ -5,4 +5,5 @@
 **/lib
 **/es
 **\__snapshots__\**
-pnpm-lock.yaml
+pnpm-lock.yaml
+server

packages/card/src/components/Card/index.tsx

@@ -3,7 +3,7 @@ import { LabelIconTip } from '@ant-design/pro-utils';
 import { ConfigProvider, Grid, Tabs } from 'antd';
 import classNames from 'classnames';
 import omit from 'omit.js';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useContext } from 'react';
 import type { Breakpoint, CardProps, Gutter } from '../../typing';
 import Actions from '../Actions';

packages/card/src/components/StatisticCard/index.tsx

@@ -9,8 +9,8 @@ import type { StatisticProps } from '../Statistic';
 import Statistic from '../Statistic';
 import { useStyle } from './style';
 
-import 'antd/es/divider/style';
-import 'antd/es/statistic/style';
+import 'antd/lib/divider/style';
+import 'antd/lib/statistic/style';
 import { ConfigContext } from 'antd/lib/config-provider';
 
 export type StatisticCardProps = {

packages/card/src/components/TabPane/index.tsx

@@ -1,8 +1,8 @@
 import type { TabPaneProps, TabsProps } from 'antd';
 import { ConfigProvider, Tabs, version } from 'antd';
 import classNames from 'classnames';
-import toArray from 'rc-util/es/Children/toArray';
-import { noteOnce } from 'rc-util/es/warning';
+import toArray from 'rc-util/lib/Children/toArray';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, { useContext } from 'react';
 import type { ProCardTabPaneProps, ProCardTabsProps } from '../../typing';
 import Card from '../Card';

packages/card/src/index.tsx

@@ -8,7 +8,7 @@ import type { ProCardProps } from './ProCard';
 import ProCard from './ProCard';
 import type { ProCardTabsProps } from './typing';
 
-import 'antd/es/card/style';
+import 'antd/lib/card/style';
 
 export type {
   ProCardTabsProps,

packages/card/src/typing.ts

@@ -1,5 +1,5 @@
 import type { TabPaneProps, TabsProps } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import type { ReactNode } from 'react';
 
 export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs';

packages/descriptions/src/index.tsx

@@ -19,16 +19,16 @@ import {
 } from '@ant-design/pro-utils';
 import type { DescriptionsProps, FormInstance, FormProps } from 'antd';
 import { ConfigProvider, Descriptions, Space } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
-import toArray from 'rc-util/es/Children/toArray';
-import get from 'rc-util/es/utils/get';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
+import toArray from 'rc-util/lib/Children/toArray';
+import get from 'rc-util/lib/utils/get';
 import React, { useContext, useEffect } from 'react';
 import { stringify } from 'use-json-comparison';
 import type { RequestData } from './useFetchData';
 import useFetchData from './useFetchData';
 
 // 兼容代码-----------
-import 'antd/es/descriptions/style';
+import 'antd/lib/descriptions/style';
 import type { ProFieldFCMode } from '@ant-design/pro-provider';
 //----------------------
 

packages/descriptions/src/useFetchData.tsx

@@ -1,4 +1,4 @@
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import { useEffect } from 'react';
 
 export type RequestData<T = any> = {

packages/field/src/components/Cascader/index.tsx

@@ -10,7 +10,7 @@ import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/cascader/style';
+import 'antd/lib/cascader/style';
 //----------------------
 
 export type GroupProps = {

packages/field/src/components/Checkbox/index.tsx

@@ -1,6 +1,6 @@
 import { useStyle } from '@ant-design/pro-utils';
 import { Checkbox, ConfigProvider, Space, Spin } from 'antd';
-import type { CheckboxGroupProps } from 'antd/es/checkbox';
+import type { CheckboxGroupProps } from 'antd/lib/checkbox';
 import classNames from 'classnames';
 import React, { useContext, useImperativeHandle, useRef } from 'react';
 import type { ProFieldFC } from '../../index';
@@ -12,7 +12,7 @@ export type GroupProps = {
 } & FieldSelectProps;
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/checkbox/style';
+import 'antd/lib/checkbox/style';
 //----------------------
 /**
  * 多选组件

packages/field/src/components/Code/index.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
+import 'antd/lib/input/style';
 //----------------------
 
 const languageFormat = (text: string, language: string) => {

packages/field/src/components/ColorPicker/index.tsx

@@ -3,7 +3,7 @@ import { SketchPicker } from '@chenshuai2144/sketch-color';
 import type { PopoverProps } from 'antd';
 import { ConfigProvider, Popover } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useContext, useImperativeHandle } from 'react';
 import type { ProFieldFC } from '../../index';
 

packages/field/src/components/DatePicker/index.tsx

@@ -8,7 +8,7 @@ import React, { useContext, useState } from 'react';
 import type { ProFieldFC, ProFieldLightProps } from '../../index';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 //----------------------
 
 dayjs.extend(weekOfYear);

packages/field/src/components/Digit/index.tsx

@@ -5,7 +5,7 @@ import omit from 'omit.js';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //----------------------
 

packages/field/src/components/DigitRange/index.tsx

@@ -1,10 +1,10 @@
 import { Input, InputNumber } from 'antd';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //----------------------
 

packages/field/src/components/FromNow/index.tsx

@@ -6,7 +6,7 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 import React from 'react';
 //----------------------
 

packages/field/src/components/Image/index.tsx

@@ -4,7 +4,7 @@ import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
 import { useIntl } from '@ant-design/pro-provider';
-import 'antd/es/image/style';
+import 'antd/lib/image/style';
 //----------------------
 
 export type FieldImageProps = {

packages/field/src/components/Money/index.tsx

@@ -2,13 +2,13 @@ import { intlMap as allIntlMap, useIntl } from '@ant-design/pro-provider';
 import type { InputNumberProps } from 'antd';
 import { InputNumber, Popover } from 'antd';
 import omit from 'omit.js';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useCallback, useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
-import 'antd/es/popover/style';
+import 'antd/lib/input-number/style';
+import 'antd/lib/popover/style';
 //----------------------
 
 import { openVisibleCompatible } from '@ant-design/pro-utils';

packages/field/src/components/Options/index.tsx

@@ -3,7 +3,7 @@ import React, { useContext, useImperativeHandle } from 'react';
 import type { ProFieldFC } from '../../index';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/space/style';
+import 'antd/lib/space/style';
 //----------------------
 
 const addArrayKeys = (doms: React.ReactNode[]) =>

packages/field/src/components/Password/index.tsx

@@ -1,13 +1,13 @@
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
 import { useIntl } from '@ant-design/pro-provider';
 import { Input, Space } from 'antd';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
-import 'antd/es/space/style';
+import 'antd/lib/input/style';
+import 'antd/lib/space/style';
 //----------------------
 
 /**

packages/field/src/components/Percent/index.tsx

@@ -6,7 +6,7 @@ import type { ProFieldFC } from '../../index';
 import { getColorByRealValue, getRealTextWithPrecision, getSymbolByRealValue } from './util';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //------------
 

packages/field/src/components/Progress/index.tsx

@@ -4,8 +4,8 @@ import React, { useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
-import 'antd/es/progress/style';
+import 'antd/lib/input-number/style';
+import 'antd/lib/progress/style';
 import { useIntl } from '@ant-design/pro-provider';
 //------------
 

packages/field/src/components/Radio/index.tsx

@@ -7,7 +7,7 @@ import type { ProFieldFC } from '../../index';
 import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 // 兼容代码-----------
-import 'antd/es/radio/style';
+import 'antd/lib/radio/style';
 import { ConfigContext } from 'antd/lib/config-provider';
 //------------
 export type GroupProps = {

packages/field/src/components/RangePicker/index.tsx

@@ -6,7 +6,7 @@ import React, { useCallback } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 //------------
 
 /**

packages/field/src/components/Rate/index.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/rate/style';
+import 'antd/lib/rate/style';
 //------------
 
 /**

packages/field/src/components/Second/index.tsx

@@ -2,7 +2,7 @@ import { InputNumber } from 'antd';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //------------
 

packages/field/src/components/Segmented/index.tsx

@@ -5,8 +5,8 @@ import omit from 'omit.js';
 import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 
-import 'antd/es/segmented/style';
-import 'antd/es/spin/style';
+import 'antd/lib/segmented/style';
+import 'antd/lib/spin/style';
 
 /**
  * Segmented https://ant.design/components/segmented-cn/

packages/field/src/components/Select/LightSelect/index.tsx

@@ -4,7 +4,7 @@ import type { SelectProps } from 'antd';
 import { ConfigProvider, Input, Select } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
 import classNames from 'classnames';
-import toArray from 'rc-util/es/Children/toArray';
+import toArray from 'rc-util/lib/Children/toArray';
 import React, { useContext, useMemo, useState } from 'react';
 import type { ProFieldLightProps } from '../../../index';
 

packages/field/src/components/Select/SearchSelect/index.tsx

@@ -2,7 +2,7 @@ import type { RequestOptionsType } from '@ant-design/pro-utils';
 import type { SelectProps } from 'antd';
 import { ConfigProvider, Select } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { LabeledValue } from 'antd/es/select';
+import type { LabeledValue } from 'antd/lib/select';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useImperativeHandle, useRef, useState } from 'react';
 

packages/field/src/components/Select/index.tsx

@@ -33,7 +33,7 @@ import LightSelect from './LightSelect';
 import SearchSelect from './SearchSelect';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/select/style';
+import 'antd/lib/select/style';
 //------------
 
 type SelectOptionType = Partial<RequestOptionsType>[];

packages/field/src/components/Slider/index.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/slider/style';
+import 'antd/lib/slider/style';
 //------------
 /**
  * 评分组件

packages/field/src/components/Status/index.tsx

@@ -3,7 +3,7 @@ import type { CSSProperties } from 'react';
 import React from 'react';
 
 // 兼容代码-----------
-import 'antd/es/badge/style';
+import 'antd/lib/badge/style';
 //------------
 
 type StatusProps = {

packages/field/src/components/Switch/index.tsx

@@ -6,7 +6,7 @@ import React, { useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/switch/style';
+import 'antd/lib/switch/style';
 //------------
 
 /**

packages/field/src/components/Text/index.tsx

@@ -4,7 +4,7 @@ import React, { useEffect, useImperativeHandle, useRef } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
+import 'antd/lib/input/style';
 //------------
 
 /**

packages/field/src/components/TextArea/index.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
+import 'antd/lib/input/style';
 //------------
 /**
  * 最基本的组件，就是个普通的 Input.TextArea

packages/field/src/components/TimePicker/index.tsx

@@ -5,7 +5,7 @@ import React, { useState } from 'react';
 import type { ProFieldFC, ProFieldLightProps } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 import { useDatePickerStyle } from '../DatePicker';
 //----------------------;
 

packages/field/src/components/TreeSelect/index.tsx

@@ -2,15 +2,15 @@ import { FieldLabel } from '@ant-design/pro-utils';
 import type { RadioGroupProps, TreeSelectProps } from 'antd';
 import { ConfigProvider, Spin, TreeSelect } from 'antd';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useContext, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import type { ProFieldFC } from '../../index';
 import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/spin/style';
-import 'antd/es/tree-select/style';
+import 'antd/lib/spin/style';
+import 'antd/lib/tree-select/style';
 import { useIntl } from '@ant-design/pro-provider';
 //----------------------
 

packages/field/src/index.tsx

@@ -13,7 +13,7 @@ import type {
 import { omitUndefined, pickProProps } from '@ant-design/pro-utils';
 import { Avatar } from 'antd';
 // import type {RangeInputNumberProps,ExtraProps as } from './components/DigitRange'
-import { noteOnce } from 'rc-util/es/warning';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, { useContext } from 'react';
 import FieldCascader from './components/Cascader';
 import FieldCheckbox from './components/Checkbox';

packages/form/src/BaseForm/BaseForm.tsx

@@ -23,13 +23,13 @@ import { useUrlSearchParams } from '@umijs/use-params';
 import type { FormInstance, FormItemProps, FormProps } from 'antd';
 import { ConfigProvider, Form, Spin } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { NamePath } from 'antd/es/form/interface';
+import type { NamePath } from 'antd/lib/form/interface';
 import classNames from 'classnames';
 import type dayjs from 'dayjs';
 import omit from 'omit.js';
-import get from 'rc-util/es/utils/get';
-import { default as namePathSet, default as set } from 'rc-util/es/utils/set';
-import { noteOnce } from 'rc-util/es/warning';
+import get from 'rc-util/lib/utils/get';
+import { default as namePathSet, default as set } from 'rc-util/lib/utils/set';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, {
   useCallback,
   useContext,

packages/form/src/BaseForm/LightWrapper/index.tsx

@@ -10,7 +10,7 @@ import classNames from 'classnames';
 import React, { useContext, useMemo, useState } from 'react';
 import type { LightFilterFooterRender } from '../../typing';
 import { useStyle } from './style';
-import type { TooltipPlacement } from 'antd/es/tooltip';
+import type { TooltipPlacement } from 'antd/lib/tooltip';
 import { ConfigContext } from 'antd/lib/config-provider';
 export type SizeType = 'small' | 'middle' | 'large' | undefined;
 

packages/form/src/BaseForm/createField.tsx

@@ -7,7 +7,7 @@
 import type { FormItemProps } from 'antd';
 import classnames from 'classnames';
 import { FieldContext as RcFieldContext } from 'rc-field-form';
-import { noteOnce } from 'rc-util/es/warning';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { stringify } from 'use-json-comparison';
 import { ProFormDependency, ProFormItem } from '../components';

packages/form/src/FieldContext.tsx

@@ -1,6 +1,6 @@
 import type { ProFieldValueType, SearchTransformKeyFn } from '@ant-design/pro-utils';
 import type { FormItemProps } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
+import type { NamePath } from 'antd/lib/form/interface';
 import React from 'react';
 import type { CommonFormProps } from './BaseForm';
 import type { FieldProps, GroupProps } from './typing';

packages/form/src/components/Captcha/index.tsx

@@ -1,6 +1,6 @@
 import type { ButtonProps, InputProps } from 'antd';
 import { Button, Form, Input } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
+import type { NamePath } from 'antd/lib/form/interface';
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import { createField } from '../../BaseForm/createField';
 import type { ProFormFieldItemProps } from '../../typing';

packages/form/src/components/Checkbox/index.tsx

@@ -1,7 +1,7 @@
 import { runFunction } from '@ant-design/pro-utils';
 import type { CheckboxProps } from 'antd';
 import { Checkbox } from 'antd';
-import type { CheckboxGroupProps } from 'antd/es/checkbox';
+import type { CheckboxGroupProps } from 'antd/lib/checkbox';
 import React from 'react';
 import { createField } from '../../BaseForm/createField';
 import type { ProFormFieldItemProps, ProFormFieldRemoteProps } from '../../typing';

packages/form/src/components/DatePicker/MonthPicker.tsx

@@ -1,4 +1,4 @@
-import type { MonthPickerProps } from 'antd/es/date-picker';
+import type { MonthPickerProps } from 'antd/lib/date-picker';
 import React, { useContext } from 'react';
 import FieldContext from '../../FieldContext';
 import type { ProFormFieldItemProps } from '../../typing';

packages/form/src/components/DatePicker/WeekPicker.tsx

@@ -1,4 +1,4 @@
-import type { WeekPickerProps } from 'antd/es/date-picker';
+import type { WeekPickerProps } from 'antd/lib/date-picker';
 import React, { useContext } from 'react';
 import FieldContext from '../../FieldContext';
 import type { ProFormFieldItemProps } from '../../typing';

packages/form/src/components/DateRangePicker/index.tsx

@@ -1,5 +1,5 @@
 import { dateArrayFormatter } from '@ant-design/pro-utils';
-import type { RangePickerProps } from 'antd/es/date-picker';
+import type { RangePickerProps } from 'antd/lib/date-picker';
 import React, { useContext } from 'react';
 import FieldContext from '../../FieldContext';
 import type { ProFormFieldItemProps } from '../../typing';

packages/form/src/components/DateTimeRangePicker/index.tsx

@@ -1,5 +1,5 @@
 import { dateArrayFormatter } from '@ant-design/pro-utils';
-import type { RangePickerProps } from 'antd/es/date-picker/generatePicker';
+import type { RangePickerProps } from 'antd/lib/date-picker/generatePicker';
 import type { Dayjs } from 'dayjs';
 import React, { useContext } from 'react';
 import FieldContext from '../../FieldContext';

packages/form/src/components/Dependency/demos/dependency2.tsx

@@ -6,7 +6,7 @@
   ProFormText,
 } from '@ant-design/pro-components';
 import { Form } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
+import type { NamePath } from 'antd/lib/form/interface';
 
 const Demo = () => {
   const initialValues = {

packages/form/src/components/Dependency/index.tsx

@@ -1,9 +1,9 @@
 import { isDeepEqualReact, merge, ProFormContext } from '@ant-design/pro-utils';
 import type { FormItemProps } from 'antd';
 import { Form } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
-import get from 'rc-util/es/utils/get';
-import set from 'rc-util/es/utils/set';
+import type { NamePath } from 'antd/lib/form/interface';
+import get from 'rc-util/lib/utils/get';
+import set from 'rc-util/lib/utils/set';
 import { useContext, useMemo } from 'react';
 import type { ProFormInstance } from '../../BaseForm';
 import { FormListContext } from '../List';

packages/form/src/components/FieldSet/index.tsx

@@ -1,8 +1,8 @@
 import { useRefFunction } from '@ant-design/pro-utils';
 import type { FormItemProps, SpaceProps } from 'antd';
 import { Input, Space } from 'antd';
-import type { GroupProps } from 'antd/es/input';
-import toArray from 'rc-util/es/Children/toArray';
+import type { GroupProps } from 'antd/lib/input';
+import toArray from 'rc-util/lib/Children/toArray';
 import React, { useCallback, useImperativeHandle, useMemo } from 'react';
 import { createField } from '../../BaseForm/createField';
 import { useGridHelpers } from '../../helpers';

packages/form/src/components/FormItem/index.tsx

@@ -6,7 +6,7 @@
 import { isDropdownValueType, omitUndefined } from '@ant-design/pro-utils';
 import type { FormItemProps } from 'antd';
 import { ConfigProvider, Form } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
+import type { NamePath } from 'antd/lib/form/interface';
 import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import type { LightWrapperProps } from '../../BaseForm';
 import { LightWrapper } from '../../BaseForm';

packages/form/src/components/List/ListItem.tsx

@@ -2,9 +2,9 @@
 import { ProProvider } from '@ant-design/pro-provider';
 import type { ButtonProps, FormInstance } from 'antd';
 import { Spin, Tooltip } from 'antd';
-import type { FormListFieldData, FormListOperation, FormListProps } from 'antd/es/form/FormList';
-import toArray from 'rc-util/es/Children/toArray';
-import set from 'rc-util/es/utils/set';
+import type { FormListFieldData, FormListOperation, FormListProps } from 'antd/lib/form/FormList';
+import toArray from 'rc-util/lib/Children/toArray';
+import set from 'rc-util/lib/utils/set';
 import type { CSSProperties, ReactNode } from 'react';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { FormListContext } from '.';

packages/form/src/components/List/index.tsx

@@ -2,11 +2,11 @@
 import { useIntl } from '@ant-design/pro-provider';
 import { ProFormContext } from '@ant-design/pro-utils';
 import { ConfigProvider, Form } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
-import type { FormListFieldData, FormListOperation, FormListProps } from 'antd/es/form/FormList';
-import type { NamePath } from 'antd/es/form/interface';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
+import type { FormListFieldData, FormListOperation, FormListProps } from 'antd/lib/form/FormList';
+import type { NamePath } from 'antd/lib/form/interface';
 import classNames from 'classnames';
-import { noteOnce } from 'rc-util/es/warning';
+import { noteOnce } from 'rc-util/lib/warning';
 import type { ReactNode } from 'react';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useGridHelpers } from '../../helpers';

packages/form/src/components/QueryFilter/demos/light-filter-footer.tsx

@@ -1,6 +1,6 @@
 import { LightFilter, ProFormText } from '@ant-design/pro-components';
 import { Button, Radio, Space } from 'antd';
-import type { SizeType } from 'antd/es/config-provider/SizeContext';
+import type { SizeType } from 'antd/lib/config-provider/SizeContext';
 import React from 'react';
 
 export default () => {

packages/form/src/components/QueryFilter/demos/light-filter-test.tsx

@@ -7,7 +7,7 @@ import {
   ProFormText,
 } from '@ant-design/pro-components';
 import { Radio } from 'antd';
-import type { SizeType } from 'antd/es/config-provider/SizeContext';
+import type { SizeType } from 'antd/lib/config-provider/SizeContext';
 import dayjs from 'dayjs';
 import React from 'react';
 

packages/form/src/components/QueryFilter/demos/light-filter.tsx

@@ -16,7 +16,7 @@ import {
   ProFormTreeSelect,
 } from '@ant-design/pro-components';
 import { Radio, TreeSelect } from 'antd';
-import type { SizeType } from 'antd/es/config-provider/SizeContext';
+import type { SizeType } from 'antd/lib/config-provider/SizeContext';
 import dayjs from 'dayjs';
 import React from 'react';
 

packages/form/src/components/SchemaForm/typing.ts

@@ -6,7 +6,7 @@ import type {
   SearchTransformKeyFn,
 } from '@ant-design/pro-utils';
 import type { FormInstance, FormProps } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
+import type { NamePath } from 'antd/lib/form/interface';
 import type { CommonFormProps } from '../../BaseForm';
 import type { ProFormGridConfig } from '../../typing';
 import type {

packages/form/src/components/SchemaForm/valueType/dependency.tsx

@@ -1,4 +1,4 @@
-import { noteOnce } from 'rc-util/es/warning';
+import { noteOnce } from 'rc-util/lib/warning';
 import ProFormDependency from '../../Dependency';
 import type { ItemType, ProFormRenderValueTypeHelpers } from '../typing';
 

packages/form/src/components/Select/index.tsx

@@ -1,6 +1,6 @@
 import { runFunction } from '@ant-design/pro-utils';
 import type { SelectProps } from 'antd';
-import type { RefSelectProps } from 'antd/es/select';
+import type { RefSelectProps } from 'antd/lib/select';
 import React, { useContext } from 'react';
 import FieldContext from '../../FieldContext';
 import type { ProFormFieldItemProps, ProFormFieldRemoteProps } from '../../typing';

packages/form/src/components/Slider/index.tsx

@@ -1,5 +1,5 @@
 import type { SliderSingleProps } from 'antd';
-import type { SliderBaseProps, SliderRangeProps } from 'antd/es/slider';
+import type { SliderBaseProps, SliderRangeProps } from 'antd/lib/slider';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
 import ProField from '../Field';

packages/form/src/components/Text/index.tsx

@@ -1,5 +1,5 @@
 import type { InputProps } from 'antd';
-import type { InputRef, PasswordProps } from 'antd/es/input';
+import type { InputRef, PasswordProps } from 'antd/lib/input';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
 import ProField from '../Field';

packages/form/src/components/TextArea/index.tsx

@@ -1,5 +1,5 @@
-import type { TextAreaProps } from 'antd/es/input';
-import type { TextAreaRef } from 'antd/es/input/TextArea';
+import type { TextAreaProps } from 'antd/lib/input';
+import type { TextAreaRef } from 'antd/lib/input/TextArea';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
 import ProField from '../Field';

packages/form/src/components/TimePicker/index.tsx

@@ -1,5 +1,5 @@
 import { dateArrayFormatter } from '@ant-design/pro-utils';
-import type { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
+import type { DatePickerProps, RangePickerProps } from 'antd/lib/date-picker';
 import React, { useContext } from 'react';
 import FieldContext from '../../FieldContext';
 import type { ProFormFieldItemProps } from '../../typing';

packages/form/src/components/TreeSelect/index.tsx

@@ -1,5 +1,5 @@
 import type { TreeSelectProps } from 'antd';
-import type { RefSelectProps } from 'antd/es/select';
+import type { RefSelectProps } from 'antd/lib/select';
 import React from 'react';
 import type { ProFormFieldItemProps, ProFormFieldRemoteProps } from '../../typing';
 import ProFormField from '../Field';

packages/form/src/components/UploadDragger/index.tsx

@@ -1,6 +1,6 @@
 import { InboxOutlined } from '@ant-design/icons';
 import { ConfigProvider, Upload } from 'antd';
-import type { DraggerProps, UploadProps } from 'antd/es/upload';
+import type { DraggerProps, UploadProps } from 'antd/lib/upload';
 import React, { useContext } from 'react';
 import { createField } from '../../BaseForm/createField';
 import { EditOrReadOnlyContext } from '../../BaseForm/EditOrReadOnlyContext';

packages/form/src/demos/config-provider.tsx

@@ -12,7 +12,7 @@ import {
   StepsForm,
 } from '@ant-design/pro-components';
 import { ConfigProvider, Input } from 'antd';
-import enUS from 'antd/es/locale/en_US';
+import enUS from 'antd/lib/locale/en_US';
 import { LightWrapper } from '../BaseForm/LightWrapper';
 
 export default () => (

packages/form/src/demos/form-layout-grid.tsx

@@ -10,7 +10,7 @@ import {
   ProFormTextArea,
 } from '@ant-design/pro-components';
 import { Col, message, Row, Space } from 'antd';
-import type { FormLayout } from 'antd/es/form/Form';
+import type { FormLayout } from 'antd/lib/form/Form';
 import { useState } from 'react';
 
 const LAYOUT_TYPE_HORIZONTAL = 'horizontal';

packages/form/src/index.tsx

@@ -1,13 +1,13 @@
 import { ProForm } from './layouts';
 // 兼容代码-----------
-import 'antd/es/drawer/style';
-import 'antd/es/form/style';
-import 'antd/es/modal/style';
-import 'antd/es/rate/style';
-import 'antd/es/row/style';
-import 'antd/es/steps/style';
-import 'antd/es/tabs/style';
-import 'antd/es/upload/style';
+import 'antd/lib/drawer/style';
+import 'antd/lib/form/style';
+import 'antd/lib/modal/style';
+import 'antd/lib/rate/style';
+import 'antd/lib/row/style';
+import 'antd/lib/steps/style';
+import 'antd/lib/tabs/style';
+import 'antd/lib/upload/style';
 //----------------------
 export { ProFormContext } from '@ant-design/pro-utils';
 export type {

packages/form/src/layouts/DrawerForm/index.tsx

@@ -2,8 +2,8 @@
 import type { DrawerProps, FormProps } from 'antd';
 import { ConfigProvider, Drawer } from 'antd';
 import merge from 'lodash.merge';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import { noteOnce } from 'rc-util/es/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import type { CommonFormProps, ProFormInstance } from '../../BaseForm';

packages/form/src/layouts/LightFilter/index.tsx

@@ -4,8 +4,8 @@ import { FieldLabel, FilterDropdown } from '@ant-design/pro-utils';
 import type { FormProps } from 'antd';
 import { ConfigProvider } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { SizeType } from 'antd/es/config-provider/SizeContext';
-import type { TooltipPlacement } from 'antd/es/tooltip';
+import type { SizeType } from 'antd/lib/config-provider/SizeContext';
+import type { TooltipPlacement } from 'antd/lib/tooltip';
 import classNames from 'classnames';
 import omit from 'omit.js';
 import React, {

packages/form/src/layouts/ModalForm/index.tsx

@@ -2,8 +2,8 @@
 import type { FormProps, ModalProps } from 'antd';
 import { ConfigProvider, Modal } from 'antd';
 import merge from 'lodash.merge';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import { noteOnce } from 'rc-util/es/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import type { CommonFormProps, ProFormInstance } from '../../BaseForm';

packages/form/src/layouts/QueryFilter/index.tsx

@@ -3,10 +3,10 @@ import { ProProvider, useIntl } from '@ant-design/pro-provider';
 import { isBrowser, useMountMergeState } from '@ant-design/pro-utils';
 import type { FormItemProps, RowProps } from 'antd';
 import { Col, ConfigProvider, Form, Row } from 'antd';
-import type { FormInstance, FormProps } from 'antd/es/form/Form';
+import type { FormInstance, FormProps } from 'antd/lib/form/Form';
 import classNames from 'classnames';
 import RcResizeObserver from 'rc-resize-observer';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import type { ReactElement } from 'react';
 import React, { useContext, useMemo } from 'react';
 import type { CommonFormProps } from '../../BaseForm';

packages/form/src/layouts/StepsForm/StepForm.tsx

@@ -1,6 +1,6 @@
 import type { FormInstance, FormProps } from 'antd';
-import type { StepProps } from 'rc-steps/es/Step';
-import { noteOnce } from 'rc-util/es/warning';
+import type { StepProps } from 'rc-steps/lib/Step';
+import { noteOnce } from 'rc-util/lib/warning';
 import { useContext, useEffect, useImperativeHandle, useRef } from 'react';
 import type { CommonFormProps } from '../../BaseForm';
 import { BaseForm } from '../../BaseForm';

packages/form/src/layouts/StepsForm/index.tsx

@@ -4,10 +4,10 @@ import type { FormInstance, StepsProps } from 'antd';
 import { version } from 'antd';
 import { Button, Col, ConfigProvider, Form, Row, Space, Steps } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { FormProviderProps } from 'antd/es/form/context';
+import type { FormProviderProps } from 'antd/lib/form/context';
 import classNames from 'classnames';
-import toArray from 'rc-util/es/Children/toArray';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import toArray from 'rc-util/lib/Children/toArray';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, {
   useCallback,
   useContext,

packages/form/src/typing.ts

@@ -5,7 +5,7 @@ import type {
   SearchConvertKeyFn,
 } from '@ant-design/pro-utils';
 import type { ColProps, FormItemProps, RowProps, SpaceProps } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import type React from 'react';
 import type { ProFormInstance } from './BaseForm';
 import type { ProFormItemProps } from './components';

packages/layout/src/ProLayout.tsx

@@ -2,12 +2,12 @@ import type { GenerateStyle, ProTokenType } from '@ant-design/pro-provider';
 import { ProConfigProvider, ProProvider } from '@ant-design/pro-provider';
 import { isBrowser, useDocumentTitle, useMountMergeState } from '@ant-design/pro-utils';
 import { getMatchMenu } from '@umijs/route-utils';
-import type { NewBreadcrumbProps as AntdBreadcrumbProps } from 'antd/es/breadcrumb/Breadcrumb';
+import type { NewBreadcrumbProps as AntdBreadcrumbProps } from 'antd/lib/breadcrumb/Breadcrumb';
 import { ConfigProvider, Layout } from 'antd';
 import classNames from 'classnames';
 import Omit from 'omit.js';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import warning from 'rc-util/es/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import warning from 'rc-util/lib/warning';
 import type { CSSProperties } from 'react';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import useSWR, { useSWRConfig } from 'swr';

packages/layout/src/components/Help/index.tsx

@@ -6,7 +6,7 @@ import type { ImageProps, PopoverProps, ModalProps, DrawerProps } from 'antd';
 import { Popover, Menu, Image, Typography, ConfigProvider, Drawer, Modal } from 'antd';
 import type { AnchorHTMLAttributes } from 'react';
 import React, { useContext, useMemo, useState } from 'react';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import type { ProHelpDataSource, ProHelpDataSourceChildren } from './HelpProvide';
 import { ProHelpProvide } from './HelpProvide';
 import { useStyle } from './style';

packages/layout/src/components/PageContainer/index.tsx

@@ -19,9 +19,9 @@ import type { PageContainerToken, pageContainerToken } from './style';
 import { useStyle } from './style';
 import { useStylish } from './style/stylish';
 
-import 'antd/es/breadcrumb/style';
+import 'antd/lib/breadcrumb/style';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { NewBreadcrumbProps } from 'antd/es/breadcrumb/Breadcrumb';
+import type { NewBreadcrumbProps } from 'antd/lib/breadcrumb/Breadcrumb';
 
 export type PageHeaderTabConfig = {
   /** @name tabs 的列表 */

packages/layout/src/components/PageHeader/index.tsx

@@ -8,8 +8,8 @@ import ResizeObserver from 'rc-resize-observer';
 import * as React from 'react';
 import useStyle from './style/index';
 import type { ContentWidth } from '../../defaultSettings';
-import 'antd/es/breadcrumb/style';
-import type { LegacyBreadcrumbProps, NewBreadcrumbProps } from 'antd/es/breadcrumb/Breadcrumb';
+import 'antd/lib/breadcrumb/style';
+import type { LegacyBreadcrumbProps, NewBreadcrumbProps } from 'antd/lib/breadcrumb/Breadcrumb';
 
 export interface PageHeaderProps {
   backIcon?: React.ReactNode;

packages/layout/src/components/SettingDrawer/index.tsx

@@ -18,7 +18,7 @@ import {
   version,
 } from 'antd';
 import omit from 'omit.js';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useEffect, useRef, useState } from 'react';
 import type { ProSettings } from '../../defaultSettings';
 import { defaultSettings } from '../../defaultSettings';

packages/layout/src/components/SiderMenu/BaseMenu.tsx

@@ -4,7 +4,7 @@ import { ProProvider } from '@ant-design/pro-provider';
 import { isImg, isUrl, useMountMergeState } from '@ant-design/pro-utils';
 import type { MenuProps } from 'antd';
 import { Menu, Skeleton } from 'antd';
-import type { ItemType } from 'antd/es/menu/hooks/useItems';
+import type { ItemType } from 'antd/lib/menu/hooks/useItems';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useMemo, useRef } from 'react';
 import type { PureSettings } from '../../defaultSettings';
@@ -159,7 +159,7 @@ class MenuUtil {
       const iconDom = getIcon(
         item.icon,
         iconPrefixes,
-        `action ${baseClassName}-icon ${this.props?.hashId}`,
+        `${baseClassName}-icon ${this.props?.hashId}`,
       );
       /**
        * 如果没有icon在收起的时候用首字母代替
@@ -176,9 +176,7 @@ class MenuUtil {
         >
           {/* 收起的时候group模式就不要展示icon了，放不下 */}
           {menuType === 'group' && collapsed ? null : shouldHasIcon && iconDom ? (
-            <span className={`anticon ${baseClassName}-item-icon ${this.props?.hashId}`}>
-              {iconDom}
-            </span>
+            <span className={`${baseClassName}-item-icon ${this.props?.hashId}`}>{iconDom}</span>
           ) : (
             defaultIcon
           )}
@@ -289,7 +287,7 @@ class MenuUtil {
         })}
       >
         {icon ? (
-          <span className={`anticon ${baseClassName}-item-icon ${this.props?.hashId}`}>{icon}</span>
+          <span className={`${baseClassName}-item-icon ${this.props?.hashId}`}>{icon}</span>
         ) : (
           defaultIcon
         )}
@@ -319,9 +317,7 @@ class MenuUtil {
           })}
         >
           {icon ? (
-            <span className={`anticon ${baseClassName}-item-icon ${this.props?.hashId}`}>
-              {icon}
-            </span>
+            <span className={`${baseClassName}-item-icon ${this.props?.hashId}`}>{icon}</span>
           ) : (
             defaultIcon
           )}

packages/layout/src/components/SiderMenu/SiderMenu.tsx

@@ -2,7 +2,7 @@ import type { GenerateStyle } from '@ant-design/pro-provider';
 import { ProProvider } from '@ant-design/pro-provider';
 import type { AvatarProps, SiderProps } from 'antd';
 import { Avatar, ConfigProvider, Layout, Menu, Space } from 'antd';
-import type { ItemType } from 'antd/es/menu/hooks/useItems';
+import type { ItemType } from 'antd/lib/menu/hooks/useItems';
 import classNames from 'classnames';
 import type { CSSProperties } from 'react';
 import React, { useContext, useMemo } from 'react';
@@ -474,6 +474,7 @@ const SiderMenu: React.FC<SiderMenuProps & PrivateSiderMenuProps> = (props) => {
                 colorActiveBarWidth: 0,
                 colorActiveBarHeight: 0,
                 colorActiveBarBorderSize: 0,
+                controlHeightLG: 35,
                 colorItemText: token?.layout?.sider?.colorTextMenu || 'rgba(0, 0, 0, 0.65)',
                 colorItemTextHover:
                   token?.layout?.sider?.colorTextMenuActive || 'rgba(0, 0, 0, 0.85)',

packages/layout/src/components/SiderMenu/style/menu.ts

@@ -18,6 +18,11 @@ const genProLayoutBaseMenuStyle: GenerateStyle<ProLayoutBaseMenuToken> = (token)
           paddingInlineStart: 10,
         },
       },
+      [`${token.antCls}-menu-title-content`]: {
+        width: '100%',
+        height: '100%',
+        display: 'inline-flex',
+      },
       [`&&-collapsed`]: {
         [`${token.antCls}-menu-item, 
         ${token.antCls}-menu-item-group > ${token.antCls}-menu-item-group-list > ${token.antCls}-menu-item, 
@@ -37,12 +42,14 @@ const genProLayoutBaseMenuStyle: GenerateStyle<ProLayoutBaseMenuToken> = (token)
           },
         },
       },
+
       [`${token.componentCls}-item-icon`]: {
         height: '14px',
         width: '14px',
         opacity: '0.85',
-        '.anticon': {
-          lineHeight: '14px',
+        lineHeight: '14px',
+        '> span.anticon': {
+          lineHeight: '14px!important',
           height: '14px',
         },
       },
@@ -50,9 +57,21 @@ const genProLayoutBaseMenuStyle: GenerateStyle<ProLayoutBaseMenuToken> = (token)
         display: 'flex',
         flexDirection: 'row',
         alignItems: 'center',
+        gap: 8,
         '&-collapsed': {
           flexDirection: 'column',
           justifyContent: 'center',
+          width: 35,
+          height: 35,
+          [`${token.componentCls}-item-icon`]: {
+            height: '16px',
+            width: '16px',
+            lineHeight: '16px !important',
+            '.anticon': {
+              lineHeight: '16px',
+              height: '16px',
+            },
+          },
           [`${token.componentCls}-item-text`]: {
             maxWidth: '100%',
           },
@@ -72,6 +91,7 @@ const genProLayoutBaseMenuStyle: GenerateStyle<ProLayoutBaseMenuToken> = (token)
             display: 'flex',
             [`${token.componentCls}-item-icon`]: {
               height: '16px',
+              width: '16px',
               lineHeight: '16px !important',
               '.anticon': {
                 lineHeight: '16px',

packages/layout/src/index.tsx

@@ -1,21 +1,21 @@
 // 兼容代码-----------
-import 'antd/es/anchor/style';
-import 'antd/es/avatar/style';
-import 'antd/es/breadcrumb/style';
-import 'antd/es/divider/style';
-import 'antd/es/drawer/style';
-import 'antd/es/layout/style';
-import 'antd/es/list/style';
-import 'antd/es/menu/style';
-import 'antd/es/message/style';
-import 'antd/es/popover/style';
-import 'antd/es/select/style';
-import 'antd/es/space/style';
-import 'antd/es/spin/style';
-import 'antd/es/switch/style';
-import 'antd/es/tabs/style';
-import 'antd/es/tooltip/style';
-import 'antd/es/typography/style';
+import 'antd/lib/anchor/style';
+import 'antd/lib/avatar/style';
+import 'antd/lib/breadcrumb/style';
+import 'antd/lib/divider/style';
+import 'antd/lib/drawer/style';
+import 'antd/lib/layout/style';
+import 'antd/lib/list/style';
+import 'antd/lib/menu/style';
+import 'antd/lib/message/style';
+import 'antd/lib/popover/style';
+import 'antd/lib/select/style';
+import 'antd/lib/space/style';
+import 'antd/lib/spin/style';
+import 'antd/lib/switch/style';
+import 'antd/lib/tabs/style';
+import 'antd/lib/tooltip/style';
+import 'antd/lib/typography/style';
 //----------------------
 
 import { FooterToolbar } from './components/FooterToolbar';

packages/layout/src/utils/getBreadcrumbProps.tsx

@@ -4,7 +4,7 @@ import type {
   BreadcrumbItemType,
   ItemType,
   NewBreadcrumbProps as AntdBreadcrumbProps,
-} from 'antd/es/breadcrumb/Breadcrumb';
+} from 'antd/lib/breadcrumb/Breadcrumb';
 import type H from 'history';
 import pathToRegexp from 'path-to-regexp';
 import type { ProSettings } from '../defaultSettings';
@@ -42,7 +42,17 @@ const defaultItemRender: AntdBreadcrumbProps['itemRender'] = (route, _, routes)
   return last ? (
     <span>{title || breadcrumbName}</span>
   ) : (
-    <a href={path}>{title || breadcrumbName}</a>
+    <span
+      onClick={
+        path
+          ? () => {
+              location.href = path;
+            }
+          : undefined
+      }
+    >
+      {title || breadcrumbName}
+    </span>
   );
 };
 

packages/list/src/Item.tsx

@@ -4,10 +4,10 @@ import ProCard from '@ant-design/pro-card';
 import { ProProvider } from '@ant-design/pro-provider';
 import { ConfigProvider, List, Skeleton } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { ListGridType } from 'antd/es/list';
-import type { ExpandableConfig } from 'antd/es/table/interface';
+import type { ListGridType } from 'antd/lib/list';
+import type { ExpandableConfig } from 'antd/lib/table/interface';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useContext, useMemo } from 'react';
 import type { GetComponentProps } from './index';
 

packages/list/src/ListView.tsx

@@ -3,19 +3,19 @@ import { ProProvider } from '@ant-design/pro-provider';
 import type { ActionType } from '@ant-design/pro-table';
 import type { ListProps, TableColumnType, TableProps } from 'antd';
 import { ConfigProvider, List } from 'antd';
-import useLazyKVMap from 'antd/es/table/hooks/useLazyKVMap';
-import usePagination from 'antd/es/table/hooks/usePagination';
-import useSelection from 'antd/es/table/hooks/useSelection';
-import type { GetRowKey, TableRowSelection } from 'antd/es/table/interface';
+import useLazyKVMap from 'antd/lib/table/hooks/useLazyKVMap';
+import usePagination from 'antd/lib/table/hooks/usePagination';
+import useSelection from 'antd/lib/table/hooks/useSelection';
+import type { GetRowKey, TableRowSelection } from 'antd/lib/table/interface';
 import classNames from 'classnames';
-import get from 'rc-util/es/utils/get';
+import get from 'rc-util/lib/utils/get';
 import React, { useContext } from 'react';
 import { PRO_LIST_KEYS_MAP } from './constants';
 import type { GetComponentProps } from './index';
 import type { ItemProps } from './Item';
 import ProListItem from './Item';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { PaginationConfig } from 'antd/es/pagination';
+import type { PaginationConfig } from 'antd/lib/pagination';
 
 type AntdListProps<RecordType> = Omit<ListProps<RecordType>, 'rowKey'>;
 type Key = React.Key;

packages/list/src/index.tsx

@@ -3,7 +3,7 @@ import type { ActionType, ProColumnType, ProTableProps } from '@ant-design/pro-t
 import ProTable from '@ant-design/pro-table';
 import type { ListProps, PaginationProps } from 'antd';
 import { ConfigProvider } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import classNames from 'classnames';
 import React, { useContext, useImperativeHandle, useMemo, useRef } from 'react';
 import type { ItemProps } from './Item';
@@ -12,7 +12,7 @@ import { useStyle } from './style/index';
 import { ProConfigProvider } from '@ant-design/pro-provider';
 
 // 兼容性代码
-import 'antd/es/list/style';
+import 'antd/lib/list/style';
 import { ConfigContext } from 'antd/lib/config-provider';
 
 export type AntdListProps<RecordType> = Omit<ListProps<RecordType>, 'rowKey'>;

packages/provider/src/index.tsx

@@ -1,7 +1,8 @@
 import type { Theme } from '@ant-design/cssinjs';
 import { useCacheToken } from '@ant-design/cssinjs';
 import { ConfigProvider as AntdConfigProvider } from 'antd';
-import zh_CN from 'antd/es/locale/zh_CN';
+import { ConfigContext } from 'antd/lib/config-provider';
+import zh_CN from 'antd/lib/locale/zh_CN';
 import React, { useContext, useEffect, useMemo, useRef } from 'react';
 import { SWRConfig, useSWRConfig } from 'swr';
 import type { IntlType } from './intl';
@@ -184,7 +185,9 @@ const ConfigProviderContainer: React.FC<{
     token: propsToken,
     prefixCls,
   } = props;
-  const { locale, getPrefixCls, ...restConfig } = useContext(AntdConfigProvider.ConfigContext);
+  const { locale, getPrefixCls, ...restConfig } = useContext(
+    ConfigContext || AntdConfigProvider.ConfigContext,
+  );
   const tokenContext = proTheme.useToken?.();
   const containerDomRef = useRef<HTMLDivElement>(null);
   const proProvide = useContext(ProConfigContext);
@@ -200,7 +203,6 @@ const ConfigProviderContainer: React.FC<{
   const antCls = '.' + getPrefixCls();
 
   const salt = `${proComponentsCls}`;
-
   /**
    * 合并一下token，不然导致嵌套 token 失效
    */

packages/provider/src/useStyle/index.ts

@@ -1,14 +1,14 @@
 import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
 import { useStyleRegister } from '@ant-design/cssinjs';
 import { TinyColor } from '@ctrl/tinycolor';
-
+import { ConfigContext } from 'antd/lib/config-provider';
 import { theme as antdTheme } from 'antd';
 import { ConfigProvider as AntdConfigProvider } from 'antd';
 import type React from 'react';
 import { useContext } from 'react';
 import { ProProvider } from '../index';
 import type { ProTokenType } from '../typing/layoutToken';
-import type { GlobalToken } from 'antd/es/theme/interface';
+import type { GlobalToken } from 'antd/lib/theme/interface';
 import * as batToken from './token';
 
 /**
@@ -107,8 +107,7 @@ export function useStyle(
   styleFn: (token: ProAliasToken) => CSSInterpolation,
 ) {
   const { token = {} as ProAliasToken, hashId = '', theme } = useContext(ProProvider);
-  const { getPrefixCls } = useContext(AntdConfigProvider.ConfigContext);
-
+  const { getPrefixCls } = useContext(ConfigContext || AntdConfigProvider.ConfigContext);
   token.antCls = `.${getPrefixCls()}`;
 
   return {

packages/provider/src/useStyle/token.ts

@@ -1,7 +1,7 @@
 import { createTheme } from '@ant-design/cssinjs';
 
 import { theme } from 'antd';
-import type { GlobalToken } from 'antd/es/theme/interface';
+import type { GlobalToken } from 'antd/lib/theme/interface';
 
 export const defaultToken = {
   blue: '#1677ff',

packages/skeleton/src/index.tsx

@@ -1,4 +1,4 @@
-import 'antd/es/skeleton/style';
+import 'antd/lib/skeleton/style';
 import React from 'react';
 import type { DescriptionsPageSkeletonProps } from './components/Descriptions';
 import DescriptionsPageSkeleton, {

packages/table/src/Store/Provide.tsx

@@ -1,6 +1,6 @@
 import type { TableColumnType } from 'antd';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import { noteOnce } from 'rc-util/es/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import { noteOnce } from 'rc-util/lib/warning';
 import { createContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import type { DensitySize } from '../components/ToolBar/DensityIcon';
 import type { ProTableProps } from '../index';

packages/table/src/Table.tsx

@@ -1,6 +1,6 @@
 // 兼容代码-----------
-import 'antd/es/table/style';
-import 'antd/es/typography/style';
+import 'antd/lib/table/style';
+import 'antd/lib/typography/style';
 //----------------------
 import { ConfigContext } from 'antd/lib/config-provider';
 import ProCard from '@ant-design/pro-card';
@@ -19,7 +19,7 @@ import {
 } from '@ant-design/pro-utils';
 import type { TablePaginationConfig } from 'antd';
 import { ConfigProvider, Table } from 'antd';
-import type { GetRowKey, SortOrder, TableCurrentDataSource } from 'antd/es/table/interface';
+import type { GetRowKey, SortOrder, TableCurrentDataSource } from 'antd/lib/table/interface';
 import classNames from 'classnames';
 import React, {
   useCallback,
@@ -54,7 +54,7 @@ import {
 } from './utils';
 import { columnSort } from './utils/columnSort';
 import { genProColumnToColumn } from './utils/genProColumnToColumn';
-import type Summary from 'rc-table/es/Footer/Summary';
+import type Summary from 'rc-table/lib/Footer/Summary';
 
 function TableRender<T extends Record<string, any>, U, ValueType>(
   props: ProTableProps<T, U, ValueType> & {

packages/table/src/components/ColumnSetting/index.tsx

@@ -8,8 +8,8 @@ import { ProProvider, useIntl } from '@ant-design/pro-provider';
 import { runFunction, useRefFunction } from '@ant-design/pro-utils';
 import type { TableColumnType } from 'antd';
 import { Checkbox, ConfigProvider, Popover, Space, Tooltip, Tree } from 'antd';
-import type { CheckboxChangeEvent } from 'antd/es/checkbox';
-import type { DataNode } from 'antd/es/tree';
+import type { CheckboxChangeEvent } from 'antd/lib/checkbox';
+import type { DataNode } from 'antd/lib/tree';
 import classNames from 'classnames';
 import omit from 'omit.js';
 import React, { useContext, useEffect, useMemo, useRef } from 'react';

packages/table/src/components/DragSortTable/index.tsx

@@ -1,7 +1,7 @@
 import { MenuOutlined } from '@ant-design/icons';
 import type { ParamsType } from '@ant-design/pro-provider';
 import { ConfigProvider } from 'antd';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useCallback, useContext, useMemo, useRef } from 'react';
 import { SortableHandle } from 'react-sortable-hoc';
 import ProTable from '../../Table';

packages/table/src/components/EditableTable/index.tsx

@@ -6,11 +6,11 @@ import { useIntl } from '@ant-design/pro-provider';
 import { isDeepEqualReact, runFunction, usePrevious, useRefFunction } from '@ant-design/pro-utils';
 import type { ButtonProps, FormItemProps } from 'antd';
 import { Button, Form } from 'antd';
-import type { NamePath } from 'antd/es/form/interface';
-import type { GetRowKey } from 'antd/es/table/interface';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import get from 'rc-util/es/utils/get';
-import set from 'rc-util/es/utils/set';
+import type { NamePath } from 'antd/lib/form/interface';
+import type { GetRowKey } from 'antd/lib/table/interface';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import get from 'rc-util/lib/utils/get';
+import set from 'rc-util/lib/utils/set';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import ProTable from '../../Table';
 import type { ActionType, ProTableProps } from '../../typing';