Merge branch 'main' into next

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

@@ -76,18 +76,19 @@ export const useBulkDestroyAction = () => {
   const { t } = useTranslation();
   const form = useForm();
   const { cascade } = form?.values || {};
+  const selectedRowKeys = Object.values(state).flat();
   return {
     async run(flag?) {
-      if (!state?.selectedRowKeys?.length) {
+      if (!selectedRowKeys?.length) {
         return message.error(t('Please select the records you want to delete'));
       }
       await resource.destroy({
-        filterByTk: state?.selectedRowKeys || [],
+        filterByTk: selectedRowKeys || [],
         cascade,
       });
       form.reset();
       !flag && ctx?.setVisible?.(false);
-      setState?.({ selectedRowKeys: [] });
+      setState?.({});
       refresh();
     },
   };

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

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

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

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