From 633c8b9b22b795e8bd2d4a2640afeb463204c797 Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 6 Mar 2025 15:33:23 +0800 Subject: [PATCH] fix: missing sort parameter in export button (#6375) --- .../plugin-action-export/src/client/useExportAction.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx b/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx index 7fd6fc2ee7..c7c7ec8139 100644 --- a/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx +++ b/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx @@ -15,7 +15,7 @@ import { useCollectionManager_deprecated, useCompile, useCurrentAppInfo, - useDataBlockRequest, + useTableBlockContext, useDataBlockResource, } from '@nocobase/client'; import lodash from 'lodash'; @@ -25,8 +25,9 @@ import { useExportTranslation } from './locale'; import { useMemo } from 'react'; export const useExportAction = () => { - const { service, resource, props } = useBlockRequestContext(); + const { service, props } = useBlockRequestContext(); const newResource = useDataBlockResource(); + const { params } = useTableBlockContext(); const appInfo = useCurrentAppInfo(); const defaultFilter = props?.params.filter; @@ -81,7 +82,7 @@ export const useExportAction = () => { title: compile(title), appends: service.params[0]?.appends?.join(), filter: mergeFilter([...Object.values(filters), defaultFilter]), - sort: service.params[0]?.sort, + sort: params?.sort, values: { columns: compile(exportSettings), },