Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-03-06 07:33:46 +00:00
commit 5f4c7be5ec

View File

@ -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),
},