mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 07:06:06 +00:00
Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
This commit is contained in:
commit
843aa66919
@ -130,7 +130,7 @@ const CascadeSelect = connect((props) => {
|
||||
const response = await resource.list({
|
||||
pageSize: 200,
|
||||
params: service?.params,
|
||||
filter: mergeFilter([service?.params?.filter, filter]),
|
||||
filter: mergeFilter([filter]),
|
||||
tree: !filter.parentId ? true : undefined,
|
||||
});
|
||||
return response?.data?.data;
|
||||
|
Loading…
Reference in New Issue
Block a user