fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 03:02:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix the issue that blocks cannot be created normally in popups (#6961)

Browse Source
This commit is contained in:
Zeke Zhang 2025-06-03 11:27:01 +08:00 committed by GitHub
parent b6fbd86ce8
commit f713db3cc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/client/src/modules/actions/view-edit-popup/PopupActionInitializer.tsx
View File

@ -7,13 +7,23 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
import React from 'react';
import React, { FC } from 'react';
import { ACLActionProvider } from '../../../acl/ACLProvider';
import { useSchemaInitializerItem } from '../../../application';
import { ClearCollectionFieldContext } from '../../../data-source/collection-field/CollectionFieldProvider';
import { usePopupUtils } from '../../../schema-component/antd/page/pagePopupUtils';
import { CONTEXT_SCHEMA_KEY } from '../../../schema-component/antd/page/usePopupContextInActionOrAssociationField';
import { BlockInitializer } from '../../../schema-initializer/items';
import { useOpenModeContext } from '../../popup/OpenModeProvider';
export const PopupActionDecorator: FC = (props) => {
return (
<ClearCollectionFieldContext>
<ACLActionProvider>{props.children}</ACLActionProvider>
</ClearCollectionFieldContext>
);
};
export const PopupActionInitializer = (props) => {
const { defaultOpenMode } = useOpenModeContext();
const { getPopupContext } = usePopupUtils();
@ -28,7 +38,7 @@ export const PopupActionInitializer = (props) => {
openMode: defaultOpenMode,
refreshDataBlockRequest: true,
},
'x-decorator': 'ACLActionProvider',
'x-decorator': 'PopupActionDecorator',
properties: {
drawer: {
type: 'void',

1
packages/core/client/src/modules/blocks/data-blocks/table/TableBlockInitializer.tsx
View File

@ -10,7 +10,6 @@
import { TableOutlined } from '@ant-design/icons';
import React from 'react';
import { useSchemaInitializer, useSchemaInitializerItem } from '../../../../application/schema-initializer/context';
import { useCollectionManager_deprecated } from '../../../../collection-manager/hooks/useCollectionManager_deprecated';
import { Collection, CollectionFieldOptions } from '../../../../data-source/collection/Collection';
import { DataBlockInitializer } from '../../../../schema-initializer/items/DataBlockInitializer';
import { createTableBlockUISchema } from './createTableBlockUISchema';

14
packages/core/client/src/schema-initializer/index.ts
View File

@ -23,13 +23,18 @@ import { DestroyActionInitializer } from '../modules/actions/delete/DestroyActio
import { DisassociateActionInitializer } from '../modules/actions/disassociate/DisassociateActionInitializer';
import { ExpandableActionInitializer } from '../modules/actions/expand-collapse/ExpandableActionInitializer';
import { FilterActionInitializer } from '../modules/actions/filter/FilterActionInitializer';
import { LinkActionInitializer } from '../modules/actions/link/LinkActionInitializer';
import { RefreshActionInitializer } from '../modules/actions/refresh/RefreshActionInitializer';
import { CreateSubmitActionInitializer } from '../modules/actions/submit/CreateSubmitActionInitializer';
import { UpdateSubmitActionInitializer } from '../modules/actions/submit/UpdateSubmitActionInitializer';
import { UpdateRecordActionInitializer } from '../modules/actions/update-record/UpdateRecordActionInitializer';
import { PopupActionInitializer } from '../modules/actions/view-edit-popup/PopupActionInitializer';
import { LinkActionInitializer } from '../modules/actions/link/LinkActionInitializer';
import {
PopupActionDecorator,
PopupActionInitializer,
} from '../modules/actions/view-edit-popup/PopupActionInitializer';
import { AssociateActionInitializer } from '../modules/actions/associate/AssociateActionInitializer';
import { AssociateActionProvider } from '../modules/actions/associate/AssociateActionProvider';
import { recordFormBlockInitializers } from '../modules/actions/view-edit-popup/RecordFormBlockInitializers';
import { UpdateActionInitializer } from '../modules/actions/view-edit-popup/UpdateActionInitializer';
import { ViewActionInitializer } from '../modules/actions/view-edit-popup/ViewActionInitializer';
@ -104,6 +109,7 @@ import {
filterFormItemInitializers,
filterFormItemInitializers_deprecated,
} from '../modules/blocks/filter-blocks/form/filterFormItemInitializers';
import { DividerFormItemInitializer } from '../modules/blocks/other-blocks/divider/DividerFormItemInitializer';
import { MarkdownBlockInitializer } from '../modules/blocks/other-blocks/markdown/MarkdownBlockInitializer';
import { MarkdownFormItemInitializer } from '../modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer';
import {
@ -114,9 +120,6 @@ import { CollectionFieldInitializer } from '../modules/fields/initializer/Collec
import { TableCollectionFieldInitializer } from '../modules/fields/initializer/TableCollectionFieldInitializer';
import { menuItemInitializer, menuItemInitializer_deprecated } from '../modules/menu/menuItemInitializer';
import { blockInitializers, blockInitializers_deprecated } from '../modules/page/BlockInitializers';
import { DividerFormItemInitializer } from '../modules/blocks/other-blocks/divider/DividerFormItemInitializer';
import { AssociateActionInitializer } from '../modules/actions/associate/AssociateActionInitializer';
import { AssociateActionProvider } from '../modules/actions/associate/AssociateActionProvider';
import {
customFormItemInitializers,
customFormItemInitializers_deprecated,
@ -188,6 +191,7 @@ export class SchemaInitializerPlugin extends Plugin {
DividerFormItemInitializer,
AssociateActionInitializer,
AssociateActionProvider,
PopupActionDecorator,
} as any);
this.app.schemaInitializerManager.add(blockInitializers_deprecated);