diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index eb3c5f74d..fa15d7142 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -134,7 +134,7 @@ jobs: name: e2e-report-${{ github.job }} # 为了防止在多个任务中存在冲突 path: ./storage/playwright/tests-report-blob/blob-*/* - timeout-minutes: 60 + timeout-minutes: 180 plugin-workflow: name: plugin-workflow @@ -214,7 +214,7 @@ jobs: name: e2e-report-${{ github.job }} # 为了防止在多个任务中存在冲突 path: ./storage/playwright/tests-report-blob/blob-*/* - timeout-minutes: 60 + timeout-minutes: 180 plugin-data-source-main: name: plugin-data-source-main @@ -294,7 +294,7 @@ jobs: name: e2e-report-${{ github.job }} # 为了防止在多个任务中存在冲突 path: ./storage/playwright/tests-report-blob/blob-*/* - timeout-minutes: 60 + timeout-minutes: 180 comment-on-pr: name: Comment on PR diff --git a/packages/core/client/src/schema-component/hooks/useBlockSize.ts b/packages/core/client/src/schema-component/hooks/useBlockSize.ts index 6397c0cd3..c606d823c 100644 --- a/packages/core/client/src/schema-component/hooks/useBlockSize.ts +++ b/packages/core/client/src/schema-component/hooks/useBlockSize.ts @@ -165,7 +165,6 @@ export const useBlockHeight = () => { return height; }; export const useTableSize = () => { - const [height, setTableHeight] = useState(); const [width, setTableWidth] = useState(); const elementRef = useRef(null); const targetHeight = useTableHeight(); @@ -176,7 +175,6 @@ export const useTableSize = () => { const tableContentRect = elementRef.current.querySelector('.ant-table')?.getBoundingClientRect(); if (!tableContentRect) return; setTableWidth(clientRect.width); - setTableHeight(targetHeight); }, 100), [targetHeight], ); @@ -190,8 +188,7 @@ export const useTableSize = () => { ); useEventListener('resize', calcTableSize); - - return { height, width, tableSizeRefCallback }; + return { height: targetHeight, width, tableSizeRefCallback }; }; const hasActionContainerInParentChain = (schema) => { diff --git a/packages/core/test/src/e2e/defineConfig.ts b/packages/core/test/src/e2e/defineConfig.ts index a94308033..ee4d97a54 100644 --- a/packages/core/test/src/e2e/defineConfig.ts +++ b/packages/core/test/src/e2e/defineConfig.ts @@ -17,6 +17,8 @@ export const defineConfig = (config?: PlaywrightTestConfig) => { timeout: 10 * 1000, }, + globalTimeout: 60 * 60 * 1000, + // Look for test files in the "tests" directory, relative to this configuration file. testDir: 'packages',