diff --git a/.eslintignore b/.eslintignore index 422cd67aa457..21c55d74f83c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,4 +8,5 @@ es .umi .github scripts -webpack.config.js \ No newline at end of file +webpack.config.js +server \ No newline at end of file diff --git a/.fatherrc.base.ts b/.fatherrc.base.ts index 63db34c21053..ebc4cf4a86f8 100644 --- a/.fatherrc.base.ts +++ b/.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 环境的产物 diff --git a/.prettierignore b/.prettierignore index 9b5cca74b66b..d7d5c09ee485 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,4 +5,5 @@ **/lib **/es **\__snapshots__\** -pnpm-lock.yaml \ No newline at end of file +pnpm-lock.yaml +server \ No newline at end of file diff --git a/packages/card/src/components/Card/index.tsx b/packages/card/src/components/Card/index.tsx index 71973505ac45..be2727c00ba0 100644 --- a/packages/card/src/components/Card/index.tsx +++ b/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'; diff --git a/packages/card/src/components/StatisticCard/index.tsx b/packages/card/src/components/StatisticCard/index.tsx index 6f7cfeec4429..c160ee886b0a 100644 --- a/packages/card/src/components/StatisticCard/index.tsx +++ b/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 = { diff --git a/packages/card/src/components/TabPane/index.tsx b/packages/card/src/components/TabPane/index.tsx index 916368f75590..08480ce57648 100644 --- a/packages/card/src/components/TabPane/index.tsx +++ b/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'; diff --git a/packages/card/src/index.tsx b/packages/card/src/index.tsx index 2bff65123c9b..3f77023a832e 100644 --- a/packages/card/src/index.tsx +++ b/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, diff --git a/packages/card/src/typing.ts b/packages/card/src/typing.ts index 8b799778521b..6b5ebee3e401 100644 --- a/packages/card/src/typing.ts +++ b/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'; diff --git a/packages/descriptions/src/index.tsx b/packages/descriptions/src/index.tsx index cc4ea9c5a062..f95c7ee8a6aa 100644 --- a/packages/descriptions/src/index.tsx +++ b/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'; //---------------------- diff --git a/packages/descriptions/src/useFetchData.tsx b/packages/descriptions/src/useFetchData.tsx index 2fa5d7272de6..372c061b090e 100644 --- a/packages/descriptions/src/useFetchData.tsx +++ b/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 = { diff --git a/packages/field/src/components/Cascader/index.tsx b/packages/field/src/components/Cascader/index.tsx index a0ecc4f63d20..464b05bfe60f 100644 --- a/packages/field/src/components/Cascader/index.tsx +++ b/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 = { diff --git a/packages/field/src/components/Checkbox/index.tsx b/packages/field/src/components/Checkbox/index.tsx index dc4ad81e93b6..0b9c9c246b37 100644 --- a/packages/field/src/components/Checkbox/index.tsx +++ b/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'; //---------------------- /** * 多选组件 diff --git a/packages/field/src/components/Code/index.tsx b/packages/field/src/components/Code/index.tsx index 5bf5f616f4ce..295885bb3e7e 100644 --- a/packages/field/src/components/Code/index.tsx +++ b/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) => { diff --git a/packages/field/src/components/ColorPicker/index.tsx b/packages/field/src/components/ColorPicker/index.tsx index 3eb0b090fc52..5bb10b504611 100644 --- a/packages/field/src/components/ColorPicker/index.tsx +++ b/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'; diff --git a/packages/field/src/components/DatePicker/index.tsx b/packages/field/src/components/DatePicker/index.tsx index 838c30e63cb7..b418bc7137e1 100644 --- a/packages/field/src/components/DatePicker/index.tsx +++ b/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); diff --git a/packages/field/src/components/Digit/index.tsx b/packages/field/src/components/Digit/index.tsx index 8cceac63e7b1..1d6147ec1745 100644 --- a/packages/field/src/components/Digit/index.tsx +++ b/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'; //---------------------- diff --git a/packages/field/src/components/DigitRange/index.tsx b/packages/field/src/components/DigitRange/index.tsx index 93df8689f20d..dcd6851d8481 100644 --- a/packages/field/src/components/DigitRange/index.tsx +++ b/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'; //---------------------- diff --git a/packages/field/src/components/FromNow/index.tsx b/packages/field/src/components/FromNow/index.tsx index 2e95c76cbbea..f07b320dd7bb 100644 --- a/packages/field/src/components/FromNow/index.tsx +++ b/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'; //---------------------- diff --git a/packages/field/src/components/Image/index.tsx b/packages/field/src/components/Image/index.tsx index 3e861d61e8d6..b7063bba7f0d 100644 --- a/packages/field/src/components/Image/index.tsx +++ b/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 = { diff --git a/packages/field/src/components/Money/index.tsx b/packages/field/src/components/Money/index.tsx index b0abd616b2f5..cad744a5a64d 100644 --- a/packages/field/src/components/Money/index.tsx +++ b/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'; diff --git a/packages/field/src/components/Options/index.tsx b/packages/field/src/components/Options/index.tsx index 1ccfb5e59b00..95356ff580b1 100644 --- a/packages/field/src/components/Options/index.tsx +++ b/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[]) => diff --git a/packages/field/src/components/Password/index.tsx b/packages/field/src/components/Password/index.tsx index f0b49306055f..1a30b018559f 100644 --- a/packages/field/src/components/Password/index.tsx +++ b/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'; //---------------------- /** diff --git a/packages/field/src/components/Percent/index.tsx b/packages/field/src/components/Percent/index.tsx index cbc136ad2365..4f534e8b305c 100644 --- a/packages/field/src/components/Percent/index.tsx +++ b/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'; //------------ diff --git a/packages/field/src/components/Progress/index.tsx b/packages/field/src/components/Progress/index.tsx index 1f5c64676e78..dc758373e334 100644 --- a/packages/field/src/components/Progress/index.tsx +++ b/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'; //------------ diff --git a/packages/field/src/components/Radio/index.tsx b/packages/field/src/components/Radio/index.tsx index a92ca12bb08c..98c49a69a15e 100644 --- a/packages/field/src/components/Radio/index.tsx +++ b/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 = { diff --git a/packages/field/src/components/RangePicker/index.tsx b/packages/field/src/components/RangePicker/index.tsx index 5cfe9a241a6b..c150f4f40a6d 100644 --- a/packages/field/src/components/RangePicker/index.tsx +++ b/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'; //------------ /** diff --git a/packages/field/src/components/Rate/index.tsx b/packages/field/src/components/Rate/index.tsx index 6585ac5b7a54..96fd6d1d6ee7 100644 --- a/packages/field/src/components/Rate/index.tsx +++ b/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'; //------------ /** diff --git a/packages/field/src/components/Second/index.tsx b/packages/field/src/components/Second/index.tsx index 5af750d4adfd..021384341850 100644 --- a/packages/field/src/components/Second/index.tsx +++ b/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'; //------------ diff --git a/packages/field/src/components/Segmented/index.tsx b/packages/field/src/components/Segmented/index.tsx index c48ad275acec..063f1f5c8935 100644 --- a/packages/field/src/components/Segmented/index.tsx +++ b/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/ diff --git a/packages/field/src/components/Select/LightSelect/index.tsx b/packages/field/src/components/Select/LightSelect/index.tsx index 7c0bf199c691..ff5795acbc48 100644 --- a/packages/field/src/components/Select/LightSelect/index.tsx +++ b/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'; diff --git a/packages/field/src/components/Select/SearchSelect/index.tsx b/packages/field/src/components/Select/SearchSelect/index.tsx index e337ef1da795..9adee2852b83 100644 --- a/packages/field/src/components/Select/SearchSelect/index.tsx +++ b/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'; diff --git a/packages/field/src/components/Select/index.tsx b/packages/field/src/components/Select/index.tsx index 028e44524945..8f05bf83a65a 100644 --- a/packages/field/src/components/Select/index.tsx +++ b/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[]; diff --git a/packages/field/src/components/Slider/index.tsx b/packages/field/src/components/Slider/index.tsx index 65328aa76f87..f984257a329b 100644 --- a/packages/field/src/components/Slider/index.tsx +++ b/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'; //------------ /** * 评分组件 diff --git a/packages/field/src/components/Status/index.tsx b/packages/field/src/components/Status/index.tsx index 65cdb425f3c7..780960369171 100644 --- a/packages/field/src/components/Status/index.tsx +++ b/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 = { diff --git a/packages/field/src/components/Switch/index.tsx b/packages/field/src/components/Switch/index.tsx index 27ff899d17fe..42192e1f860d 100644 --- a/packages/field/src/components/Switch/index.tsx +++ b/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'; //------------ /** diff --git a/packages/field/src/components/Text/index.tsx b/packages/field/src/components/Text/index.tsx index 1a999090762b..c0a44cb3892b 100644 --- a/packages/field/src/components/Text/index.tsx +++ b/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'; //------------ /** diff --git a/packages/field/src/components/TextArea/index.tsx b/packages/field/src/components/TextArea/index.tsx index 67675db6cddd..5f0f1efa3869 100644 --- a/packages/field/src/components/TextArea/index.tsx +++ b/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 diff --git a/packages/field/src/components/TimePicker/index.tsx b/packages/field/src/components/TimePicker/index.tsx index 89992f993adf..8f9693828a19 100644 --- a/packages/field/src/components/TimePicker/index.tsx +++ b/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'; //----------------------; diff --git a/packages/field/src/components/TreeSelect/index.tsx b/packages/field/src/components/TreeSelect/index.tsx index 747b858b94b5..170dc287ae30 100644 --- a/packages/field/src/components/TreeSelect/index.tsx +++ b/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'; //---------------------- diff --git a/packages/field/src/index.tsx b/packages/field/src/index.tsx index 72f87c771c07..e6d4f2c7ba48 100644 --- a/packages/field/src/index.tsx +++ b/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'; diff --git a/packages/form/src/BaseForm/BaseForm.tsx b/packages/form/src/BaseForm/BaseForm.tsx index 276ca11a30b7..1effb0d18ed9 100644 --- a/packages/form/src/BaseForm/BaseForm.tsx +++ b/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, diff --git a/packages/form/src/BaseForm/LightWrapper/index.tsx b/packages/form/src/BaseForm/LightWrapper/index.tsx index 7a26835439a1..9a3391f0ad0d 100644 --- a/packages/form/src/BaseForm/LightWrapper/index.tsx +++ b/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; diff --git a/packages/form/src/BaseForm/createField.tsx b/packages/form/src/BaseForm/createField.tsx index 256d78f6b842..4da94196e8bf 100644 --- a/packages/form/src/BaseForm/createField.tsx +++ b/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'; diff --git a/packages/form/src/FieldContext.tsx b/packages/form/src/FieldContext.tsx index c465c21ad6bf..49712b09dbdc 100644 --- a/packages/form/src/FieldContext.tsx +++ b/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'; diff --git a/packages/form/src/components/Captcha/index.tsx b/packages/form/src/components/Captcha/index.tsx index e59221202c57..84561a60d3d0 100644 --- a/packages/form/src/components/Captcha/index.tsx +++ b/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'; diff --git a/packages/form/src/components/Checkbox/index.tsx b/packages/form/src/components/Checkbox/index.tsx index e8346a721c07..c2b064d065a3 100644 --- a/packages/form/src/components/Checkbox/index.tsx +++ b/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'; diff --git a/packages/form/src/components/DatePicker/MonthPicker.tsx b/packages/form/src/components/DatePicker/MonthPicker.tsx index 9d31c85b5fee..31e1eac1ba3b 100644 --- a/packages/form/src/components/DatePicker/MonthPicker.tsx +++ b/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'; diff --git a/packages/form/src/components/DatePicker/WeekPicker.tsx b/packages/form/src/components/DatePicker/WeekPicker.tsx index e2b668771bae..b14f76bf6087 100644 --- a/packages/form/src/components/DatePicker/WeekPicker.tsx +++ b/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'; diff --git a/packages/form/src/components/DateRangePicker/index.tsx b/packages/form/src/components/DateRangePicker/index.tsx index b97d94331ada..39af80e982ab 100644 --- a/packages/form/src/components/DateRangePicker/index.tsx +++ b/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'; diff --git a/packages/form/src/components/DateTimeRangePicker/index.tsx b/packages/form/src/components/DateTimeRangePicker/index.tsx index e9ff252e8432..5b77f930ca42 100644 --- a/packages/form/src/components/DateTimeRangePicker/index.tsx +++ b/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'; diff --git a/packages/form/src/components/Dependency/demos/dependency2.tsx b/packages/form/src/components/Dependency/demos/dependency2.tsx index 44e14c8cd959..b6c634c32ba7 100644 --- a/packages/form/src/components/Dependency/demos/dependency2.tsx +++ b/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 = { diff --git a/packages/form/src/components/Dependency/index.tsx b/packages/form/src/components/Dependency/index.tsx index 76f60ccc31bd..2156ccd24b37 100644 --- a/packages/form/src/components/Dependency/index.tsx +++ b/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'; diff --git a/packages/form/src/components/FieldSet/index.tsx b/packages/form/src/components/FieldSet/index.tsx index 1e333a4012d1..90d811577749 100644 --- a/packages/form/src/components/FieldSet/index.tsx +++ b/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'; diff --git a/packages/form/src/components/FormItem/index.tsx b/packages/form/src/components/FormItem/index.tsx index debd7f8f3fe5..ccd773b89fec 100644 --- a/packages/form/src/components/FormItem/index.tsx +++ b/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'; diff --git a/packages/form/src/components/List/ListItem.tsx b/packages/form/src/components/List/ListItem.tsx index c32b5ac6a155..9b88520ff7b6 100644 --- a/packages/form/src/components/List/ListItem.tsx +++ b/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 '.'; diff --git a/packages/form/src/components/List/index.tsx b/packages/form/src/components/List/index.tsx index 1f4b675ae0eb..3fb2769ebf72 100644 --- a/packages/form/src/components/List/index.tsx +++ b/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'; diff --git a/packages/form/src/components/QueryFilter/demos/light-filter-footer.tsx b/packages/form/src/components/QueryFilter/demos/light-filter-footer.tsx index e64dffa150c7..cf49b913de35 100644 --- a/packages/form/src/components/QueryFilter/demos/light-filter-footer.tsx +++ b/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 () => { diff --git a/packages/form/src/components/QueryFilter/demos/light-filter-test.tsx b/packages/form/src/components/QueryFilter/demos/light-filter-test.tsx index fdc778f40882..5b8cad7a1ca4 100644 --- a/packages/form/src/components/QueryFilter/demos/light-filter-test.tsx +++ b/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'; diff --git a/packages/form/src/components/QueryFilter/demos/light-filter.tsx b/packages/form/src/components/QueryFilter/demos/light-filter.tsx index 4421ef804919..82743b9af793 100644 --- a/packages/form/src/components/QueryFilter/demos/light-filter.tsx +++ b/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'; diff --git a/packages/form/src/components/SchemaForm/typing.ts b/packages/form/src/components/SchemaForm/typing.ts index e17c77e83cc5..da49b1e8193a 100644 --- a/packages/form/src/components/SchemaForm/typing.ts +++ b/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 { diff --git a/packages/form/src/components/SchemaForm/valueType/dependency.tsx b/packages/form/src/components/SchemaForm/valueType/dependency.tsx index 29029561ade1..02d52afb973a 100644 --- a/packages/form/src/components/SchemaForm/valueType/dependency.tsx +++ b/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'; diff --git a/packages/form/src/components/Select/index.tsx b/packages/form/src/components/Select/index.tsx index 60a1999fb0b2..43516a8b0cd0 100644 --- a/packages/form/src/components/Select/index.tsx +++ b/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'; diff --git a/packages/form/src/components/Slider/index.tsx b/packages/form/src/components/Slider/index.tsx index 921ac6d94d0c..0da3c1039aee 100644 --- a/packages/form/src/components/Slider/index.tsx +++ b/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'; diff --git a/packages/form/src/components/Text/index.tsx b/packages/form/src/components/Text/index.tsx index f4cfb16f27ce..21fb5502108b 100644 --- a/packages/form/src/components/Text/index.tsx +++ b/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'; diff --git a/packages/form/src/components/TextArea/index.tsx b/packages/form/src/components/TextArea/index.tsx index c3ab4ea65ebe..b8b8a6eb4e30 100644 --- a/packages/form/src/components/TextArea/index.tsx +++ b/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'; diff --git a/packages/form/src/components/TimePicker/index.tsx b/packages/form/src/components/TimePicker/index.tsx index 9e7052eb2aea..726b53ea3ad7 100644 --- a/packages/form/src/components/TimePicker/index.tsx +++ b/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'; diff --git a/packages/form/src/components/TreeSelect/index.tsx b/packages/form/src/components/TreeSelect/index.tsx index 9c509d475ff1..48e73dc47ed7 100644 --- a/packages/form/src/components/TreeSelect/index.tsx +++ b/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'; diff --git a/packages/form/src/components/UploadDragger/index.tsx b/packages/form/src/components/UploadDragger/index.tsx index 162f54f03bce..57932bf45db0 100644 --- a/packages/form/src/components/UploadDragger/index.tsx +++ b/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'; diff --git a/packages/form/src/demos/config-provider.tsx b/packages/form/src/demos/config-provider.tsx index 187fbf19f484..7656720e034b 100644 --- a/packages/form/src/demos/config-provider.tsx +++ b/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 () => ( diff --git a/packages/form/src/demos/form-layout-grid.tsx b/packages/form/src/demos/form-layout-grid.tsx index ead112d25299..b1f6a1f1919a 100644 --- a/packages/form/src/demos/form-layout-grid.tsx +++ b/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'; diff --git a/packages/form/src/index.tsx b/packages/form/src/index.tsx index 9bdaa0cc3e2f..f60f4875de60 100644 --- a/packages/form/src/index.tsx +++ b/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 { diff --git a/packages/form/src/layouts/DrawerForm/index.tsx b/packages/form/src/layouts/DrawerForm/index.tsx index 89c1f8d4c18c..62140f1af4f6 100644 --- a/packages/form/src/layouts/DrawerForm/index.tsx +++ b/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'; diff --git a/packages/form/src/layouts/LightFilter/index.tsx b/packages/form/src/layouts/LightFilter/index.tsx index 941901fce4fd..9dc5f24cf029 100644 --- a/packages/form/src/layouts/LightFilter/index.tsx +++ b/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, { diff --git a/packages/form/src/layouts/ModalForm/index.tsx b/packages/form/src/layouts/ModalForm/index.tsx index a0ec87071e3d..3d6110786a22 100644 --- a/packages/form/src/layouts/ModalForm/index.tsx +++ b/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'; diff --git a/packages/form/src/layouts/QueryFilter/index.tsx b/packages/form/src/layouts/QueryFilter/index.tsx index 0fb790731eda..47452b81007f 100644 --- a/packages/form/src/layouts/QueryFilter/index.tsx +++ b/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'; diff --git a/packages/form/src/layouts/StepsForm/StepForm.tsx b/packages/form/src/layouts/StepsForm/StepForm.tsx index cf8a2e60452b..5544fa5fe25e 100644 --- a/packages/form/src/layouts/StepsForm/StepForm.tsx +++ b/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'; diff --git a/packages/form/src/layouts/StepsForm/index.tsx b/packages/form/src/layouts/StepsForm/index.tsx index 24aae16d2c3c..6d29801bd5f6 100644 --- a/packages/form/src/layouts/StepsForm/index.tsx +++ b/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, diff --git a/packages/form/src/typing.ts b/packages/form/src/typing.ts index 4ac419979ae3..a1005a270ecf 100644 --- a/packages/form/src/typing.ts +++ b/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'; diff --git a/packages/layout/src/ProLayout.tsx b/packages/layout/src/ProLayout.tsx index 5ad042c26004..79030081ebf9 100644 --- a/packages/layout/src/ProLayout.tsx +++ b/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'; diff --git a/packages/layout/src/components/Help/index.tsx b/packages/layout/src/components/Help/index.tsx index 153561f00977..7062d75c8dd0 100644 --- a/packages/layout/src/components/Help/index.tsx +++ b/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'; diff --git a/packages/layout/src/components/PageContainer/index.tsx b/packages/layout/src/components/PageContainer/index.tsx index 774ab316c29c..dfa25d4ec06d 100644 --- a/packages/layout/src/components/PageContainer/index.tsx +++ b/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 的列表 */ diff --git a/packages/layout/src/components/PageHeader/index.tsx b/packages/layout/src/components/PageHeader/index.tsx index 7d4f1afd8cb6..94a5f8db5833 100644 --- a/packages/layout/src/components/PageHeader/index.tsx +++ b/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; diff --git a/packages/layout/src/components/SettingDrawer/index.tsx b/packages/layout/src/components/SettingDrawer/index.tsx index 756fc8b1e80f..7d70a5086dfd 100644 --- a/packages/layout/src/components/SettingDrawer/index.tsx +++ b/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'; diff --git a/packages/layout/src/components/SiderMenu/BaseMenu.tsx b/packages/layout/src/components/SiderMenu/BaseMenu.tsx index c5c61543adeb..bfc3274f988e 100644 --- a/packages/layout/src/components/SiderMenu/BaseMenu.tsx +++ b/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 ? ( - - {iconDom} - + {iconDom} ) : ( defaultIcon )} @@ -289,7 +287,7 @@ class MenuUtil { })} > {icon ? ( - {icon} + {icon} ) : ( defaultIcon )} @@ -319,9 +317,7 @@ class MenuUtil { })} > {icon ? ( - - {icon} - + {icon} ) : ( defaultIcon )} diff --git a/packages/layout/src/components/SiderMenu/SiderMenu.tsx b/packages/layout/src/components/SiderMenu/SiderMenu.tsx index 4dfcfd9fea9d..a8fd93f03465 100644 --- a/packages/layout/src/components/SiderMenu/SiderMenu.tsx +++ b/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 = (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)', diff --git a/packages/layout/src/components/SiderMenu/style/menu.ts b/packages/layout/src/components/SiderMenu/style/menu.ts index 4c5089b69e8d..df89037bb416 100644 --- a/packages/layout/src/components/SiderMenu/style/menu.ts +++ b/packages/layout/src/components/SiderMenu/style/menu.ts @@ -18,6 +18,11 @@ const genProLayoutBaseMenuStyle: GenerateStyle = (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 = (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 = (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 = (token) display: 'flex', [`${token.componentCls}-item-icon`]: { height: '16px', + width: '16px', lineHeight: '16px !important', '.anticon': { lineHeight: '16px', diff --git a/packages/layout/src/index.tsx b/packages/layout/src/index.tsx index aa649c071c4c..29ab8062f976 100644 --- a/packages/layout/src/index.tsx +++ b/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'; diff --git a/packages/layout/src/utils/getBreadcrumbProps.tsx b/packages/layout/src/utils/getBreadcrumbProps.tsx index 17735c25b14a..c5de1f06954f 100644 --- a/packages/layout/src/utils/getBreadcrumbProps.tsx +++ b/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 ? ( {title || breadcrumbName} ) : ( - {title || breadcrumbName} + { + location.href = path; + } + : undefined + } + > + {title || breadcrumbName} + ); }; diff --git a/packages/list/src/Item.tsx b/packages/list/src/Item.tsx index e0fd0d6d76dc..b5674162c370 100644 --- a/packages/list/src/Item.tsx +++ b/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'; diff --git a/packages/list/src/ListView.tsx b/packages/list/src/ListView.tsx index 31c59182e354..0530f62f4416 100644 --- a/packages/list/src/ListView.tsx +++ b/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 = Omit, 'rowKey'>; type Key = React.Key; diff --git a/packages/list/src/index.tsx b/packages/list/src/index.tsx index 17c12d926b04..413709972cea 100644 --- a/packages/list/src/index.tsx +++ b/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 = Omit, 'rowKey'>; diff --git a/packages/provider/src/index.tsx b/packages/provider/src/index.tsx index 23291574a8ee..1cfccb0ffd5e 100644 --- a/packages/provider/src/index.tsx +++ b/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(null); const proProvide = useContext(ProConfigContext); @@ -200,7 +203,6 @@ const ConfigProviderContainer: React.FC<{ const antCls = '.' + getPrefixCls(); const salt = `${proComponentsCls}`; - /** * 合并一下token，不然导致嵌套 token 失效 */ diff --git a/packages/provider/src/useStyle/index.ts b/packages/provider/src/useStyle/index.ts index f1ae7b373b9b..f29b1f88e49c 100644 --- a/packages/provider/src/useStyle/index.ts +++ b/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 { diff --git a/packages/provider/src/useStyle/token.ts b/packages/provider/src/useStyle/token.ts index 9f14149b0daf..211a50c52383 100644 --- a/packages/provider/src/useStyle/token.ts +++ b/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', diff --git a/packages/skeleton/src/index.tsx b/packages/skeleton/src/index.tsx index 053cf82b57b6..04d3afe10c6f 100644 --- a/packages/skeleton/src/index.tsx +++ b/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, { diff --git a/packages/table/src/Store/Provide.tsx b/packages/table/src/Store/Provide.tsx index 831402ec83f6..7e6c472f1dbc 100644 --- a/packages/table/src/Store/Provide.tsx +++ b/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'; diff --git a/packages/table/src/Table.tsx b/packages/table/src/Table.tsx index 1a259249257f..a0f3b4095e5e 100644 --- a/packages/table/src/Table.tsx +++ b/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, U, ValueType>( props: ProTableProps & { diff --git a/packages/table/src/components/ColumnSetting/index.tsx b/packages/table/src/components/ColumnSetting/index.tsx index 760b60a0502c..5dc1c336d50c 100644 --- a/packages/table/src/components/ColumnSetting/index.tsx +++ b/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'; diff --git a/packages/table/src/components/DragSortTable/index.tsx b/packages/table/src/components/DragSortTable/index.tsx index b9a04ba6de16..62bab302cadc 100644 --- a/packages/table/src/components/DragSortTable/index.tsx +++ b/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'; diff --git a/packages/table/src/components/EditableTable/index.tsx b/packages/table/src/components/EditableTable/index.tsx index 2d06f410f670..d58f3173e843 100644 --- a/packages/table/src/components/EditableTable/index.tsx +++ b/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'; diff --git a/packages/table/src/components/ListToolBar/HeaderMenu.tsx b/packages/table/src/components/ListToolBar/HeaderMenu.tsx index d4a77adbce6c..d4a6a4518571 100644 --- a/packages/table/src/components/ListToolBar/HeaderMenu.tsx +++ b/packages/table/src/components/ListToolBar/HeaderMenu.tsx @@ -3,7 +3,7 @@ import { ProProvider } from '@ant-design/pro-provider'; import { menuOverlayCompatible } from '@ant-design/pro-utils'; import { Dropdown, Space, Tabs } 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 } from 'react'; export type ListToolBarMenuItem = { diff --git a/packages/table/src/components/ListToolBar/index.tsx b/packages/table/src/components/ListToolBar/index.tsx index d4c0ccc13420..0408e36b1e61 100644 --- a/packages/table/src/components/ListToolBar/index.tsx +++ b/packages/table/src/components/ListToolBar/index.tsx @@ -2,8 +2,8 @@ import { useIntl } from '@ant-design/pro-provider'; import { LabelIconTip } from '@ant-design/pro-utils'; import type { TabPaneProps } from 'antd'; import { ConfigProvider, Input, Tabs, Tooltip } from 'antd'; -import type { LabelTooltipType } from 'antd/es/form/FormItemLabel'; -import type { SearchProps } from 'antd/es/input'; +import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel'; +import type { SearchProps } from 'antd/lib/input'; import classNames from 'classnames'; import React, { useContext, useMemo, useState } from 'react'; import type { ListToolBarHeaderMenuProps } from './HeaderMenu'; diff --git a/packages/table/src/components/ToolBar/index.tsx b/packages/table/src/components/ToolBar/index.tsx index 2e5c168fdbc1..d3cfc9d66f82 100644 --- a/packages/table/src/components/ToolBar/index.tsx +++ b/packages/table/src/components/ToolBar/index.tsx @@ -4,7 +4,7 @@ import { useIntl } from '@ant-design/pro-provider'; import { isDeepEqualReact, omitUndefined } from '@ant-design/pro-utils'; import type { TableColumnType } from 'antd'; import { Tooltip } from 'antd'; -import type { LabelTooltipType } from 'antd/es/form/FormItemLabel'; +import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel'; import React, { useContext, useEffect, useMemo } from 'react'; import { TableContext } from '../../Store/Provide'; import type { ActionType, OptionSearchProps, ProTableProps } from '../../typing'; diff --git a/packages/table/src/demos/intl.tsx b/packages/table/src/demos/intl.tsx index d4515d729c90..bea8ebd2311d 100644 --- a/packages/table/src/demos/intl.tsx +++ b/packages/table/src/demos/intl.tsx @@ -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/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 viVNIntl from 'antd/es/locale/vi_VN'; -import zhCNIntl from 'antd/es/locale/zh_CN'; -import zhTWIntl from 'antd/es/locale/zh_TW'; -import thTHIntl from 'antd/es/locale/th_TH'; +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 viVNIntl from 'antd/lib/locale/vi_VN'; +import zhCNIntl from 'antd/lib/locale/zh_CN'; +import zhTWIntl from 'antd/lib/locale/zh_TW'; +import thTHIntl from 'antd/lib/locale/th_TH'; import dayjs from 'dayjs'; import { useRef, useState } from 'react'; diff --git a/packages/table/src/demos/rtl_table.tsx b/packages/table/src/demos/rtl_table.tsx index 22b425333d9b..e2df273e8009 100644 --- a/packages/table/src/demos/rtl_table.tsx +++ b/packages/table/src/demos/rtl_table.tsx @@ -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/es/locale/ar_EG'; +import arEGIntl from 'antd/lib/locale/ar_EG'; import { useRef } from 'react'; import request from 'umi-request'; diff --git a/packages/table/src/typing.ts b/packages/table/src/typing.ts index b2b34c052432..210724fb8086 100644 --- a/packages/table/src/typing.ts +++ b/packages/table/src/typing.ts @@ -10,11 +10,11 @@ import type { SearchTransformKeyFn, } from '@ant-design/pro-utils'; import type { SpinProps, TableProps } from 'antd'; -import type { SizeType } from 'antd/es/config-provider/SizeContext'; -import type { LabelTooltipType } from 'antd/es/form/FormItemLabel'; -import type { NamePath } from 'antd/es/form/interface'; -import type { SearchProps } from 'antd/es/input'; -import type { ColumnFilterItem, ColumnType, CompareFn, SortOrder } from 'antd/es/table/interface'; +import type { SizeType } from 'antd/lib/config-provider/SizeContext'; +import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel'; +import type { NamePath } from 'antd/lib/form/interface'; +import type { SearchProps } from 'antd/lib/input'; +import type { ColumnFilterItem, ColumnType, CompareFn, SortOrder } from 'antd/lib/table/interface'; import type dayjs from 'dayjs'; import type React from 'react'; import type { CSSProperties } from 'react'; diff --git a/packages/table/src/utils/columnRender.tsx b/packages/table/src/utils/columnRender.tsx index 575630abcef2..5e34a7a6248d 100644 --- a/packages/table/src/utils/columnRender.tsx +++ b/packages/table/src/utils/columnRender.tsx @@ -6,7 +6,7 @@ import type { UseEditableUtilType, } from '@ant-design/pro-utils'; import { genCopyable, isNil, LabelIconTip } from '@ant-design/pro-utils'; -import get from 'rc-util/es/utils/get'; +import get from 'rc-util/lib/utils/get'; import React from 'react'; import { isMergeCell } from '.'; import type { ContainerType } from '../Store/Provide'; diff --git a/packages/table/src/utils/index.ts b/packages/table/src/utils/index.ts index b6ea86f5b381..a3f620528b4f 100644 --- a/packages/table/src/utils/index.ts +++ b/packages/table/src/utils/index.ts @@ -2,7 +2,7 @@ import type { IntlType } from '@ant-design/pro-provider'; import type { UseEditableUtilType } from '@ant-design/pro-utils'; import { arrayMoveImmutable } from '@ant-design/pro-utils'; import type { TablePaginationConfig } from 'antd'; -import type { SortOrder } from 'antd/es/table/interface'; +import type { SortOrder } from 'antd/lib/table/interface'; import type React from 'react'; import type { ActionType, diff --git a/packages/table/src/utils/useDragSort.tsx b/packages/table/src/utils/useDragSort.tsx index d2314cb722e3..e027d254c7e2 100644 --- a/packages/table/src/utils/useDragSort.tsx +++ b/packages/table/src/utils/useDragSort.tsx @@ -1,5 +1,5 @@ import { useRefFunction } from '@ant-design/pro-utils'; -import type { TableComponents } from 'rc-table/es/interface'; +import type { TableComponents } from 'rc-table/lib/interface'; import { SortableContainer, SortableElement } from 'react-sortable-hoc'; import type { SortDataParams } from './index'; import { sortData } from './index'; diff --git a/packages/utils/src/components/FieldLabel/index.tsx b/packages/utils/src/components/FieldLabel/index.tsx index dd761d6e1d0b..56bd5ac39a0b 100644 --- a/packages/utils/src/components/FieldLabel/index.tsx +++ b/packages/utils/src/components/FieldLabel/index.tsx @@ -1,7 +1,7 @@ import { CloseOutlined, DownOutlined } from '@ant-design/icons'; import { useIntl } from '@ant-design/pro-provider'; import { ConfigProvider } from 'antd'; -import type { SizeType } from 'antd/es/config-provider/SizeContext'; +import type { SizeType } from 'antd/lib/config-provider/SizeContext'; import classNames from 'classnames'; import React, { useContext, useImperativeHandle, useRef } from 'react'; import { useStyle } from './style'; diff --git a/packages/utils/src/components/FilterDropdown/index.tsx b/packages/utils/src/components/FilterDropdown/index.tsx index a2e39b1d7967..5097f46875b9 100644 --- a/packages/utils/src/components/FilterDropdown/index.tsx +++ b/packages/utils/src/components/FilterDropdown/index.tsx @@ -5,9 +5,9 @@ import { DropdownFooter } from '../DropdownFooter'; import { ConfigContext } from 'antd/lib/config-provider'; import { useStyle } from './style'; import classNames from 'classnames'; -import 'antd/es/dropdown/style'; +import 'antd/lib/dropdown/style'; import { openVisibleCompatible } from '../../compareVersions/openVisibleCompatible'; -import type { TooltipPlacement } from 'antd/es/tooltip'; +import type { TooltipPlacement } from 'antd/lib/tooltip'; export type FooterRender = | (( diff --git a/packages/utils/src/components/InlineErrorFormItem/index.tsx b/packages/utils/src/components/InlineErrorFormItem/index.tsx index 553d360fd4da..b217ca35c441 100644 --- a/packages/utils/src/components/InlineErrorFormItem/index.tsx +++ b/packages/utils/src/components/InlineErrorFormItem/index.tsx @@ -2,7 +2,7 @@ import { openVisibleCompatible } from '../../compareVersions/openVisibleCompatible'; import type { FormItemProps, PopoverProps } from 'antd'; import { ConfigProvider, Form, Popover } from 'antd'; -import type { NamePath } from 'rc-field-form/es/interface'; +import type { NamePath } from 'rc-field-form/lib/interface'; import React, { useContext, useEffect, useState } from 'react'; import { useStyle } from './style'; import { ConfigContext } from 'antd/lib/config-provider'; diff --git a/packages/utils/src/components/LabelIconTip/index.tsx b/packages/utils/src/components/LabelIconTip/index.tsx index d7a8907947f9..4691d639a789 100644 --- a/packages/utils/src/components/LabelIconTip/index.tsx +++ b/packages/utils/src/components/LabelIconTip/index.tsx @@ -1,6 +1,6 @@ import { InfoCircleOutlined } from '@ant-design/icons'; import { ConfigProvider, Tooltip } from 'antd'; -import type { LabelTooltipType, WrapperTooltipProps } from 'antd/es/form/FormItemLabel'; +import type { LabelTooltipType, WrapperTooltipProps } from 'antd/lib/form/FormItemLabel'; import classNames from 'classnames'; import React, { useContext } from 'react'; import { useStyle } from './style'; diff --git a/packages/utils/src/components/ProFormContext/index.tsx b/packages/utils/src/components/ProFormContext/index.tsx index 9ad698d3bb03..5bb992cfa967 100644 --- a/packages/utils/src/components/ProFormContext/index.tsx +++ b/packages/utils/src/components/ProFormContext/index.tsx @@ -1,5 +1,5 @@ import type { FormInstance } from 'antd'; -import type { NamePath } from 'antd/es/form/interface'; +import type { NamePath } from 'antd/lib/form/interface'; import React from 'react'; export type ProFormInstanceType = { diff --git a/packages/utils/src/conversionMomentValue/index.ts b/packages/utils/src/conversionMomentValue/index.ts index c7223f584aa0..b984d1b7ba33 100644 --- a/packages/utils/src/conversionMomentValue/index.ts +++ b/packages/utils/src/conversionMomentValue/index.ts @@ -1,6 +1,6 @@ -import type { InternalNamePath, NamePath } from 'antd/es/form/interface'; +import type { InternalNamePath, NamePath } from 'antd/lib/form/interface'; import dayjs from 'dayjs'; -import get from 'rc-util/es/utils/get'; +import get from 'rc-util/lib/utils/get'; import { isNil } from '../isNil'; import type { ProFieldValueType } from '../typing'; import quarterOfYear from 'dayjs/plugin/quarterOfYear'; diff --git a/packages/utils/src/transformKeySubmitValue/index.ts b/packages/utils/src/transformKeySubmitValue/index.ts index 20b4d63fb363..ce00ebc5c171 100644 --- a/packages/utils/src/transformKeySubmitValue/index.ts +++ b/packages/utils/src/transformKeySubmitValue/index.ts @@ -1,5 +1,5 @@ -import get from 'rc-util/es/utils/get'; -import namePathSet from 'rc-util/es/utils/set'; +import get from 'rc-util/lib/utils/get'; +import namePathSet from 'rc-util/lib/utils/set'; import React from 'react'; import { isNil } from '../isNil'; import { merge } from '../merge'; diff --git a/packages/utils/src/typing.ts b/packages/utils/src/typing.ts index eeaefe29cc39..58e3213a2af5 100644 --- a/packages/utils/src/typing.ts +++ b/packages/utils/src/typing.ts @@ -1,7 +1,7 @@ import type { InputProps } from 'antd'; -import type { FormInstance, FormItemProps } from 'antd/es/form'; -import type { LabelTooltipType } from 'antd/es/form/FormItemLabel'; -import type { NamePath } from 'antd/es/form/interface'; +import type { FormInstance, FormItemProps } from 'antd/lib/form'; +import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel'; +import type { NamePath } from 'antd/lib/form/interface'; import type { ReactNode } from 'react'; import type { UseEditableUtilType } from './useEditableArray'; @@ -28,9 +28,9 @@ import type { TimeRangePickerProps, TreeSelectProps, } from 'antd'; -import type { RangePickerProps } from 'antd/es/date-picker'; -import type { PasswordProps, TextAreaProps } from 'antd/es/input'; -import type { SliderRangeProps } from 'antd/es/slider'; +import type { RangePickerProps } from 'antd/lib/date-picker'; +import type { PasswordProps, TextAreaProps } from 'antd/lib/input'; +import type { SliderRangeProps } from 'antd/lib/slider'; /** * ProFieldValueTypeWithFieldProps diff --git a/packages/utils/src/useEditableArray/index.tsx b/packages/utils/src/useEditableArray/index.tsx index 1b4a03b98a02..d11b49917f7a 100644 --- a/packages/utils/src/useEditableArray/index.tsx +++ b/packages/utils/src/useEditableArray/index.tsx @@ -3,13 +3,13 @@ import { LoadingOutlined } from '@ant-design/icons'; import { useIntl } from '@ant-design/pro-provider'; import type { FormInstance, FormProps } from 'antd'; import { Form, message, Popconfirm } from 'antd'; -import type { NamePath } from 'antd/es/form/interface'; -import useLazyKVMap from 'antd/es/table/hooks/useLazyKVMap'; -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 { noteOnce } from 'rc-util/es/warning'; +import type { NamePath } from 'antd/lib/form/interface'; +import useLazyKVMap from 'antd/lib/table/hooks/useLazyKVMap'; +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 { noteOnce } from 'rc-util/lib/warning'; import React, { createRef, forwardRef, diff --git a/packages/utils/src/useEditableMap/index.tsx b/packages/utils/src/useEditableMap/index.tsx index 3dc6069fac3f..e1406f51b98a 100644 --- a/packages/utils/src/useEditableMap/index.tsx +++ b/packages/utils/src/useEditableMap/index.tsx @@ -1,7 +1,7 @@ /* eslint-disable react-hooks/exhaustive-deps */ import { useIntl } from '@ant-design/pro-provider'; import { message } from 'antd'; -import useMergedState from 'rc-util/es/hooks/useMergedState'; +import useMergedState from 'rc-util/lib/hooks/useMergedState'; import type React from 'react'; import { useCallback, useMemo } from 'react'; import type { diff --git a/packages/utils/src/useMountMergeState/index.ts b/packages/utils/src/useMountMergeState/index.ts index 4a1916b16e37..3e5d5a4c4da4 100644 --- a/packages/utils/src/useMountMergeState/index.ts +++ b/packages/utils/src/useMountMergeState/index.ts @@ -1,3 +1,3 @@ -import useMergedState from 'rc-util/es/hooks/useMergedState'; +import useMergedState from 'rc-util/lib/hooks/useMergedState'; export { useMergedState as useMountMergeState }; diff --git a/scripts/replaceEs.js b/scripts/replaceEs.js new file mode 100644 index 000000000000..67e47d57606c --- /dev/null +++ b/scripts/replaceEs.js @@ -0,0 +1,22 @@ +function replacePath(path) { + if (path.node.source && path.node.source.value?.includes('es/')) { + const esModule = path.node.source.value.replace('/es/', '/lib/'); + try { + if (require.resolve(esModule)) { + path.node.source.value = esModule; + } + } catch (error) { + console.log(error); + } + } +} + +function replaceLib() { + return { + visitor: { + ImportDeclaration: replacePath, + ExportNamedDeclaration: replacePath, + }, + }; +} +module.exports = replaceLib; diff --git a/scripts/replaceLib.js b/scripts/replaceLib.js index 67e47d57606c..8bd44bf3f66b 100644 --- a/scripts/replaceLib.js +++ b/scripts/replaceLib.js @@ -1,6 +1,6 @@ function replacePath(path) { - if (path.node.source && path.node.source.value?.includes('es/')) { - const esModule = path.node.source.value.replace('/es/', '/lib/'); + if (path.node.source && path.node.source.value?.includes('lib/')) { + const esModule = path.node.source.value.replace('/lib/', '/es/'); try { if (require.resolve(esModule)) { path.node.source.value = esModule; diff --git a/tests/card/index.test.tsx b/tests/card/index.test.tsx index df946c5124d7..1139d55c968e 100644 --- a/tests/card/index.test.tsx +++ b/tests/card/index.test.tsx @@ -2,7 +2,7 @@ import { ProCard } from '@ant-design/pro-components'; import { render } from '@testing-library/react'; import { act } from 'react-dom/test-utils'; -jest.mock('antd/es/grid/hooks/useBreakpoint'); +jest.mock('antd/lib/grid/hooks/useBreakpoint'); describe('Card', () => { it('🥩 collapsible onCollapse', async () => { diff --git a/tests/form/__snapshots__/demo.test.ts.snap b/tests/form/__snapshots__/demo.test.ts.snap index b409a98bf193..ec3ea63f9a84 100644 --- a/tests/form/__snapshots__/demo.test.ts.snap +++ b/tests/form/__snapshots__/demo.test.ts.snap @@ -45628,11 +45628,10 @@ exports[`form demos 📸 renders ./packages/form/src/demos/layout-footer.tsx cor - - 一级名称 + + 一级名称 +
  • - - 主页 + + 主页 +
  • - - 管理 + + 管理 +
  • - - 申请单列表 + + 申请单列表 +
  • - - 配置中心 + + 配置中心 +
  • - - 首页 + + 首页 +
  • - - 首页 + + 首页 +
  • - - one + + one +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 首页 + + 首页 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - 主页 + + 主页 +
  • - - 测试页 + + 测试页 +
  • - - 管理 + + 管理 +
  • - - 申请单列表 + + 申请单列表 +
  • - - 列表页 + + 列表页 +
  • - - 列表页面 + + 列表页面 +
  • - - home + + home +
  • - - first + + first +
  • diff --git a/tests/setupTests.ts b/tests/setupTests.ts index d88b29524fde..38e246b6a260 100644 --- a/tests/setupTests.ts +++ b/tests/setupTests.ts @@ -5,7 +5,7 @@ import MockDate from 'mockdate'; import React from 'react'; import tableData from './table/mock.data.json'; -import { defaultConfig } from 'antd/es/theme/internal'; +import { defaultConfig } from 'antd/lib/theme/internal'; defaultConfig.hashed = false;