@oceanbase/design 0.4.4 → 0.4.6

package/es/theme/style/compact.less

@@ -312,9 +312,9 @@
 @colorFillSecondary: #e2e8f3;
 @colorFillTertiary: #f3f6fc;
 @colorFillQuaternary: #f8fafe;
-@colorBgSolid: rgb(0, 0, 0);
-@colorBgSolidHover: rgba(0, 0, 0, 0.75);
-@colorBgSolidActive: rgba(0, 0, 0, 0.95);
+@colorBgSolid: rgb(0,0,0);
+@colorBgSolidHover: rgba(0,0,0,0.75);
+@colorBgSolidActive: rgba(0,0,0,0.95);
 @colorBgLayout: #f3f6fc;
 @colorBgContainer: #ffffff;
 @colorBgElevated: #ffffff;
@@ -420,7 +420,7 @@
 @colorFillAlter: #f8fafe;
 @colorBgContainerDisabled: #f3f6fc;
 @colorBorderBg: #ffffff;
-@colorSplit: rgba(13, 63, 155, 0.12);
+@colorSplit: rgba(13,63,155,0.12);
 @colorTextPlaceholder: #c1cbe0;
 @colorTextDisabled: #c1cbe0;
 @colorTextHeading: #132039;
@@ -432,8 +432,8 @@
 @colorBgTextActive: #cdd5e4;
 @colorIcon: #8592ad;
 @colorIconHover: #132039;
-@colorErrorOutline: rgba(255, 5, 5, 0.08);
-@colorWarningOutline: rgba(255, 164, 19, 0.11);
+@colorErrorOutline: rgba(255,5,5,0.08);
+@colorWarningOutline: rgba(255,164,19,0.11);
 @fontSizeIcon: 10;
 @controlOutlineWidth: 2;
 @controlInteractiveSize: 14;
@@ -442,7 +442,7 @@
 @controlItemBgActiveHover: #eaf1ff;
 @controlItemBgActiveDisabled: #cdd5e4;
 @controlTmpOutline: #f8fafe;
-@controlOutline: rgba(22, 99, 255, 0.09);
+@controlOutline: rgba(22,99,255,0.09);
 @fontWeightStrong: 600;
 @opacityLoading: 0.65;
 @linkDecoration: none;
@@ -495,9 +495,9 @@
 @screenXXLMin: 1600;
 @boxShadowPopoverArrow: 2px 2px 5px rgba(0, 0, 0, 0.05);
 @boxShadowCard: 
-      0 1px 2px -2px rgba(0, 0, 0, 0.16),
-      0 3px 6px 0 rgba(0, 0, 0, 0.12),
-      0 5px 12px 4px rgba(0, 0, 0, 0.09)
+      0 1px 2px -2px rgba(0,0,0,0.16),
+      0 3px 6px 0 rgba(0,0,0,0.12),
+      0 5px 12px 4px rgba(0,0,0,0.09)
     ;
 @boxShadowDrawerRight: 
       -6px 0 16px 0 rgba(0, 0, 0, 0.08),

package/es/theme/style/dark.less

@@ -304,22 +304,22 @@
 @lime9: #e4f88b;
 @lime-10: #f0fab5;
 @lime10: #f0fab5;
-@colorText: rgba(255, 255, 255, 0.85);
-@colorTextSecondary: rgba(255, 255, 255, 0.65);
-@colorTextTertiary: rgba(255, 255, 255, 0.45);
-@colorTextQuaternary: rgba(255, 255, 255, 0.25);
-@colorFill: rgba(255, 255, 255, 0.18);
-@colorFillSecondary: rgba(255, 255, 255, 0.12);
-@colorFillTertiary: rgba(255, 255, 255, 0.08);
-@colorFillQuaternary: rgba(255, 255, 255, 0.04);
-@colorBgSolid: rgba(255, 255, 255, 0.95);
-@colorBgSolidHover: rgb(255, 255, 255);
-@colorBgSolidActive: rgba(255, 255, 255, 0.9);
+@colorText: rgba(255,255,255,0.85);
+@colorTextSecondary: rgba(255,255,255,0.65);
+@colorTextTertiary: rgba(255,255,255,0.45);
+@colorTextQuaternary: rgba(255,255,255,0.25);
+@colorFill: rgba(255,255,255,0.18);
+@colorFillSecondary: rgba(255,255,255,0.12);
+@colorFillTertiary: rgba(255,255,255,0.08);
+@colorFillQuaternary: rgba(255,255,255,0.04);
+@colorBgSolid: rgba(255,255,255,0.95);
+@colorBgSolidHover: rgb(255,255,255);
+@colorBgSolidActive: rgba(255,255,255,0.9);
 @colorBgLayout: #000000;
 @colorBgContainer: #141414;
 @colorBgElevated: #1f1f1f;
 @colorBgSpotlight: #424242;
