From c8d8b719bd48e97b59bf940088ad0c12872e33c5 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Thu, 5 Dec 2024 14:06:01 +0800
Subject: [PATCH] fix: scrollbar issue in sub-table with size small under
 compact theme (#5796)

---
 .../src/schema-component/antd/form-item/FormItem.tsx  | 11 ++++++++++-
 .../src/schema-component/antd/table-v2/Table.tsx      |  6 ++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
index 62a85114ae..324f4c66ae 100644
--- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
+++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
@@ -83,7 +83,16 @@ export const FormItem: any = withDynamicSchemaProps(
 
     return (
       <CollectionFieldProvider allowNull={true}>
-        <BlockItem className={'nb-form-item'}>
+        <BlockItem
+          className={cx(
+            'nb-form-item',
+            css`
+              .ant-formily-item-layout-horizontal .ant-formily-item-control {
+                max-width: ${showTitle === false ? '100% !important' : null};
+              }
+            `,
+          )}
+        >
           <ACLCollectionFieldProvider>
             <Item className={className} {...props} extra={extra} wrapperStyle={wrapperStyle} />
           </ACLCollectionFieldProvider>
diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
index 57fea22049..2f998ce0ac 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
+++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
@@ -588,6 +588,8 @@ const InternalNocoBaseTable = React.memo(
       field,
       ...others
     } = props;
+    const { token } = useToken();
+
     return (
       <div
         className={cx(
@@ -612,10 +614,10 @@ const InternalNocoBaseTable = React.memo(
                     padding: 16px 8px;
                   }
                   .ant-table-middle .ant-table-cell {
-                    padding: 12px 8px;
+                    padding: 12px ${token.paddingXS}px;
                   }
                   .ant-table-small .ant-table-cell {
-                    padding: 8px 8px;
+                    padding: 8px ${token.paddingXS}px;
                   }
                 }
               }