mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 11:16:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: appends

Browse Source
This commit is contained in:
chenos 2022-03-12 00:38:11 +08:00
parent db26c64aa2
commit 627e2a9f4c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/client/src/collection-manager/ResourceActionProvider.tsx
View File

@ -28,6 +28,7 @@ const CollectionResourceActionProvider = (props) => {
if (actionName === 'get') { if (actionName === 'get') {
others['filterByTk'] = record[collection.targetKey || collection.filterTargetKey || 'id']; others['filterByTk'] = record[collection.targetKey || collection.filterTargetKey || 'id'];
} }
const appends = request?.params?.appends || [];
const service = useRequest( const service = useRequest(
{ {
...request, ...request,
@ -36,7 +37,7 @@ const CollectionResourceActionProvider = (props) => {
...request?.params, ...request?.params,
appends: [ appends: [
...collection?.fields?.filter?.((field) => field.target).map((field) => field.name), ...collection?.fields?.filter?.((field) => field.target).map((field) => field.name),
...request?.params?.appends, ...appends,
], ],
sort: dragSort ? [collection.sortable === true ? 'sort' : collection.sortable] : request?.params?.sort, sort: dragSort ? [collection.sortable === true ? 'sort' : collection.sortable] : request?.params?.sort,
}, },
@ -58,6 +59,7 @@ const AssociationResourceActionProvider = (props) => {
const api = useAPIClient(); const api = useAPIClient();
const record = useRecord(); const record = useRecord();
const resourceOf = record[association.sourceKey]; const resourceOf = record[association.sourceKey];
const appends = request?.params?.appends || [];
const service = useRequest( const service = useRequest(
{ {
resourceOf, resourceOf,
@ -66,7 +68,7 @@ const AssociationResourceActionProvider = (props) => {
...request?.params, ...request?.params,
appends: [ appends: [
...collection?.fields?.filter?.((field) => field.target).map((field) => field.name), ...collection?.fields?.filter?.((field) => field.target).map((field) => field.name),
...request?.params?.appends, ...appends,
], ],
}, },
}, },