fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue with batch deletion of system and general fields in collection management (#5988)

Browse Source
This commit is contained in:
Katherine 2025-01-05 11:58:39 +08:00 committed by GitHub
parent 38d1ab4f1b
commit 9f35c6ce04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,18 +76,19 @@ export const useBulkDestroyAction = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const form = useForm(); const form = useForm();
const { cascade } = form?.values || {}; const { cascade } = form?.values || {};
const selectedRowKeys = Object.values(state).flat();
return { return {
async run(flag?) { async run(flag?) {
if (!state?.selectedRowKeys?.length) { if (!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'));
} }
await resource.destroy({ await resource.destroy({
filterByTk: state?.selectedRowKeys || [], filterByTk: selectedRowKeys || [],
cascade, cascade,
}); });
form.reset(); form.reset();
!flag && ctx?.setVisible?.(false); !flag && ctx?.setVisible?.(false);
setState?.({ selectedRowKeys: [] }); setState?.({});
refresh(); refresh();
}, },
}; };

3
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/hooks.ts
View File

@ -28,6 +28,7 @@ export const useDestroyAction = () => {
}; };
}; };
// 外部数据源删除字段
export const useBulkDestroyAction = () => { export const useBulkDestroyAction = () => {
const { state, setState, refresh } = useResourceActionContext(); const { state, setState, refresh } = useResourceActionContext();
const { t } = useTranslation(); const { t } = useTranslation();
@ -52,11 +53,9 @@ export const useBulkDestroyAction = () => {
export const useBulkDestroyActionAndRefreshCM = () => { export const useBulkDestroyActionAndRefreshCM = () => {
const { run } = useBulkDestroyAction(); const { run } = useBulkDestroyAction();
// const { refreshCM } = useCollectionManager_deprecated();
return { return {
async run() { async run() {
await run(); await run();
// await refreshCM();
}, },
}; };
}; };

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

@ -207,7 +207,7 @@ const CurrentFields = (props) => {
setState((state) => { setState((state) => {
return { return {
...state, ...state,
selectedRowKeys, [props.type]: selectedRowKeys,
}; };
}); });
}, },
@ -483,6 +483,7 @@ const CollectionFieldsInternal = () => {
fields={record.fields} fields={record.fields}
collectionResource={collectionResource} collectionResource={collectionResource}
refreshAsync={refreshAsync} refreshAsync={refreshAsync}
type={record.key}
/> />
), ),
}} }}