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

fix: association filter (#1301)

Browse Source 
* fix: pageSize 200 & not a function

* fix: filter params wrong
This commit is contained in:
anuoua 2022-12-30 20:04:04 +08:00 committed by GitHub
parent 07a01fc507
commit b80aec9733
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/core/client/src/block-provider/SharedFilterProvider.tsx
View File

@ -35,8 +35,8 @@ export const SharedFilterContext = createContext<SharedFilterContextValue>({
}); });
export const concatFilter = (f1: SharedFilter, f2: SharedFilter): SharedFilter => { export const concatFilter = (f1: SharedFilter, f2: SharedFilter): SharedFilter => {
const newAnd = [f1.$and, f2.$and].filter((i) => i); const newAnd = [f1.$and, f2.$and].filter((i) => i).reduce((pre, cur) => pre.concat(cur), []);
const newOr = [f1.$or, f2.$or].filter((i) => i); const newOr = [f1.$or, f2.$or].filter((i) => i).reduce((pre, cur) => pre.concat(cur), []);
const newFilter: SharedFilter = {}; const newFilter: SharedFilter = {};
newAnd.length && (newFilter.$and = newAnd); newAnd.length && (newFilter.$and = newAnd);
newOr.length && (newFilter.$or = newOr); newOr.length && (newFilter.$or = newOr);