chore(merge): Merge master branch and fix conflicts

Author: dengfuping

docs/design/design-CHANGELOG.md

@@ -8,6 +8,12 @@ group: 基础组件
 
 ---
 
+## 0.4.15
+
+`2025-08-21`
+
+- 🐞 修复 Form.Item `action` 属性在 antd 5.27.0 版本下不生效的问题。[#1141](https://github.com/oceanbase/oceanbase-design/pull/1141)
+
 ## 0.4.14
 
 `2025-08-07`

docs/ui/ui-CHANGELOG.md

@@ -8,6 +8,14 @@ group: 业务组件
 
 ---
 
+## 0.4.18
+
+`2025-08-21`
+
+- DateRanger
+  - ⭐️ DateRanger 新增 `近 7 天` 的快捷选项。[#1142](https://github.com/oceanbase/oceanbase-design/pull/1142) [@wzc520pyfm](https://github.com/wzc520pyfm)
+  - 🐞 修复 DateRanger 在连续点击时面板会频繁开启、关闭的问题。[#1148](https://github.com/oceanbase/oceanbase-design/pull/1148) [@wzc520pyfm](https://github.com/wzc520pyfm)
+
 ## 0.4.17
 
 `2025-08-07`

package.json

@@ -45,8 +45,8 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@ant-design/icons": "^5.6.1",
-    "@babel/cli": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
+    "@babel/cli": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
     "@chenshuai2144/less2cssinjs": "^1.0.7",
     "@ctrl/tinycolor": "^4.1.0",
     "@emotion/babel-preset-css-prop": "^11.12.0",
@@ -57,7 +57,7 @@
     "@rc-component/trigger": "^3.5.2",
     "@stackblitz/sdk": "^1.11.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.6.4",
+    "@testing-library/jest-dom": "^6.7.0",
     "@testing-library/react": "^16.3.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.6.1",
@@ -67,7 +67,7 @@
     "@umijs/fabric": "^4.0.1",
     "@umijs/test": "^4.4.12",
     "@vercel/analytics": "^1.5.0",
-    "antd": "^5.26.7",
+    "antd": "^5.27.0",
     "antd-style": "^3.7.1",
     "antd-token-previewer": "^2.0.8",
     "babel-jest": "^30.0.5",

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/codemod",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "Codemod for OceanBase Design upgrade",
   "keywords": [
     "oceanbase",

packages/design/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/design",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "The Design System of OceanBase",
   "keywords": [
     "oceanbase",
@@ -46,16 +46,16 @@
     "@oceanbase/icons": "workspace:^",
     "@oceanbase/util": "workspace:^",
     "ahooks": "^2.10.14",
-    "antd": "^5.26.7",
+    "antd": "^5.27.0",
     "classnames": "^2.5.1",
     "lodash": "^4.17.21",
     "lottie-web": "^5.13.0",
     "prop-types": "^15.8.1",
     "rc-util": "^5.44.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
+    "@babel/cli": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
     "antd-token-previewer": "^2.0.8",
     "rc-select": "^14.16.8",
     "rc-slider": "^11.1.8",

packages/design/src/config-provider/__tests__/__snapshots__/form.test.tsx.snap

@@ -10,7 +10,7 @@ exports[`ConfigProvider form > ConfigProvider form.requiredMark should be \`opti
     type="text"
   />
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-vertical"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -82,7 +82,7 @@ exports[`ConfigProvider form > ConfigProvider form.requiredMark should be \`opti
     </div>
   </div>
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-vertical"
   >
     <div
       class="ant-row ant-form-item-row"

packages/design/src/form/FormItem.tsx

@@ -1,6 +1,7 @@
 import React, { useContext } from 'react';
 import type { ReactNode } from 'react';
 import { Form as AntForm } from 'antd';
+import { FormItemLayout } from 'antd/es/form/Form';
 import { FormContext } from 'antd/es/form/context';
 import type { FormItemProps as AntFormItemProps } from 'antd/es/form';
 import { isPlainObject } from 'lodash';
@@ -32,7 +33,7 @@ const FormItem: CompoundedComponent = ({
   label,
   tooltip,
   action,
-  layout,
+  layout: externalLayout,
   prefixCls: customizePrefixCls,
   className,
   ...restProps
@@ -43,7 +44,14 @@ const FormItem: CompoundedComponent = ({
   const { wrapSSR } = useStyle(prefixCls);
   const formItemCls = classNames(className);
 
-  const { vertical } = useContext(FormContext);
+  const {
+    layout: contextLayout,
+    // compatible with vertical for version < antd 27.0.0
+    // ref: https://github.com/ant-design/ant-design/pull/54611
+    // @ts-ignore
+    vertical,
+  } = useContext(FormContext);
+  const layout = externalLayout || (contextLayout as FormItemLayout);
 
   const typeList = useTooltipTypeList();
   // tooltip config
@@ -64,7 +72,7 @@ const FormItem: CompoundedComponent = ({
     <AntFormItem
       layout={layout}
       label={
-        action && (vertical || layout === 'vertical') ? (
+        action && (layout === 'vertical' || vertical) ? (
           <>
             {label}
             {action && <span className={`${prefixCls}-item-action`}>{action}</span>}

packages/design/src/form/__tests__/__snapshots__/index.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Form > Form hideRequiredMark should be priority over ConfigProvider for
   class="ant-form ant-form-horizontal ant-form-hide-required-mark"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -44,7 +44,7 @@ exports[`Form > Form hideRequiredMark should be priority over ConfigProvider for
     </div>
   </div>
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -89,7 +89,7 @@ exports[`Form > requiredMark could be changed 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -128,7 +128,7 @@ exports[`Form > requiredMark could be changed 1`] = `
     </div>
   </div>
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -173,7 +173,7 @@ exports[`Form > requiredMark could be changed by ConfigProvider 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -212,7 +212,7 @@ exports[`Form > requiredMark could be changed by ConfigProvider 1`] = `
     </div>
   </div>
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -257,7 +257,7 @@ exports[`Form > requiredMark should be optional by default 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -296,7 +296,7 @@ exports[`Form > requiredMark should be optional by default 1`] = `
     </div>
   </div>
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"

packages/design/src/form/__tests__/__snapshots__/item.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Form.Item > action should not work by default 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -56,7 +56,7 @@ exports[`Form.Item > action should not work for default layout 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -107,7 +107,7 @@ exports[`Form.Item > action should not work for horizontal layout 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -158,7 +158,7 @@ exports[`Form.Item > action should work for vertical layout 1`] = `
   class="ant-form ant-form-vertical"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-vertical"
   >
     <div
       class="ant-row ant-form-item-row"

packages/design/src/form/__tests__/__snapshots__/switch.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Form.Item with Switch > dynamic Switch 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -65,7 +65,7 @@ exports[`Form.Item with Switch > nested Switch 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -133,7 +133,7 @@ exports[`Form.Item with Switch > normal Switch 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -193,7 +193,7 @@ exports[`Form.Item with Switch > renderProps Switch 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"
@@ -236,7 +236,7 @@ exports[`Form.Item with Switch > sub component Switch 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-form-item"
+    class="ant-form-item ant-form-item-horizontal"
   >
     <div
       class="ant-row ant-form-item-row"