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

fix: bulk delete collection field should not close modal (#4263)

Browse Source
This commit is contained in:
katherinehhh 2024-05-07 09:44:55 +08:00 committed by GitHub
parent 080fc78c1a
commit 0214bb915e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx
View File

@ -39,12 +39,18 @@ export const useDestroyActionAndRefreshCM = () => {
}, },
}; };
}; };
export const useBulkDestroyActionAndRefreshCM = () => {
/**
* 是否关闭弹窗
* @param flag
* @returns
*/
export const useBulkDestroyActionAndRefreshCM = (flag?) => {
const { run } = useBulkDestroyAction(); const { run } = useBulkDestroyAction();
const { refreshCM } = useCollectionManager_deprecated(); const { refreshCM } = useCollectionManager_deprecated();
return { return {
async run() { async run() {
await run(); await run(flag);
await refreshCM(); await refreshCM();
}, },
}; };
@ -71,7 +77,7 @@ export const useBulkDestroyAction = () => {
const form = useForm(); const form = useForm();
const { cascade } = form?.values || {}; const { cascade } = form?.values || {};
return { return {
async run() { async run(flag?) {
if (!state?.selectedRowKeys?.length) { if (!state?.selectedRowKeys?.length) {
return message.error(t('Please select the records you want to delete')); return message.error(t('Please select the records you want to delete'));
} }
@ -80,7 +86,7 @@ export const useBulkDestroyAction = () => {
cascade, cascade,
}); });
form.reset(); form.reset();
ctx?.setVisible?.(false); !flag && ctx?.setVisible?.(false);
setState?.({ selectedRowKeys: [] }); setState?.({ selectedRowKeys: [] });
refresh(); refresh();
}, },

2
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx
View File

@ -413,7 +413,7 @@ const CollectionFieldsInternal = () => {
const deleteProps = useMemo( const deleteProps = useMemo(
() => ({ () => ({
useAction: useBulkDestroyActionAndRefreshCM, useAction: () => useBulkDestroyActionAndRefreshCM(true),
title: t('Delete'), title: t('Delete'),
icon: 'DeleteOutlined', icon: 'DeleteOutlined',
disabled: targetTemplate?.forbidDeletion, disabled: targetTemplate?.forbidDeletion,