-@colorBgBlur: rgba(255, 255, 255, 0.04);
+@colorBgBlur: rgba(255,255,255,0.04);
 @colorBorder: #424242;
 @colorBorderSecondary: #303030;
 @colorPrimaryBg: #111a2c;
@@ -371,7 +371,7 @@
 @colorInfoTextActive: #074cad;
 @colorLinkHover: #0b3b7e;
 @colorLinkActive: #074cad;
-@colorBgMask: rgba(0, 0, 0, 0.45);
+@colorBgMask: rgba(0,0,0,0.45);
 @colorWhite: #fff;
 @fontSizeSM: 12;
 @fontSizeLG: 16;
@@ -412,35 +412,35 @@
 @borderRadiusSM: 4;
 @borderRadiusLG: 8;
 @borderRadiusOuter: 4;
-@colorFillContent: rgba(255, 255, 255, 0.12);
-@colorFillContentHover: rgba(255, 255, 255, 0.18);
-@colorFillAlter: rgba(255, 255, 255, 0.04);
-@colorBgContainerDisabled: rgba(255, 255, 255, 0.08);
+@colorFillContent: rgba(255,255,255,0.12);
+@colorFillContentHover: rgba(255,255,255,0.18);
+@colorFillAlter: rgba(255,255,255,0.04);
+@colorBgContainerDisabled: rgba(255,255,255,0.08);
 @colorBorderBg: #141414;
-@colorSplit: rgba(253, 253, 253, 0.12);
-@colorTextPlaceholder: rgba(255, 255, 255, 0.25);
-@colorTextDisabled: rgba(255, 255, 255, 0.25);
-@colorTextHeading: rgba(255, 255, 255, 0.85);
-@colorTextLabel: rgba(255, 255, 255, 0.65);
-@colorTextDescription: rgba(255, 255, 255, 0.45);
+@colorSplit: rgba(253,253,253,0.12);
+@colorTextPlaceholder: rgba(255,255,255,0.25);
+@colorTextDisabled: rgba(255,255,255,0.25);
+@colorTextHeading: rgba(255,255,255,0.85);
+@colorTextLabel: rgba(255,255,255,0.65);
+@colorTextDescription: rgba(255,255,255,0.45);
 @colorTextLightSolid: #fff;
 @colorHighlight: #d73333;
-@colorBgTextHover: rgba(255, 255, 255, 0.12);
-@colorBgTextActive: rgba(255, 255, 255, 0.18);
-@colorIcon: rgba(255, 255, 255, 0.45);
-@colorIconHover: rgba(255, 255, 255, 0.85);
-@colorErrorOutline: rgba(250, 20, 40, 0.1);
-@colorWarningOutline: rgba(180, 93, 0, 0.15);
+@colorBgTextHover: rgba(255,255,255,0.12);
+@colorBgTextActive: rgba(255,255,255,0.18);
+@colorIcon: rgba(255,255,255,0.45);
+@colorIconHover: rgba(255,255,255,0.85);
+@colorErrorOutline: rgba(250,20,40,0.1);
+@colorWarningOutline: rgba(180,93,0,0.15);
 @fontSizeIcon: 12;
 @lineWidthFocus: 3;
 @controlOutlineWidth: 2;
 @controlInteractiveSize: 16;
