fix: the height of the subtable in the form is set along with the mai… (nocobase#6518)

* fix: the height of the subtable in the form is set along with the main form height

* fix: bug

Author: katherinehhh

packages/core/client/src/schema-component/antd/association-field/Table.tsx

@@ -602,12 +602,6 @@ const InternalNocoBaseTable = React.memo(
                   height: 100%;
                   display: flex;
                   flex-direction: column;
-                  .ant-table-expanded-row-fixed {
-                    min-height: ${tableHeight}px;
-                  }
-                  .ant-table-body {
-                    min-height: ${tableHeight}px;
-                  }
                   .ant-table-cell {
                     padding: 16px 8px;
                   }

packages/core/client/src/schema-component/hooks/useBlockSize.ts

@@ -37,7 +37,9 @@ const getPageHeaderHeight = (disablePageHeader, enablePageTabs, hidePageTitle, t
           token.paddingContentHorizontalLG
         );
       }
-      return token.controlHeight + token.marginXS + (token.paddingXXS + 2) * 2 + token.paddingContentHorizontalLG;
+      return (
+        token.controlHeight + token.marginXS + (token.paddingContentVertical + 2) * 2 + token.paddingContentHorizontalLG
+      );
     } else {
       if (enablePageTabs) {
         return (
@@ -140,12 +142,12 @@ export const useDataBlockHeight = (options?: UseDataBlockHeightOptions) => {
   const { heightMode, height, title, titleHeight } = heightProps || {};
 
   const blockHeaderHeight = title ? titleHeight : 0;
+
   if (!heightProps?.heightMode || heightMode === HeightMode.DEFAULT) {
     return;
   }
   if (heightMode === HeightMode.FULL_HEIGHT) {
     let res = window.innerHeight - pageFullScreenHeight;
-    console.log(res);
     if (options?.removeBlockHeaderHeight) {
       res = res - blockHeaderHeight;
     }