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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-03-06 07:33:46 +00:00
commit 5f4c7be5ec
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx
View File

@ -15,7 +15,7 @@ import {
useCollectionManager_deprecated, useCollectionManager_deprecated,
useCompile, useCompile,
useCurrentAppInfo, useCurrentAppInfo,
useDataBlockRequest, useTableBlockContext,
useDataBlockResource, useDataBlockResource,
} from '@nocobase/client'; } from '@nocobase/client';
import lodash from 'lodash'; import lodash from 'lodash';
@ -25,8 +25,9 @@ import { useExportTranslation } from './locale';
import { useMemo } from 'react'; import { useMemo } from 'react';
export const useExportAction = () => { export const useExportAction = () => {
const { service, resource, props } = useBlockRequestContext(); const { service, props } = useBlockRequestContext();
const newResource = useDataBlockResource(); const newResource = useDataBlockResource();
const { params } = useTableBlockContext();
const appInfo = useCurrentAppInfo(); const appInfo = useCurrentAppInfo();
const defaultFilter = props?.params.filter; const defaultFilter = props?.params.filter;
@ -81,7 +82,7 @@ export const useExportAction = () => {
title: compile(title), title: compile(title),
appends: service.params[0]?.appends?.join(), appends: service.params[0]?.appends?.join(),
filter: mergeFilter([...Object.values(filters), defaultFilter]), filter: mergeFilter([...Object.values(filters), defaultFilter]),
sort: service.params[0]?.sort, sort: params?.sort,
values: { values: {
columns: compile(exportSettings), columns: compile(exportSettings),
}, },