Merge branch 'ant-design:master' into master

Author: zwmmm

docs/changelog.en-US.md

@@ -1,3 +1,15 @@
+## @ant-design/pro-components@2.8.8
+
+`2025-06-10`
+
+- feat(form): extend the input argument of the render method in the read mode of select (#9059). [#9059](https://github.com/ant-design/pro-components/pull/#9059) [@rubbishmaker](https://github.com/rubbishmaker)
+- fix(form): 修复 StrictMode 模式下，BetaSchemaForm-ModalForm 渲染表单项失败的问题 (#9069). [#9069](https://github.com/ant-design/pro-components/pull/#9069) [@Lemonnnnnnnnnnn](https://github.com/Lemonnnnnnnnnnn)
+- fix(form): 修复 validateDebounce 属性不生效的问题 (#9072). [#9072](https://github.com/ant-design/pro-components/pull/#9072) [@Lemonnnnnnnnnnn](https://github.com/Lemonnnnnnnnnnn)
+- fix(form): 修复使用QueryFilter时报findDOMNode is deprecated的问题。 (#9065). [#9065](https://github.com/ant-design/pro-components/pull/#9065) [@Jarod-Xie](https://github.com/Jarod-Xie)
+- fix(form): 给 select readonly 模式下 render 方法提供组件内部计算好的 options (#9068). [#9068](https://github.com/ant-design/pro-components/pull/#9068) [@zwmmm](https://github.com/zwmmm)
+- fix(form): 使用useRef优化valuePair的处理逻辑，确保在边界值外的值更新更为准确 (#9058). [#9058](https://github.com/ant-design/pro-components/pull/#9058) [@Lemonnnnnnnnnnn](https://github.com/Lemonnnnnnnnnnn)
+- feat(table): 新增 filter 與 sort 受控方式 (#9060). [#9060](https://github.com/ant-design/pro-components/pull/#9060) [@leadingtw273](https://github.com/leadingtw273)
+
 ## @ant-design/pro-components@2.8.6
 
 `2025-02-17`

docs/changelog.md

@@ -1,3 +1,15 @@
+## @ant-design/pro-components@2.8.8
+
+`2025-06-10`
+
+- feat(form): extend the input argument of the render method in the read mode of select (#9059). [#9059](https://github.com/ant-design/pro-components/pull/#9059) [@rubbishmaker](https://github.com/rubbishmaker)
+- fix(form): 修复 StrictMode 模式下，BetaSchemaForm-ModalForm 渲染表单项失败的问题 (#9069). [#9069](https://github.com/ant-design/pro-components/pull/#9069) [@Lemonnnnnnnnnnn](https://github.com/Lemonnnnnnnnnnn)
+- fix(form): 修复 validateDebounce 属性不生效的问题 (#9072). [#9072](https://github.com/ant-design/pro-components/pull/#9072) [@Lemonnnnnnnnnnn](https://github.com/Lemonnnnnnnnnnn)
+- fix(form): 修复使用QueryFilter时报findDOMNode is deprecated的问题。 (#9065). [#9065](https://github.com/ant-design/pro-components/pull/#9065) [@Jarod-Xie](https://github.com/Jarod-Xie)
+- fix(form): 给 select readonly 模式下 render 方法提供组件内部计算好的 options (#9068). [#9068](https://github.com/ant-design/pro-components/pull/#9068) [@zwmmm](https://github.com/zwmmm)
+- fix(form): 使用useRef优化valuePair的处理逻辑，确保在边界值外的值更新更为准确 (#9058). [#9058](https://github.com/ant-design/pro-components/pull/#9058) [@Lemonnnnnnnnnnn](https://github.com/Lemonnnnnnnnnnn)
+- feat(table): 新增 filter 與 sort 受控方式 (#9060). [#9060](https://github.com/ant-design/pro-components/pull/#9060) [@leadingtw273](https://github.com/leadingtw273)
+
 ## @ant-design/pro-components@2.8.6
 
 `2025-02-17`

package.json

@@ -51,14 +51,14 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/cssinjs": "^1.23.0",
     "@ant-design/icons": "^5.6.1",
-    "@babel/core": "^7.26.10",
-    "@babel/eslint-plugin": "^7.27.0",
-    "@babel/parser": "^7.27.0",
+    "@babel/core": "^7.27.4",
+    "@babel/eslint-plugin": "^7.27.1",
+    "@babel/parser": "^7.27.5",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/preset-env": "^7.26.9",
-    "@babel/preset-react": "^7.26.3",
-    "@babel/preset-typescript": "^7.27.0",
-    "@babel/traverse": "^7.27.0",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-react": "^7.27.1",
+    "@babel/preset-typescript": "^7.27.1",
+    "@babel/traverse": "^7.27.4",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/cache": "^11.14.0",
     "@emotion/css": "^11.13.5",
@@ -68,19 +68,19 @@
     "@octokit/rest": "^18.12.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^16.3.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.6.1",
     "@types/chroma-js": "^2.4.5",
     "@types/glob": "^8.1.0",
     "@types/history": "^4.7.11",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.16",
+    "@types/lodash": "^4.17.17",
     "@types/lodash-es": "^4.17.12",
     "@types/mockjs": "^1.0.10",
     "@types/node": "^14.18.63",
-    "@types/react": "^18.3.20",
-    "@types/react-dom": "^18.3.5",
+    "@types/react": "^18.3.23",
+    "@types/react-dom": "^18.3.7",
     "@types/react-helmet": "^6.1.11",
     "@types/react-responsive": "^8.0.8",
     "@types/shallowequal": "^1.1.5",
@@ -91,10 +91,10 @@
     "@umijs/plugin-analytics": "^0.2.4",
     "@umijs/test": "^3.5.43",
     "@umijs/test-utils": "^3.5.43",
-    "@umijs/utils": "^4.4.6",
+    "@umijs/utils": "^4.4.11",
     "@vitest/coverage-istanbul": "^2.1.9",
     "animated-scroll-to": "^2.3.2",
-    "antd": "^5.24.5",
+    "antd": "^5.25.4",
     "antd-style": "^3.7.1",
     "babel-loader": "^9.2.1",
     "babel-types": "^6.26.0",
@@ -104,44 +104,44 @@
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.13",
-    "dumi": "~2.4.18",
+    "dumi": "~2.4.21",
     "dumi-theme-antd-style": "~0.31.1",
     "esbuild": "^0.15.18",
     "eslint": "^8.57.1",
     "eslint-plugin-jest": "^27.9.0",
-    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-unicorn": "^47.0.0",
     "execa": "^5.1.1",
     "express": "^4.21.2",
     "fast-deep-equal": "^3.1.3",
-    "father": "^4.5.3",
+    "father": "^4.5.6",
     "gh-pages": "^5.0.0",
     "glob": "^8.1.0",
     "identity-obj-proxy": "^3.0.0",
     "inquirer": "^8.2.6",
     "jest-canvas-mock": "^2.5.2",
     "jest-fetch-mock": "^3.0.3",
-    "jsdom": "^26.0.0",
+    "jsdom": "^26.1.0",
     "lerna": "^3.22.1",
     "lint-staged": "^10.5.4",
     "lodash-es": "^4.17.21",
     "mockdate": "^3.0.5",
     "mockjs": "^1.1.0",
     "np": "^6.5.0",
     "nprogress": "^0.2.0",
-    "octokit": "^3.2.1",
+    "octokit": "^3.2.2",
     "polished": "^4.3.1",
     "prettier": "^3.5.3",
     "prettier-plugin-organize-imports": "^3.2.4",
-    "prettier-plugin-packagejson": "^2.5.10",
+    "prettier-plugin-packagejson": "^2.5.15",
     "pretty-quick": "^3.3.1",
     "query-string": "^6.14.1",
     "rc-field-form": "^2.7.0",
     "rc-footer": "^0.6.8",
     "rc-resize-observer": "^1.4.3",
     "rc-steps": "^6.0.1",
-    "rc-table": "^7.50.4",
+    "rc-table": "^7.51.0",
     "rc-util": "^5.44.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -159,16 +159,16 @@
     "stylelint": "^13.13.1",
     "timezone-mock": "^1.3.6",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.2",
-    "umi": "^4.4.6",
+    "typescript": "^5.8.3",
+    "umi": "^4.4.11",
     "umi-request": "^1.4.0",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "vitest": "^2.1.9",
     "write-pkg": "^4.0.0",
     "xhr-mock": "^2.5.1",
     "yorkie": "^2.0.0",
-    "zustand": "^4.5.6"
+    "zustand": "^4.5.7"
   },
   "gitHooks": {
     "pre-commit": "pretty-quick --staged",

packages/card/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.9](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2025-06-10)
+
+**Note:** Version bump only for package @ant-design/pro-card
+
+## [2.9.8](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2025-06-10)
+
+**Note:** Version bump only for package @ant-design/pro-card
+
 ## [2.9.7](https://github.com/ant-design/pro-components/compare/@ant-design/[email protected]...@ant-design/[email protected]) (2025-03-31)
 
 ### Bug Fixes

packages/card/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-card",
-  "version": "2.9.7",
+  "version": "2.9.9",
   "description": "@ant-design/pro-card",
   "keywords": [
     "antd",
@@ -36,8 +36,8 @@
   "dependencies": {
     "@ant-design/cssinjs": "^1.21.1",
     "@ant-design/icons": "^5.0.0",
-    "@ant-design/pro-provider": "2.15.4",
-    "@ant-design/pro-utils": "2.17.0",
+    "@ant-design/pro-provider": "2.16.1",
+    "@ant-design/pro-utils": "2.17.2",
     "@babel/runtime": "^7.18.0",
     "classnames": "^2.3.2",
     "rc-resize-observer": "^1.0.0",

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

@@ -51,8 +51,8 @@ const Card = React.forwardRef((props: CardProps, ref: any) => {
     type,
     ...rest
   } = props;
-  const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
-
+  const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);  
+  
   const screens = useBreakpoint() || {
     lg: true,
     md: true,
@@ -228,6 +228,9 @@ const Card = React.forwardRef((props: CardProps, ref: any) => {
       collapsibleIconRender({ collapsed })
     ) : (
       <RightOutlined
+      onClick={()=>{
+            if (collapsible === 'icon') setCollapsed(!collapsed);
+      }}
         rotate={!collapsed ? 90 : undefined}
         className={`${prefixCls}-collapsible-icon ${hashId}`.trim()}
       />
@@ -252,10 +255,10 @@ const Card = React.forwardRef((props: CardProps, ref: any) => {
           })}
           style={headStyle}
           onClick={() => {
-            if (collapsibleButton) setCollapsed(!collapsed);
+            if (collapsible === 'header' || collapsible === true) setCollapsed(!collapsed);
           }}
         >
-          <div className={`${prefixCls}-title ${hashId}`.trim()}>
+          <div className={`${prefixCls}-title ${hashId}`.trim()} >
             {collapsibleButton}
             <LabelIconTip label={title} tooltip={tooltip} subTitle={subTitle} />
           </div>

packages/card/src/components/card.en-US.md

@@ -86,7 +86,7 @@ When adding a divider it automatically increases the height of the header to sep
 
 ### Collapsible
 
-- You can use `collapsible` to configure whether the card is collapsible or not, and configure whether the card is collapsed by default through the `defaultCollapsed` property.
+- You can use `collapsible` to configure whether the card is collapsible or not,or to specify the area that triggers the collapse. and configure whether the card is collapsed by default through the `defaultCollapsed` property.
 - Or you can customize it by controlling the `collapsed` property.
 
 <code src="../demos/collapsible.tsx" background="var(--main-bg-color)" oldtitle="collapsible"></code>
@@ -179,7 +179,7 @@ The `Steps` component is combined with the `ProCard` component to complete the v
 | ghost | Ghost mode, that is, whether to cancel the padding of the card content area and the background color of the card. | `boolean` | false |  |
 | headerBordered | Whether the header has a dividing line | `boolean` | false |  |
 | collapsed | Controlled property, whether to collapse | `boolean` | false |  |
-| collapsible | Whether the configuration is collapsible, invalid when controlled | `boolean` | false |  |
+| collapsible | Whether the configuration is collapsible or specifies the trigger area for collapsing | `icon \| header \| boolean`, when the value is `true`, the default trigger area is `header` | false |
 | collapsibleIconRender | Replaces default collapsed icon | `({ collapsed }: { collapsed: boolean }) => React.ReactNode` | - |  |
 | defaultCollapsed | Default collapsing, invalid when controlled | `boolean` | false |  |
 | onCollapse | Collapsed card event, invalid when controlled | `(collapsed: boolean) => void` | - |  |

packages/card/src/components/card.md

@@ -72,7 +72,7 @@ atomId: ProCard
 
 ### 可折叠
 
-- 你可以使用 `collapsible` 来配置卡片是否可折叠，通过 `defaultCollapsed` 属性配置是否默认折叠。
+- 你可以使用 `collapsible` 来配置卡片是否可折叠或者指定触发折叠的区域，通过 `defaultCollapsed` 属性配置是否默认折叠。
 - 或者你可以通过 `collapsed` 属性受控进行自定义。
 
 <code src="../demos/collapsible.tsx" background="var(--main-bg-color)" ></code>
@@ -163,7 +163,7 @@ atomId: ProCard
 | ghost | 幽灵模式，即是否取消卡片内容区域的 padding 和 卡片的背景颜色。 | `boolean` | false |  |
 | headerBordered | 页头是否有分割线 | `boolean` | false |  |
 | collapsed | 受控属性，是否折叠 | `boolean` | false |  |
-| collapsible | 配置是否可折叠，受控时无效 | `boolean` | false |  |
+| collapsible | 配置是否可折叠或者指定可折叠触发的区域 | `icon \| header \| boolean`,当值为`true`时默认触发区域为`header` | false |  |
 | collapsibleIconRender | 替换默认折叠图标 | `({ collapsed }: { collapsed: boolean }) => React.ReactNode` | - |  |
 | defaultCollapsed | 默认折叠，受控时无效 | `boolean` | false |  |
 | onCollapse | 收起卡片的事件，受控时无效 | `(collapsed: boolean) => void` | - |  |

packages/card/src/demos/collapsible.tsx

@@ -34,6 +34,25 @@ export default () => {
       >
         Content
       </ProCard>
+      <ProCard
+        title="Collapsible"
+        headerBordered
+        collapsible="icon"
+        defaultCollapsed
+        onCollapse={(collapse) => console.log(collapse)}
+        extra={
+          <Button
+            size="small"
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+          >
+            Submit
+          </Button>
+        }
+      >
+        Content
+      </ProCard>
       <ProCard
         title="Collapsible"
         bordered

packages/card/src/typing.ts

@@ -5,7 +5,7 @@ import type { ReactNode } from 'react';
 export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs';
 export type Gutter = number | Partial<Record<Breakpoint, number>>;
 export type ColSpanType = number | string;
-
+type CollapsibleType = 'icon' | 'header' | boolean;
 type CardPropsBase = {
   /** 标题样式 */
   headStyle?: React.CSSProperties;
@@ -53,7 +53,7 @@ type CardPropsBase = {
   /** 幽灵模式，即是否取消卡片内容区域的 padding 和 背景颜色。 */
   ghost?: boolean;
   /** 是否可折叠 */
-  collapsible?: boolean;
+  collapsible?: CollapsibleType;
   /** 受控 collapsed 属性 */
   collapsed?: boolean;
   /** 折叠按钮自定义节点 */