-@controlItemBgHover: rgba(255, 255, 255, 0.08);
+@controlItemBgHover: rgba(255,255,255,0.08);
 @controlItemBgActive: #111a2c;
 @controlItemBgActiveHover: #0f2445;
-@controlItemBgActiveDisabled: rgba(255, 255, 255, 0.18);
-@controlTmpOutline: rgba(255, 255, 255, 0.04);
-@controlOutline: rgba(0, 60, 180, 0.15);
+@controlItemBgActiveDisabled: rgba(255,255,255,0.18);
+@controlTmpOutline: rgba(255,255,255,0.04);
+@controlOutline: rgba(0,60,180,0.15);
 @fontWeightStrong: 600;
 @opacityLoading: 0.65;
 @linkDecoration: none;
@@ -503,9 +503,9 @@
 @screenXXLMin: 1600;
 @boxShadowPopoverArrow: 2px 2px 5px rgba(0, 0, 0, 0.05);
 @boxShadowCard: 
-      0 1px 2px -2px rgba(0, 0, 0, 0.16),
-      0 3px 6px 0 rgba(0, 0, 0, 0.12),
-      0 5px 12px 4px rgba(0, 0, 0, 0.09)
+      0 1px 2px -2px rgba(0,0,0,0.16),
+      0 3px 6px 0 rgba(0,0,0,0.12),
+      0 5px 12px 4px rgba(0,0,0,0.09)
     ;
 @boxShadowDrawerRight: 
       -6px 0 16px 0 rgba(0, 0, 0, 0.08),

package/es/theme/style/default.less

@@ -312,9 +312,9 @@
 @colorFillSecondary: #e2e8f3;
 @colorFillTertiary: #f3f6fc;
 @colorFillQuaternary: #f8fafe;
-@colorBgSolid: rgb(0, 0, 0);
-@colorBgSolidHover: rgba(0, 0, 0, 0.75);
-@colorBgSolidActive: rgba(0, 0, 0, 0.95);
+@colorBgSolid: rgb(0,0,0);
+@colorBgSolidHover: rgba(0,0,0,0.75);
+@colorBgSolidActive: rgba(0,0,0,0.95);
 @colorBgLayout: #f3f6fc;
 @colorBgContainer: #ffffff;
 @colorBgElevated: #ffffff;
@@ -420,7 +420,7 @@
 @colorFillAlter: #f8fafe;
 @colorBgContainerDisabled: #f3f6fc;
 @colorBorderBg: #ffffff;
-@colorSplit: rgba(13, 63, 155, 0.12);
+@colorSplit: rgba(13,63,155,0.12);
 @colorTextPlaceholder: #c1cbe0;
 @colorTextDisabled: #c1cbe0;
 @colorTextHeading: #132039;
@@ -432,8 +432,8 @@
 @colorBgTextActive: #cdd5e4;
 @colorIcon: #8592ad;
 @colorIconHover: #132039;
-@colorErrorOutline: rgba(255, 5, 5, 0.08);
-@colorWarningOutline: rgba(255, 164, 19, 0.11);
+@colorErrorOutline: rgba(255,5,5,0.08);
+@colorWarningOutline: rgba(255,164,19,0.11);
 @fontSizeIcon: 12;
 @controlOutlineWidth: 2;
 @controlInteractiveSize: 16;
@@ -442,7 +442,7 @@
 @controlItemBgActiveHover: #eaf1ff;
 @controlItemBgActiveDisabled: #cdd5e4;
 @controlTmpOutline: #f8fafe;
-@controlOutline: rgba(22, 99, 255, 0.09);
+@controlOutline: rgba(22,99,255,0.09);
 @fontWeightStrong: 600;
 @opacityLoading: 0.65;
 @linkDecoration: none;
@@ -495,9 +495,9 @@
 @screenXXLMin: 1600;
 @boxShadowPopoverArrow: 2px 2px 5px rgba(0, 0, 0, 0.05);
 @boxShadowCard: 
