test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-11-29 18:58:26 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
Zeke Zhang 2024-07-02 14:58:12 +08:00
commit 2e14e9939e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/e2e.yml vendored
View File

@ -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

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

@ -165,7 +165,6 @@ export const useBlockHeight = () => {
return height;
};
export const useTableSize = () => {
const [height, setTableHeight] = useState<number>();
const [width, setTableWidth] = useState<number>();
const elementRef = useRef<HTMLDivElement>(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) => {

2
packages/core/test/src/e2e/defineConfig.ts
View File

@ -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',