Merge branch 'ant-design:master' into master

ant-design · Oct 17, 2024 · 76ccecd · 76ccecd
2 parents 9dbf2b1 + 9c19bcc
commit 76ccecd
Show file tree

Hide file tree

Showing 52 changed files with 3,650 additions and 3,269 deletions.
diff --git a/docs/changelog.en-US.md b/docs/changelog.en-US.md
@@ -1,3 +1,10 @@
+## @ant-design/pro-components@2.8.0
+
+`2024-10-17`
+
+- fix(components):修复 ts 定义导致列名获取不到的问题 (#8795). [#8795](https://github.com/ant-design/pro-components/pull/#8795) [@qnnp-me](https://github.com/qnnp-me)
+- fix(form): field 为 checkbox 时设置了 fieldNames 后控制器报错的问题 React does not recognize the `fieldNames` prop on a DOM element (#8785). [#8785](https://github.com/ant-design/pro-components/pull/#8785) [@echoyl](https://github.com/echoyl)
+
 ## @ant-design/pro-components@2.7.19
 
 - fix(layout): downgrade path-to-regexp to version 8.0.0 (#8732)

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,10 @@
+## @ant-design/pro-components@2.8.0
+
+`2024-10-17`
+
+- fix(components):修复 ts 定义导致列名获取不到的问题 (#8795). [#8795](https://github.com/ant-design/pro-components/pull/#8795) [@qnnp-me](https://github.com/qnnp-me)
+- fix(form): field 为 checkbox 时设置了 fieldNames 后控制器报错的问题 React does not recognize the `fieldNames` prop on a DOM element (#8785). [#8785](https://github.com/ant-design/pro-components/pull/#8785) [@echoyl](https://github.com/echoyl)
+
 ## @ant-design/pro-components@2.7.19
 
 - fix(layout): downgrade path-to-regexp to version 8.0.0 (#8732)

diff --git a/package.json b/package.json
@@ -1,7 +1,10 @@
 {
   "name": "pro-components",
   "private": true,
-  "repository": "[email protected]:ant-design/pro-components.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://[email protected]/ant-design/pro-components.git"
+  },
   "license": "MIT",
   "workspaces": [
     "packages/*"
@@ -47,19 +50,19 @@
   "devDependencies": {
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/cssinjs": "^1.21.1",
-    "@ant-design/icons": "^5.4.0",
-    "@babel/core": "^7.25.2",
-    "@babel/eslint-plugin": "^7.25.1",
-    "@babel/parser": "^7.25.6",
+    "@ant-design/icons": "^5.5.1",
+    "@babel/core": "^7.25.8",
+    "@babel/eslint-plugin": "^7.25.7",
+    "@babel/parser": "^7.25.8",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
-    "@babel/traverse": "^7.25.6",
+    "@babel/preset-env": "^7.25.8",
+    "@babel/preset-react": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
+    "@babel/traverse": "^7.25.7",
     "@emotion/babel-plugin": "^11.12.0",
     "@emotion/cache": "^11.13.1",
-    "@emotion/css": "^11.13.0",
-    "@emotion/serialize": "^1.3.1",
+    "@emotion/css": "^11.13.4",
+    "@emotion/serialize": "^1.3.2",
     "@floating-ui/react": "^0.19.2",
     "@octokit/core": "^3.6.0",
     "@octokit/rest": "^18.12.0",
@@ -75,8 +78,8 @@
     "@types/lodash-es": "^4.17.12",
     "@types/mockjs": "^1.0.10",
     "@types/node": "^14.18.63",
-    "@types/react": "^18.3.5",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
     "@types/react-helmet": "^6.1.11",
     "@types/react-responsive": "^8.0.8",
     "@types/shallowequal": "^1.1.5",
@@ -87,28 +90,28 @@
     "@umijs/plugin-analytics": "^0.2.4",
     "@umijs/test": "^3.5.43",
     "@umijs/test-utils": "^3.5.43",
-    "@umijs/utils": "^4.3.20",
+    "@umijs/utils": "^4.3.27",
     "@vitest/coverage-istanbul": "^0.34.6",
     "animated-scroll-to": "^2.3.0",
-    "antd": "^5.20.6",
-    "antd-style": "^3.6.3",
-    "babel-loader": "^9.1.3",
+    "antd": "^5.21.4",
+    "antd-style": "^3.7.0",
+    "babel-loader": "^9.2.1",
     "babel-types": "^6.26.0",
     "chalk": "^4.1.2",
     "chroma-js": "^2.6.0",
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.13",
-    "dumi": "~2.4.10",
+    "dumi": "~2.4.13",
     "dumi-theme-antd-style": "~0.31.1",
     "esbuild": "^0.15.18",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-plugin-jest": "^27.9.0",
-    "eslint-plugin-react": "^7.36.0",
+    "eslint-plugin-react": "^7.37.1",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-unicorn": "^47.0.0",
     "execa": "^5.1.1",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
     "fast-deep-equal": "^3.1.3",
     "father": "^4.5.0",
     "gh-pages": "^5.0.0",
@@ -131,22 +134,22 @@
     "polished": "^4.3.1",
     "prettier": "^2.8.8",
     "prettier-plugin-organize-imports": "^3.2.4",
-    "prettier-plugin-packagejson": "^2.5.2",
+    "prettier-plugin-packagejson": "^2.5.3",
     "pretty-quick": "^3.3.1",
     "query-string": "^6.14.1",
     "rc-field-form": "^2.4.0",
     "rc-footer": "^0.6.8",
     "rc-resize-observer": "^1.4.0",
     "rc-steps": "^6.0.1",
-    "rc-table": "^7.47.5",
+    "rc-table": "^7.48.1",
     "rc-util": "^5.43.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-draggable": "^4.4.6",
     "react-layout-kit": "^1.9.0",
     "react-lazy-load": "^4.0.1",
     "react-markdown": "^8.0.7",
-    "react-syntax-highlighter": "^15.5.0",
+    "react-syntax-highlighter": "^15.6.1",
     "remark": "^15.0.1",
     "remark-gfm": "^4.0.0",
     "remark-parse": "^11.0.0",
@@ -156,8 +159,8 @@
     "stylelint": "^13.13.1",
     "timezone-mock": "^1.3.6",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.2",
-    "umi": "^4.3.20",
+    "typescript": "^5.6.3",
+    "umi": "^4.3.27",
     "umi-request": "^1.4.0",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
@@ -171,5 +174,6 @@
     "pre-commit": "pretty-quick --staged",
     "commit-msg": "fabric verify-commit"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "version": ""
 }
diff --git a/packages/card/CHANGELOG.md b/packages/card/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.9.0](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-10-17)
+
+### Features
+
+- added exports to support ESM environments such as vitest ([#8738](https://github.com/ant-design/pro-components/issues/8738)) ([71c4be9](https://github.com/ant-design/pro-components/commit/71c4be9c9ca5942154e0473e62be608d784d53fc))
+
 ## [2.8.8](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-09-12)
 
 **Note:** Version bump only for package @ant-design/pro-card

diff --git a/packages/card/package.json b/packages/card/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-card",
-  "version": "2.8.8",
+  "version": "2.9.0",
   "description": "@ant-design/pro-card",
   "keywords": [
     "antd",
@@ -12,7 +12,7 @@
   "bugs": "http://github.com/umijs/plugins/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ant-design/pro-components"
+    "url": "git+https://github.com/ant-design/pro-components.git"
   },
   "license": "MIT",
   "sideEffects": false,
@@ -43,8 +43,8 @@
   "dependencies": {
     "@ant-design/cssinjs": "^1.21.1",
     "@ant-design/icons": "^5.0.0",
-    "@ant-design/pro-provider": "2.14.9",
-    "@ant-design/pro-utils": "2.15.18",
+    "@ant-design/pro-provider": "2.15.0",
+    "@ant-design/pro-utils": "2.16.0",
     "@babel/runtime": "^7.18.0",
     "classnames": "^2.3.2",
     "omit.js": "^2.0.2",

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.8.0](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-10-17)
+
+### Features
+
+- added exports to support ESM environments such as vitest ([#8738](https://github.com/ant-design/pro-components/issues/8738)) ([71c4be9](https://github.com/ant-design/pro-components/commit/71c4be9c9ca5942154e0473e62be608d784d53fc))
+
 ## [2.7.19](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-09-18)
 
 **Note:** Version bump only for package @ant-design/pro-components

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-components",
-  "version": "2.7.19",
+  "version": "2.8.0",
   "description": "@ant-design/pro-components",
   "keywords": [
     "antd",
@@ -12,7 +12,7 @@
   "bugs": "https://github.com/ant-design/pro-components/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ant-design/pro-components"
+    "url": "git+https://github.com/ant-design/pro-components.git"
   },
   "license": "MIT",
   "sideEffects": false,
@@ -42,16 +42,16 @@
     "ie >= 11"
   ],
   "dependencies": {
-    "@ant-design/pro-card": "2.8.8",
-    "@ant-design/pro-descriptions": "2.5.53",
-    "@ant-design/pro-field": "2.16.2",
-    "@ant-design/pro-form": "2.30.2",
-    "@ant-design/pro-layout": "7.20.2",
-    "@ant-design/pro-list": "2.5.69",
-    "@ant-design/pro-provider": "2.14.9",
-    "@ant-design/pro-skeleton": "2.1.13",
-    "@ant-design/pro-table": "3.17.2",
-    "@ant-design/pro-utils": "2.15.18",
+    "@ant-design/pro-card": "2.9.0",
+    "@ant-design/pro-descriptions": "2.6.0",
+    "@ant-design/pro-field": "2.17.0",
+    "@ant-design/pro-form": "2.31.0",
+    "@ant-design/pro-layout": "7.21.0",
+    "@ant-design/pro-list": "2.6.0",
+    "@ant-design/pro-provider": "2.15.0",
+    "@ant-design/pro-skeleton": "2.2.0",
+    "@ant-design/pro-table": "3.18.0",
+    "@ant-design/pro-utils": "2.16.0",
     "@babel/runtime": "^7.16.3"
   },
   "peerDependencies": {

diff --git a/packages/descriptions/CHANGELOG.md b/packages/descriptions/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-10-17)
+
+### Bug Fixes
+
+- **FieldRender:** 将 dataIndex 强制转换为 React.Key 以确保类型安全 ([e2482f7](https://github.com/ant-design/pro-components/commit/e2482f7eec63e975326a57d11aa500092034083e))
+
+### Features
+
+- added exports to support ESM environments such as vitest ([#8738](https://github.com/ant-design/pro-components/issues/8738)) ([71c4be9](https://github.com/ant-design/pro-components/commit/71c4be9c9ca5942154e0473e62be608d784d53fc))
+
 ## [2.5.53](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-09-12)
 
 **Note:** Version bump only for package @ant-design/pro-descriptions

diff --git a/packages/descriptions/package.json b/packages/descriptions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-descriptions",
-  "version": "2.5.53",
+  "version": "2.6.0",
   "description": "@ant-design/pro-descriptions",
   "keywords": [
     "antd",
@@ -12,7 +12,7 @@
   "bugs": "http://github.com/umijs/plugins/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ant-design/pro-components"
+    "url": "git+https://github.com/ant-design/pro-components.git"
   },
   "license": "MIT",
   "sideEffects": false,
@@ -41,11 +41,11 @@
     "ie >= 11"
   ],
   "dependencies": {
-    "@ant-design/pro-field": "2.16.2",
-    "@ant-design/pro-form": "2.30.2",
-    "@ant-design/pro-provider": "2.14.9",
-    "@ant-design/pro-skeleton": "2.1.13",
-    "@ant-design/pro-utils": "2.15.18",
+    "@ant-design/pro-field": "2.17.0",
+    "@ant-design/pro-form": "2.31.0",
+    "@ant-design/pro-provider": "2.15.0",
+    "@ant-design/pro-skeleton": "2.2.0",
+    "@ant-design/pro-utils": "2.16.0",
     "@babel/runtime": "^7.18.0",
     "rc-resize-observer": "^0.2.3",
     "rc-util": "^5.0.6"

diff --git a/packages/descriptions/src/index.tsx b/packages/descriptions/src/index.tsx
@@ -269,7 +269,7 @@ export const FieldRender: React.FC<
                       },
                       {
                         isEditable: true,
-                        recordKey: dataIndex,
+                        recordKey: dataIndex as React.Key,
                         record: form.getFieldValue(
                           [dataIndex].flat(1) as (string | number)[],
                         ),
@@ -296,7 +296,7 @@ export const FieldRender: React.FC<
             gap: token.marginXS,
           }}
         >
-          {editableUtils?.actionRender?.(dataIndex || index, {
+          {editableUtils?.actionRender?.((dataIndex as React.Key) || index, {
             cancelText: <CloseOutlined />,
             saveText: <CheckOutlined />,
             deleteText: false,
@@ -373,7 +373,9 @@ const schemaToDescriptionsItem = (
             ) as ProFieldValueType)
           : (restItem.valueType as ProFieldValueType);
 
-      const isEditable = editableUtils?.isEditable(dataIndex || index);
+      const isEditable = editableUtils?.isEditable(
+        (dataIndex as React.Key) || index,
+      );
 
       const fieldMode = mode || isEditable ? 'edit' : 'read';
 
@@ -418,7 +420,9 @@ const schemaToDescriptionsItem = (
                   {showEditIcon && (
                     <EditOutlined
                       onClick={() => {
-                        editableUtils?.startEditable(dataIndex || index);
+                        editableUtils?.startEditable(
+                          (dataIndex as React.Key) || index,
+                        );
                       }}
                     />
                   )}
@@ -454,7 +458,9 @@ const schemaToDescriptionsItem = (
                   {showEditIcon && valueType !== 'option' && (
                     <EditOutlined
                       onClick={() => {
-                        editableUtils?.startEditable(dataIndex || index);
+                        editableUtils?.startEditable(
+                          (dataIndex as React.Key) || index,
+                        );
                       }}
                     />
                   )}

diff --git a/packages/field/CHANGELOG.md b/packages/field/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.17.0](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-10-17)
+
+### Bug Fixes
+
+- **form:** field 为 checkbox 时设置了 fieldNames 后控制器报错的问题 React does not recognize the `fieldNames` prop on a DOM element ([#8785](https://github.com/ant-design/pro-components/issues/8785)) ([2560090](https://github.com/ant-design/pro-components/commit/25600907e620549079f6aa8618e689258113dd41))
+- replace `lodash-es` imports with `lodash` in CJS builds ([#8754](https://github.com/ant-design/pro-components/issues/8754)) ([3ef9283](https://github.com/ant-design/pro-components/commit/3ef9283a4cf52b8106d049af49f41dc37bb448b1))
+
+### Features
+
+- added exports to support ESM environments such as vitest ([#8738](https://github.com/ant-design/pro-components/issues/8738)) ([71c4be9](https://github.com/ant-design/pro-components/commit/71c4be9c9ca5942154e0473e62be608d784d53fc))
+
 ## [2.16.2](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2024-09-12)
 
 **Note:** Version bump only for package @ant-design/pro-field