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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-09 01:39:13 +00:00
commit d37ad50fd0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ export const useExportAction = () => {
const { name, title } = useCollection_deprecated(); const { name, title } = useCollection_deprecated();
const { t } = useExportTranslation(); const { t } = useExportTranslation();
const { modal } = App.useApp(); const { modal } = App.useApp();
const filters = service.params?.[1]?.filters || {}; const filters = service.params[0]?.filter || {};
const field = useField(); const field = useField();
const exportLimit = useMemo(() => { const exportLimit = useMemo(() => {
if (appInfo?.data?.exportLimit) { if (appInfo?.data?.exportLimit) {
@ -81,7 +81,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([filters, defaultFilter]),
sort: params?.sort, sort: params?.sort,
values: { values: {
columns: compile(exportSettings), columns: compile(exportSettings),