test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-12-02 12:18:15 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge branch 'main' into next

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