mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 03:46:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next
Some checks failed
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Has been cancelled
Details
Test on Windows / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-10-10 12:46:42 +00:00
commit dfbdb2f1c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/schema-component/antd/page/PagePopups.tsx
View File

@ -244,7 +244,7 @@ export const PagePopups = (props: { paramsList?: PopupParams[] }) => {
const waitList = popupParams.map((params) => { const waitList = popupParams.map((params) => {
return ( return (
getStoredPopupContext(params.popupuid)?.schema || getStoredPopupContext(params.popupuid)?.schema ||
findSchemaByUid(params.popupuid, fieldSchema.root) || findSchemaByUid(params.popupuid, fieldSchema?.root) ||
requestSchema(params.popupuid) requestSchema(params.popupuid)
); );
}); });
@ -257,7 +257,7 @@ export const PagePopups = (props: { paramsList?: PopupParams[] }) => {
const params = popupParams[index]; const params = popupParams[index];
if (params.puid) { if (params.puid) {
const popupSchema = findSchemaByUid(params.puid, fieldSchema.root); const popupSchema = findSchemaByUid(params.puid, fieldSchema?.root);
if (popupSchema) { if (popupSchema) {
savePopupSchemaToSchema(_.omit(popupSchema, 'parent'), schema); savePopupSchemaToSchema(_.omit(popupSchema, 'parent'), schema);
} }