删除 兼容代码

Author: chenshuai2144

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

@@ -9,9 +9,6 @@ import type { StatisticProps } from '../Statistic';
 import Statistic from '../Statistic';
 import { useStyle } from './style';
 
-import 'antd/lib/divider/style';
-import 'antd/lib/statistic/style';
-
 export type StatisticCardProps = {
   /** 图表配置 */
   chart?: React.ReactNode;

packages/card/src/index.tsx

@@ -14,8 +14,6 @@ import type { ProCardProps } from './ProCard';
 import ProCard from './ProCard';
 import type { ProCardTabsProps } from './typing';
 
-import 'antd/lib/card/style';
-
 export { CheckCard, ProCard, Statistic, StatisticCard };
 export type {
   CheckCardGroupProps,

packages/descriptions/src/index.tsx

@@ -13,27 +13,23 @@ import {
   ErrorBoundary,
   InlineErrorFormItem,
   LabelIconTip,
-  compareVersions,
   genCopyable,
   getFieldPropsOrFormItemProps,
   stringify,
   useEditableMap,
 } from '@ant-design/pro-utils';
 import type { DescriptionsProps, FormInstance, FormProps } from 'antd';
-import { ConfigProvider, Descriptions, Space, version } from 'antd';
+import { ConfigProvider, Descriptions, Space } from 'antd';
 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 type { RequestData } from './useFetchData';
 import useFetchData from './useFetchData';
 
-// 兼容代码-----------
 import type { ProFieldFCMode } from '@ant-design/pro-provider';
 import { proTheme } from '@ant-design/pro-provider';
 import type { DescriptionsItemType } from 'antd/es/descriptions';
-import 'antd/lib/descriptions/style';
-//----------------------
 
 // todo remove it
 export interface DescriptionsItemProps {
@@ -328,16 +324,13 @@ const schemaToDescriptionsItem = (
   emptyText?: React.ReactNode,
 ) => {
   const options: JSX.Element[] = [];
-  const isBigger58 = compareVersions(version, '5.8.0') >= 0;
   // 因为 Descriptions 只是个语法糖，children 是不会执行的，所以需要这里处理一下
   const children = items
     ?.map?.((item, index) => {
       if (React.isValidElement(item)) {
-        return isBigger58
-          ? {
-              children: item,
-            }
-          : item;
+        return {
+          children: item,
+        };
       }
       const {
         valueEnum,
@@ -389,7 +382,7 @@ const schemaToDescriptionsItem = (
         fieldMode === 'edit' ? text : genCopyable(text, item, text);
 
       const field: DescriptionsItemType | JSX.Element =
-        isBigger58 && valueType !== 'option'
+        valueType !== 'option'
           ? ({
               ...restItem,
               key: restItem.key || restItem.label?.toString() || index,
@@ -623,7 +616,6 @@ const ProDescriptions = <
   }
 
   const className = context.getPrefixCls('pro-descriptions');
-  const isBigger58 = compareVersions(version, '5.8.0') >= 0;
   return (
     <ErrorBoundary>
       <FormComponent
@@ -651,10 +643,8 @@ const ProDescriptions = <
             )
           }
           title={title}
-          items={isBigger58 ? (children as DescriptionsItemType[]) : undefined}
-        >
-          {isBigger58 ? null : (children as JSX.Element[])}
-        </Descriptions>
+          items={children as DescriptionsItemType[]}
+        />
       </FormComponent>
     </ErrorBoundary>
   );

packages/field/package.json

@@ -33,7 +33,6 @@
     "@ant-design/pro-provider": "2.13.5",
     "@ant-design/pro-utils": "2.15.4",
     "@babel/runtime": "^7.18.0",
-    "@chenshuai2144/sketch-color": "^1.0.8",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.10",
     "lodash.tonumber": "^4.0.3",

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

@@ -20,10 +20,6 @@ import type { ProFieldFC } from '../../index';
 import type { FieldSelectProps } from '../Select';
 import { useFieldFetchData } from '../Select';
 
-// 兼容代码-----------
-import 'antd/lib/cascader/style';
-//----------------------
-
 export type GroupProps = {
   options?: RadioGroupProps['options'];
   radioType?: 'button' | 'radio';

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

@@ -1,4 +1,5 @@
-import {
+import { useToken } from '@ant-design/pro-provider';
+import {
   objectToMap,
   proFieldParsingText,
   useStyle,
@@ -15,10 +16,6 @@ export type GroupProps = {
   options?: CheckboxGroupProps['options'];
 } & FieldSelectProps;
 
-// 兼容代码-----------
-import { useToken } from '@ant-design/pro-provider';
-import 'antd/lib/checkbox/style';
-//----------------------
 /**
  * 多选组件
  *

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

@@ -2,10 +2,7 @@ import { Input } from 'antd';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
 import { proTheme } from '@ant-design/pro-provider';
-import 'antd/lib/input/style';
-//----------------------
 
 const languageFormat = (text: string, language: string) => {
   if (typeof text !== 'string') {

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

@@ -1,11 +1,9 @@
-import { compareVersions } from '@ant-design/pro-utils';
-import type { ColorPickerProps } from 'antd';
-import { ColorPicker as ColorPickerV5, ConfigProvider, version } from 'antd';
+import type { ColorPickerProps } from 'antd';
+import { ColorPicker, ConfigProvider } from 'antd';
 import classNames from 'classnames';
-import React, { useContext, useMemo } from 'react';
+import React, { useContext } from 'react';
 import type { ProFieldFC } from '../../index';
-import { ColorPicker as ColorPickerV4 } from './old';
-// https://ant.design/components/color-picker-cn 示例颜色
+
 const DEFAULT_PRESETS = {
   label: 'Recommended',
   colors: [
@@ -31,25 +29,7 @@ const DEFAULT_PRESETS = {
     '#EB2F964D',
   ],
 };
-/**
- * 判断是否是 5.5.0 以上的版本
- * @returns
- */
-function IsIt_Render_V5() {
-  return compareVersions(version, '5.5.0') > -1;
-}
-/**
- * 获取颜色组件
- * @param {boolean} [old=false] 是否使用旧版本
- * @return {*}
- */
-function getColorPicker(old: boolean = false) {
-  if ((typeof old === 'undefined' || old === false) && IsIt_Render_V5()) {
-    return ColorPickerV5;
-  }
-  return ColorPickerV4;
-}
-// const ColorPicker = getColorPicker();
+
 /**
  * 颜色组件
  * Antd > 5.5.0 的版本 使用 antd 的 ColorPicker
@@ -60,28 +40,16 @@ function getColorPicker(old: boolean = false) {
 const FieldColorPicker: ProFieldFC<
   {
     text: string;
-    /** 是否使用旧版本 */
-    old?: boolean;
   } & Partial<ColorPickerProps>
-> = (
-  { text, mode: type, render, renderFormItem, fieldProps, old },
-  ref: any,
-) => {
+> = ({ text, mode: type, render, renderFormItem, fieldProps }, ref: any) => {
   const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
-  const ColorPicker = React.useMemo(() => getColorPicker(old), [old]);
   const prefixCls = getPrefixCls('pro-field-color-picker');
-  // 5.5.0 以上版本追加 className
-  const className = useMemo(() => {
-    if (old) return '';
-    return classNames({ [prefixCls]: IsIt_Render_V5() });
-  }, [prefixCls, old]);
+
   if (type === 'read') {
     const dom = (
       <ColorPicker
         value={text}
-        mode="read"
-        ref={ref}
-        className={className}
+        className={classNames({ [prefixCls]: true })}
         // 设置无法 open
         open={false}
       />
@@ -100,7 +68,7 @@ const FieldColorPicker: ProFieldFC<
         presets={[DEFAULT_PRESETS]}
         {...fieldProps}
         style={style}
-        className={className}
+        className={classNames({ [prefixCls]: true })}
       />
     );
     if (renderFormItem) {

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

@@ -10,10 +10,6 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 import React, { useState } from 'react';
 import type { ProFieldFC, ProFieldLightProps } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/date-picker/style';
-//----------------------
-
 dayjs.extend(weekOfYear);
 
 const formatDate = (text: any, format: any) => {

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

@@ -1,14 +1,10 @@
+import { useIntl } from '@ant-design/pro-provider';
 import { isNil } from '@ant-design/pro-utils';
 import { InputNumber } from 'antd';
 import omit from 'omit.js';
 import React, { useCallback } from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import { useIntl } from '@ant-design/pro-provider';
-import 'antd/lib/input-number/style';
-//----------------------
-
 export type FieldDigitProps = {
   text: number;
   placeholder?: string;

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

@@ -4,10 +4,6 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/input-number/style';
-//----------------------
-
 export type Value = string | number | undefined | null;
 
 export type ValuePair = Value[];

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

@@ -3,12 +3,8 @@ import { parseValueToDay } from '@ant-design/pro-utils';
 import { DatePicker, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
-import type { ProFieldFC } from '../../index';
-
-// 兼容代码-----------
-import 'antd/lib/date-picker/style';
 import React from 'react';
-//----------------------
+import type { ProFieldFC } from '../../index';
 
 dayjs.extend(relativeTime);
 /**

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

@@ -3,10 +3,6 @@ import { Image, Input } from 'antd';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/image/style';
-//----------------------
-
 export type FieldImageProps = {
   text: string;
   width?: number;

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

@@ -6,13 +6,6 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useCallback, useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/input-number/style';
-import 'antd/lib/popover/style';
-//----------------------
-
-import { openVisibleCompatible } from '@ant-design/pro-utils';
-
 export type FieldMoneyProps = {
   text: number;
   moneySymbol?: boolean;
@@ -252,12 +245,10 @@ const InputNumberPopover = React.forwardRef<
       value,
     });
 
-    const props = openVisibleCompatible(dom ? open : false);
-
     return (
       <Popover
         placement="topLeft"
-        {...props}
+        open={dom ? open : false}
         trigger={['focus', 'click']}
         content={dom}
         getPopupContainer={(triggerNode) => {

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

@@ -1,12 +1,8 @@
+import { proTheme } from '@ant-design/pro-provider';
 import { ConfigProvider } from 'antd';
 import React, { useContext, useImperativeHandle } from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import { proTheme } from '@ant-design/pro-provider';
-import 'antd/lib/space/style';
-//----------------------
-
 const addArrayKeys = (doms: React.ReactNode[]) =>
   doms.map((dom, index) => {
     if (!React.isValidElement(dom)) {

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

@@ -5,11 +5,6 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/input/style';
-import 'antd/lib/space/style';
-//----------------------
-
 /**
  * 最基本的组件，就是个普通的 Input.Password
  *

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

@@ -10,10 +10,6 @@ import {
   getSymbolByRealValue,
 } from './util';
 
-// 兼容代码-----------
-import 'antd/lib/input-number/style';
-//------------
-
 export type PercentPropInt = {
   prefix?: ReactNode;
   suffix?: ReactNode;

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

@@ -4,11 +4,6 @@ import toNumber from 'lodash.tonumber';
 import React, { useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/input-number/style';
-import 'antd/lib/progress/style';
-//------------
-
 export function getProgressStatus(
   text: number,
 ): 'success' | 'exception' | 'normal' | 'active' {

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

@@ -11,10 +11,6 @@ import type { ProFieldFC } from '../../index';
 import type { FieldSelectProps } from '../Select';
 import { useFieldFetchData } from '../Select';
 
-// 兼容代码-----------
-import 'antd/lib/radio/style';
-//------------
-
 export type GroupProps = {
   options?: RadioGroupProps['options'];
   radioType?: RadioGroupProps['optionType'];

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

@@ -9,10 +9,6 @@ import dayjs from 'dayjs';
 import React, { useCallback } from 'react';
 import type { ProFieldFC, ProFieldLightProps } from '../../index';
 
-// 兼容代码-----------
-import 'antd/lib/date-picker/style';
-//------------
-
 /**
  * 日期范围选择组件
  *