-      0 1px 2px -2px rgba(0, 0, 0, 0.16),
-      0 3px 6px 0 rgba(0, 0, 0, 0.12),
-      0 5px 12px 4px rgba(0, 0, 0, 0.09)
+      0 1px 2px -2px rgba(0,0,0,0.16),
+      0 3px 6px 0 rgba(0,0,0,0.12),
+      0 5px 12px 4px rgba(0,0,0,0.09)
     ;
 @boxShadowDrawerRight: 
       -6px 0 16px 0 rgba(0, 0, 0, 0.08),

package/lib/card/index.d.ts

@@ -12,5 +12,6 @@ export interface CardProps extends AntCardProps {
 declare const _default: React.ForwardRefExoticComponent<CardProps & React.RefAttributes<HTMLDivElement>> & {
     Grid: React.FC<import("antd/es/card").CardGridProps>;
     Meta: React.FC<import("antd/es/card").CardMetaProps>;
+    genTableStyle: (padding: number, token: Partial<import("./style").CardToken>) => import("@ant-design/cssinjs").CSSObject;
 };
 export default _default;

package/lib/card/index.js

@@ -45,8 +45,9 @@ var Card = import_react.default.forwardRef(
   ({
     children,
     size,
-    divided = true,
+    title,
     tabList,
+    divided: outerDivided,
     prefixCls: customizePrefixCls,
     bodyStyle,
     styles,
@@ -54,7 +55,8 @@ var Card = import_react.default.forwardRef(
     ...restProps
   }, ref) => {
     var _a;
-    const { getPrefixCls } = (0, import_react.useContext)(import_config_provider.default.ConfigContext);
+    const { getPrefixCls, card: contextCard } = (0, import_react.useContext)(import_config_provider.default.ConfigContext);
+    const divided = outerDivided ?? (contextCard == null ? void 0 : contextCard.divided) ?? true;
     const prefixCls = getPrefixCls("card", customizePrefixCls);
     const tabsPrefixCls = getPrefixCls("tabs", customizePrefixCls);
     const { wrapSSR } = (0, import_style.default)(prefixCls, tabsPrefixCls);
@@ -62,6 +64,7 @@ var Card = import_react.default.forwardRef(
     const noBodyPadding = zeroPaddingList.includes(bodyStyle == null ? void 0 : bodyStyle.padding) || zeroPaddingList.includes((_a = styles == null ? void 0 : styles.body) == null ? void 0 : _a.padding);
     const cardCls = (0, import_classnames.default)(
       {
+        [`${prefixCls}-has-title`]: !!title,
         [`${prefixCls}-no-divider`]: !divided,
         [`${prefixCls}-no-body-padding`]: noBodyPadding
       },
@@ -82,6 +85,7 @@ var Card = import_react.default.forwardRef(
         {
           ref,
           size,
+          title,
           tabList: newTabList,
           prefixCls: customizePrefixCls,
           bodyStyle,
@@ -99,7 +103,8 @@ if (process.env.NODE_ENV !== "production") {
 }
 var card_default = Object.assign(Card, {
   Grid: import_antd.Card.Grid,
-  Meta: import_antd.Card.Meta
+  Meta: import_antd.Card.Meta,
+  genTableStyle: import_style.genTableStyle
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/card/style/index.d.ts

@@ -5,7 +5,7 @@ export type CardToken = FullToken<'Card'> & {
     tabsComponentCls: string;
     tabsPrefixCls: string;
 };
-export declare const genTableStyle: (padding: number, token: CardToken) => CSSObject;
+export declare const genTableStyle: (padding: number, token: Partial<CardToken>) => CSSObject;
 export declare const genCardStyle: GenerateStyle<CardToken>;
 declare const _default: (prefixCls: string, tabsPrefixCls: string) => {
     wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;

package/lib/card/style/index.js

@@ -27,7 +27,7 @@ module.exports = __toCommonJS(style_exports);
 var import_style = require("../../tabs/style");
 var import_genComponentStyleHook = require("../../_util/genComponentStyleHook");
 var genTableStyle = (padding, token) => {
-  const { antCls } = token;
+  const { componentCls, antCls } = token;
   const tableComponentCls = `${antCls}-table`;
   return {
     [`${tableComponentCls}-wrapper`]: {
@@ -51,11 +51,18 @@ var genTableStyle = (padding, token) => {
           marginRight: padding
         }
       }
+    },
+    [`&${componentCls}-has-title${componentCls}-no-divider:not(${componentCls}-contain-tabs)`]: {
+      [`${componentCls}-body`]: {
+        [`& > ${tableComponentCls}-wrapper ${tableComponentCls}:not(${tableComponentCls}-bordered):first-child`]: {
+          marginTop: -token.marginSM
+        }
+      }
     }
   };
 };
 var genCardStyle = (token) => {
-  const { componentCls, tabsComponentCls, tabsPrefixCls, padding, paddingSM, paddingLG } = token;
+  const { componentCls, tabsComponentCls, tabsPrefixCls, paddingSM, paddingLG } = token;
   return {
     [`${componentCls}`]: {
       // nested Card style
@@ -65,7 +72,8 @@ var genCardStyle = (token) => {
     },
     [`${componentCls}${componentCls}-no-divider`]: {
       [`${componentCls}-head`]: {
-        borderBottom: "none"
+        // should not remove border-bottom to avoid tabs inkbar display correctly
+        borderBottomColor: "transparent"
       }
     },
     [`${componentCls}${componentCls}-no-divider:not(${componentCls}-contain-tabs)`]: {
@@ -84,7 +92,7 @@ var genCardStyle = (token) => {
       }
     },
     [`${componentCls}${componentCls}-contain-tabs`]: {
-      [`${componentCls}-head`]: (0, import_style.genTagStyle)({
+      [`${componentCls}-head`]: (0, import_style.genTabsStyle)({
         ...token,
         componentCls: tabsComponentCls,
         prefixCls: tabsPrefixCls

package/lib/config-provider/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ConfigProvider as AntConfigProvider } from 'antd';
 import type { ConfigProviderProps as AntConfigProviderProps, ConfigConsumerProps as AntConfigConsumerProps, ThemeConfig as AntThemeConfig } from 'antd/es/config-provider';
-import type { ComponentStyleConfig } from 'antd/es/config-provider/context';
+import type { ComponentStyleConfig, CardConfig as AntCardConfig } from 'antd/es/config-provider/context';
 import type { AppProps } from 'antd/es/app';
 import type { PaginationConfig } from 'antd/es/pagination';
 import type { SpinIndicator } from 'antd/es/spin';
@@ -17,6 +17,9 @@ export interface ThemeConfig extends AntThemeConfig {
     isDark?: boolean;
     isAliyun?: boolean;
 }
+export type CardConfig = AntCardConfig & {
+    divided?: boolean;
+};
 export type SpinConfig = ComponentStyleConfig & {
     indicator?: SpinIndicator;
 };
@@ -27,6 +30,7 @@ export interface ConfigConsumerProps extends AntConfigConsumerProps {
     theme?: ThemeConfig;
     navigate?: NavigateFunction;
     hideOnSinglePage?: boolean;
+    card?: CardConfig;
     spin?: SpinConfig;
     table?: TableConfig;
     builtInApp?: boolean;
@@ -37,6 +41,7 @@ export interface ConfigProviderProps extends AntConfigProviderProps {
     locale?: Locale;
     navigate?: NavigateFunction;
     hideOnSinglePage?: boolean;
+    card?: CardConfig;
     pagination?: PaginationConfig;
     spin?: SpinConfig;
     table?: TableConfig;

package/lib/config-provider/index.js

@@ -60,6 +60,7 @@ var ConfigProvider = ({
   locale,
   navigate,
   hideOnSinglePage,
+  card,
   collapse,
   form,
   spin,
@@ -91,6 +92,7 @@ var ConfigProvider = ({
     import_antd.ConfigProvider,
     {
       locale: mergedLocale,
+      card: (0, import_lodash.merge)({}, parentContext.card, card),
       collapse: (0, import_lodash.merge)(
         {},
         {

package/lib/descriptions/hooks/useItems.d.ts

@@ -15,6 +15,14 @@ export default function useItems(items?: DescriptionsItemType[], children?: Reac
     label?: React.ReactNode;
     className?: string;
     key?: React.Key;
+    classNames?: {
+        label?: string;
+        content?: string;
+    };
+    styles?: {
+        label?: React.CSSProperties;
+        content?: React.CSSProperties;
+    };
     labelStyle?: React.CSSProperties;
     contentStyle?: React.CSSProperties;
 }[];

package/lib/radio/index.d.ts

@@ -2,7 +2,7 @@ import type { RadioProps as AntRadioProps, RadioRef } from 'antd/es/radio';
 import React from 'react';
 export * from 'antd/es/radio';
 declare const Radio: React.ForwardRefExoticComponent<AntRadioProps & React.RefAttributes<RadioRef>> & {
-    Group: React.MemoExoticComponent<React.ForwardRefExoticComponent<import("antd").RadioGroupProps & React.RefAttributes<HTMLDivElement>>>;
+    Group: React.NamedExoticComponent<import("antd").RadioGroupProps & React.RefAttributes<HTMLDivElement>>;
     Button: React.ForwardRefExoticComponent<import("antd/es/radio/radioButton").RadioButtonProps & React.RefAttributes<RadioRef>>;
 };
 export default Radio;

package/lib/table/index.js

@@ -53,6 +53,7 @@ function Table(props, ref) {
     footer,
     pagination: customPagination,
     rowSelection,
+    rowClassName,
     toolAlertRender,
     toolOptionsRender,
     toolSelectedContent,
@@ -183,6 +184,14 @@ function Table(props, ref) {
           emptyText: /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-empty-wrapper` }, typeof emptyText === "function" ? emptyText() : emptyText)
         },
         columns: newColumns,
+        rowClassName: (...args) => {
+          return (0, import_classnames.default)(
+            typeof rowClassName === "function" ? rowClassName(...args) : rowClassName,
+            {
+              [`${prefixCls}-expand-row-by-click`]: expandable == null ? void 0 : expandable.expandRowByClick
+            }
+          );
+        },
         expandable: expandable ? {
           columnWidth: 32,
           ...expandable

package/lib/table/style/index.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { CSSObject } from '@ant-design/cssinjs';
+import type { FullToken } from 'antd/es/theme/internal';
 export type TableToken = FullToken<'Table'>;
-export declare const genTableStyle: GenerateStyle<TableToken>;
+export declare const genTableStyle: (token: TableToken) => CSSObject;
 declare const _default: (prefixCls: string) => {
     wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;

package/lib/table/style/index.js

@@ -50,19 +50,6 @@ var genTableStyle = (token) => {
         borderBottom: `1px solid ${colorBorderSecondary}`,
         borderRadius: 0
       },
-      // 单元格通用样式
-      [`${componentCls}-thead, ${componentCls}-tbody`]: {
-        ["td, th"]: {
-          [`&${componentCls}-row-expand-icon-cell`]: {
-            backgroundColor: colorBgBase,
-            padding: `${token.paddingSM}px ${token.paddingXS}px`
-          },
-          // 内容第一列，左侧间距减小为 8px
-          [`&:not(:first-child):not(${componentCls}-selection-column):not(${componentCls}-row-expand-icon-cell)`]: {
-            paddingLeft: token.paddingXS
-          }
-        }
-      },
       // head 样式
       [`${componentCls}-thead > tr`]: {
         ["th"]: {
@@ -99,6 +86,10 @@ var genTableStyle = (token) => {
         [`${componentCls}-tbody-virtual-scrollbar ${componentCls}-tbody-virtual-scrollbar-thumb`]: {
           background: `${token.colorFillSecondary} !important`
         },
+        // expandRowByClick 行样式
+        [`tr${componentCls}-expand-row-by-click`]: {
+          cursor: "pointer"
+        },
         // 去掉可展开行在展开时的底部 border
         [`tr > td:has(${componentCls}-row-expand-icon-expanded)`]: {
           borderBottom: "none",
@@ -162,26 +153,48 @@ var genTableStyle = (token) => {
         borderRadius: `0px 0px ${token.borderRadiusLG}px ${token.borderRadiusLG}px`
       }
     },
-    // 带边框但不带 footer 的表格样式
-    [`${componentCls}-wrapper:not(${componentCls}-has-footer) ${componentCls}${componentCls}-bordered`]: {
-      // 表格容器设置圆角
-      [`${componentCls}-container`]: {
-        borderRadius: token.borderRadiusLG
-      },
-      [`${componentCls}-tbody`]: {
-        // 最后一行左右单元格增加圆角
-        [`tr:last-child >*:first-child`]: {
-          borderEndStartRadius: token.borderRadiusLG
-        },
-        [`tr:last-child >*:last-child`]: {
-          borderEndEndRadius: token.borderRadiusLG
+    // 不带边框的表格样式
+    [`${componentCls}-wrapper ${componentCls}:not(${componentCls}-bordered)`]: {
+      // 单元格通用样式
+      [`${componentCls}-thead, ${componentCls}-tbody`]: {
+        ["td, th"]: {
+          [`&${componentCls}-row-expand-icon-cell`]: {
+            backgroundColor: colorBgBase,
+            // 设置 paddingRight 即可
+            paddingRight: token.paddingXS
+          },
+          // 紧跟在选择列或展开列后的第一列，左侧间距减小为 8px
+          [`&${componentCls}-selection-column, &${componentCls}-row-expand-icon-cell`]: {
+            [`& + td, & + th`]: {
+              paddingLeft: token.paddingXS
+            }
+          }
         }
       }
     },
-    // 非可展开表格、不带 footer 表格、非空表格、不带边框表格: 底部添加分隔线
+    // 以下样式在 https://design.oceanbase.com/components/table#table-demo-rowspan 场景下还存在问题，先注释掉
+    // 带边框、不带 footer、没有行列合并的表格样式
+    // [`${componentCls}-wrapper:not(${componentCls}-has-footer):not(${componentCls}-has-on-cell) ${componentCls}${componentCls}-bordered`]:
+    //   {
+    //     // 表格容器设置圆角
+    //     [`${componentCls}-container`]: {
+    //       borderRadius: token.borderRadiusLG,
+    //     },
+    //     [`${componentCls}-tbody`]: {
+    //       // 最后一行左右单元格增加圆角
+    //       [`tr:last-child >*:first-child`]: {
+    //         borderEndStartRadius: token.borderRadiusLG,
+    //       },
+    //       [`tr:last-child >*:last-child`]: {
+    //         borderEndEndRadius: token.borderRadiusLG,
+    //       },
+    //     },
+    //   },
+    // 非可展开表格、不带 footer 表格、非空表格、不带边框表格: 底部添加分隔线，并去掉底部圆角
     [`${componentCls}-wrapper:not(${componentCls}-expandable):not(${componentCls}-has-footer) ${componentCls}:not(${componentCls}-bordered):not(${componentCls}-empty)`]: {
       borderBottom: `1px solid ${colorBorderSecondary}`,
-      borderRadius: 0
+      borderBottomLeftRadius: 0,
+      borderBottomRightRadius: 0
     },
     // 去掉非展开表格的边框
     [`${componentCls}-wrapper:not(${componentCls}-expandable)`]: {
@@ -208,9 +221,15 @@ var genTableStyle = (token) => {
               }
             }
           },
+          [`${componentCls}-expanded-row > td`]: {
+            // 除内嵌子表格外，设置其他内嵌元素样式
+            [`& > *:not(${componentCls}-wrapper)`]: {
+              marginLeft: token.marginXL + token.lineWidth * 2
+            }
+          },
           // 嵌套子表格和父表格第一列对齐
           [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
-            marginLeft: token.marginXS + token.lineWidth * 2
+            marginLeft: token.margin + token.lineWidth * 2
           }
         }
       },
@@ -218,7 +237,7 @@ var genTableStyle = (token) => {
         [`${componentCls}-tbody`]: {
           // 嵌套子表格和父表格第一列对齐
           [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
-            marginLeft: token.marginXS + token.lineWidth * 2 + token.margin
+            marginLeft: token.margin + token.lineWidth * 2 + token.margin
           }
         }
       }
@@ -230,12 +249,12 @@ var genTableStyle = (token) => {
           [`${componentCls}-expanded-row > td`]: {
             // 除内嵌子表格外，设置其他内嵌元素样式
             [`& > *:not(${componentCls}-wrapper)`]: {
-              marginLeft: token.marginLG + token.marginXL + token.lineWidth * 2
+              marginLeft: token.marginXL + token.marginXL + token.lineWidth * 2
             }
           },
           // 嵌套子表格和父表格第一列对齐
           [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
-            marginLeft: token.marginXS + token.marginXL + token.lineWidth * 2
+            marginLeft: token.margin + token.marginXL + token.lineWidth * 2
           }
         }
       },
@@ -243,7 +262,7 @@ var genTableStyle = (token) => {
         [`${componentCls}-tbody`]: {
           // 嵌套子表格和父表格第一列对齐
           [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
-            marginLeft: token.marginXS + token.marginXL + token.lineWidth * 2 + token.margin
+            marginLeft: token.margin + token.marginXL + token.lineWidth * 2 + token.margin
           }
         }
       }

package/lib/tabs/index.d.ts

@@ -19,6 +19,7 @@ export type TabsPosition = AntTabsPosition;
 declare const Tabs: {
     ({ children, items, type, tabPosition, prefixCls: customizePrefixCls, className, ...restProps }: TabsProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
     TabPane: React.FC<TabPaneProps>;
+    genTabsStyle: (token: Partial<import("./style").TabsToken>) => import("@ant-design/cssinjs").CSSObject;
     displayName: string;
 };
 export default Tabs;

package/lib/tabs/index.js

@@ -87,7 +87,6 @@ var Tabs = ({
         items: newItems,
         type,
         tabPosition,
-        tabBarGutter: !type || type === "line" ? isHorizontal ? 24 : 0 : void 0,
         prefixCls: customizePrefixCls,
         className: tabsCls,
         ...restProps
@@ -96,6 +95,7 @@ var Tabs = ({
   );
 };
 Tabs.TabPane = import_TabPane.default;
+Tabs.genTabsStyle = import_style.genTabsStyle;
 if (process.env.NODE_ENV !== "production") {
   Tabs.displayName = import_antd.Tabs.displayName;
 }

package/lib/tabs/style/index.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { CSSObject } from '@ant-design/cssinjs';
+import type { FullToken } from 'antd/es/theme/internal';
 export type TabsToken = FullToken<'Tabs'>;
-export type CardToken = FullToken<'Card'>;
-export declare const genTagStyle: GenerateStyle<TabsToken | CardToken>;
+export declare const genTabsStyle: (token: Partial<TabsToken>) => CSSObject;
 declare const _default: (prefixCls: string) => {
     wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;

package/lib/tabs/style/index.js

@@ -20,11 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var style_exports = {};
 __export(style_exports, {
   default: () => style_default,
-  genTagStyle: () => genTagStyle
+  genTabsStyle: () => genTabsStyle
 });
 module.exports = __toCommonJS(style_exports);
 var import_genComponentStyleHook = require("../../_util/genComponentStyleHook");
-var genTagStyle = (token) => {
+var genTabsStyle = (token) => {
   const { antCls, componentCls, colorInfo, colorInfoBg, colorTextSecondary } = token;
   return {
     [componentCls]: {
@@ -75,11 +75,11 @@ var genTagStyle = (token) => {
 };
 var style_default = (prefixCls) => {
   const useStyle = (0, import_genComponentStyleHook.genComponentStyleHook)("Tabs", (token) => {
-    return [genTagStyle(token)];
+    return [genTabsStyle(token)];
   });
   return useStyle(prefixCls);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  genTagStyle
+  genTabsStyle
 });