ProComponents 3.0 开发

.fatherrc.base.ts

@@ -1,20 +1,24 @@
 import { defineConfig } from 'father';
 
+const siteBuild = process.env.SITE_DEPLOY === 'TRUE';
+
+console.log(siteBuild);
+
 export default defineConfig({
   // 以下为 esm 配置项启用时的默认值，有自定义需求时才需配置
   esm: {
     input: 'src', // 默认编译目录
     output: 'es',
     extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), {}]],
     platform: 'browser', // 默认构建为 Browser 环境的产物
-    transformer: 'babel', // 默认使用 babel 以提供更好的兼容性
+    transformer: siteBuild ? 'babel' : 'esbuild', // 默认使用 babel 以提供更好的兼容性
   },
   // 以下为 cjs 配置项启用时的默认值，有自定义需求时才需配置
   cjs: {
     extraBabelPlugins: [[require.resolve('./scripts/replaceEs'), {}]],
     input: 'src', // 默认编译目录
     output: 'lib',
     platform: 'browser', // 默认构建为 Node.js 环境的产物
-    transformer: 'babel', // 默认使用 esbuild 以获得更快的构建速度
+    transformer: siteBuild ? 'babel' : 'esbuild', // 默认使用 esbuild 以获得更快的构建速度
   },
 });

docs/components/valueType.tsx

@@ -6,7 +6,7 @@ const valueEnum = {
   all: { text: '全部', status: 'Default' },
   open: {
     text: '未解决',
-    status: 'Error',
+    status: 'Warning',
   },
   closed: {
     text: '已解决',

docs/playground/pro-layout.en-US.md

@@ -10,7 +10,3 @@ nav:
 ## Layout 自定义
 
 <code src="../../packages/layout/src/demos/dynamic-settings.tsx"  background="var(--main-bg-color)" title="属性展示"></code>
-
-## 水印自定义
-
-<code src="../../packages/layout/src/components/WaterMark/demos/custom.tsx" background="var(--main-bg-color)"></code>

docs/playground/pro-layout.md

@@ -11,7 +11,3 @@ nav:
 ## Layout 自定义
 
 <code src="../../packages/layout/src/demos/dynamic-settings.tsx"  background="var(--main-bg-color)" iframe="500" title="属性展示"></code>
-
-## 水印自定义
-
-<code src="../../packages/layout/src/components/WaterMark/demos/custom.tsx" background="var(--main-bg-color)" iframe="500"></code>

packages/card/package.json

@@ -47,7 +47,7 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "antd": "^4.24.15 || ^5.11.2",
+    "antd": "^5.11.2",
     "react": ">=17.0.0"
   },
   "publishConfig": {

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/components/package.json

@@ -48,7 +48,7 @@
     "@babel/runtime": "^7.16.3"
   },
   "peerDependencies": {
-    "antd": "^4.24.15 || ^5.11.2",
+    "antd": "^5.11.2",
     "react": ">=17.0.0",
     "react-dom": ">=17.0.0"
   },

packages/descriptions/package.json

@@ -47,7 +47,7 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "antd": "^4.24.15 || ^5.11.2",
+    "antd": "^5.11.2",
     "react": ">=17.0.0"
   },
   "publishConfig": {

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,
@@ -388,18 +381,20 @@ const schemaToDescriptionsItem = (
       const contentDom: React.ReactNode =
         fieldMode === 'edit' ? text : genCopyable(text, item, text);
 
+      const key = restItem.key || restItem.label?.toString() || index;
+      const label = (title || restItem.label || restItem.tooltip) && (
+        <LabelIconTip
+          label={title || restItem.label}
+          tooltip={restItem.tooltip}
+          ellipsis={item.ellipsis}
+        />
+      );
       const field: DescriptionsItemType | JSX.Element =
-        isBigger58 && valueType !== 'option'
+        valueType !== 'option'
           ? ({
               ...restItem,
-              key: restItem.key || restItem.label?.toString() || index,
-              label: (title || restItem.label || restItem.tooltip) && (
-                <LabelIconTip
-                  label={title || restItem.label}
-                  tooltip={restItem.tooltip}
-                  ellipsis={item.ellipsis}
-                />
-              ),
+              key,
+              label,
               children: (
                 <Component>
                   <FieldRender
@@ -426,19 +421,7 @@ const schemaToDescriptionsItem = (
               ),
             } as DescriptionsItemType)
           : ((
-              <Descriptions.Item
-                {...restItem}
-                key={restItem.key || restItem.label?.toString() || index}
-                label={
-                  (title || restItem.label || restItem.tooltip) && (
-                    <LabelIconTip
-                      label={title || restItem.label}
-                      tooltip={restItem.tooltip}
-                      ellipsis={item.ellipsis}
-                    />
-                  )
-                }
-              >
+              <Descriptions.Item {...restItem} key={key} label={label}>
                 <Component>
                   <FieldRender
                     {...item}
@@ -451,13 +434,6 @@ const schemaToDescriptionsItem = (
                     action={action}
                     editableUtils={editableUtils}
                   />
-                  {showEditIcon && valueType !== 'option' && (
-                    <EditOutlined
-                      onClick={() => {
-                        editableUtils?.startEditable(dataIndex || index);
-                      }}
-                    />
-                  )}
                 </Component>
               </Descriptions.Item>
             ) as JSX.Element);
@@ -625,7 +601,6 @@ const ProDescriptions = <
   }
 
   const className = context.getPrefixCls('pro-descriptions');
-  const isBigger58 = compareVersions(version, '5.8.0') >= 0;
   return (
     <ErrorBoundary>
       <FormComponent
@@ -654,10 +629,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.14.7",
     "@ant-design/pro-utils": "2.15.13",
     "@babel/runtime": "^7.18.0",
-    "@chenshuai2144/sketch-color": "^1.0.8",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.10",
     "lodash.tonumber": "^4.0.3",
@@ -48,7 +47,7 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "antd": "^4.24.15 || ^5.11.2",
+    "antd": "^5.11.2",
     "react": ">=17.0.0"
   }
 }