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

fix: improve filter (#1333)

Browse Source 
Co-authored-by: chenos <chenlinxh@gmail.com>
This commit is contained in:
anuoua 2023-01-06 15:53:24 +08:00 committed by GitHub
parent 85a032f87c
commit 550db03615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/client/src/block-provider/SharedFilterProvider.tsx
View File

@ -17,6 +17,17 @@ export type SharedFilterContextValue = {
getFilterParams: (filterStore?: SharedFilterStore) => any;
};
export const mergeFilter = (filters: any[], op = '$and') => {
const items = filters.filter(Boolean);
if (items.length === 0) {
return {};
}
if (items.length === 1) {
return items[0];
}
return { [op]: items };
};
export const getFilterParams = (filterStore?: SharedFilterStore) => {
const newAssociationFilterList = Object.entries(filterStore).map(([key, filter]) => filter);
const newAssociationFilter = newAssociationFilterList.length
@ -35,8 +46,8 @@ export const SharedFilterContext = createContext<SharedFilterContextValue>({
});
export const concatFilter = (f1: SharedFilter, f2: SharedFilter): SharedFilter => {
const newAnd = [f1.$and, f2.$and].filter((i) => i).reduce((pre, cur) => pre.concat(cur), []);
const newOr = [f1.$or, f2.$or].filter((i) => i).reduce((pre, cur) => pre.concat(cur), []);
const newAnd = [f1?.$and, f2?.$and].filter((i) => i).reduce((pre, cur) => pre.concat(cur), []);
const newOr = [f1?.$or, f2?.$or].filter((i) => i).reduce((pre, cur) => pre.concat(cur), []);
const newFilter: SharedFilter = {};
newAnd.length && (newFilter.$and = newAnd);
newOr.length && (newFilter.$or = newOr);

37
packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx
View File

@ -3,10 +3,10 @@ import { css } from '@emotion/css';
import { useFieldSchema } from '@formily/react';
import { Col, Collapse, Input, Row, Tree } from 'antd';
import cls from 'classnames';
import React, { ChangeEvent, MouseEvent, useContext, useState } from 'react';
import React, { ChangeEvent, MouseEvent, useState } from 'react';
import { useRequest } from '../../../api-client';
import { useBlockRequestContext } from '../../../block-provider';
import { SharedFilterContext } from '../../../block-provider/SharedFilterProvider';
import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
import { SortableItem } from '../../common';
import { useCompile, useDesigner } from '../../hooks';
import { AssociationFilter } from './AssociationFilter';
@ -24,7 +24,6 @@ export const AssociationFilterItem = (props) => {
const Designer = useDesigner();
const compile = useCompile();
const { service } = useBlockRequestContext();
const { setSharedFilterStore, sharedFilterStore, getFilterParams } = useContext(SharedFilterContext);
const [searchVisible, setSearchVisible] = useState(false);
const collectionFieldName = collectionField.name;
@ -67,31 +66,17 @@ export const AssociationFilterItem = (props) => {
const onSelect = (selectedKeysValue: React.Key[]) => {
setSelectedKeys(selectedKeysValue);
const orList = selectedKeysValue.map((item) => ({
[collectionFieldName]: {
[valueKey]: {
$eq: item,
},
},
}));
const filters = service.params?.[1]?.filters || {};
const newFilter =
orList.length > 0
? {
$or: orList,
}
: {};
if (selectedKeysValue.length) {
filters[`af.${collectionFieldName}`] = {
[`${collectionFieldName}.${valueKey}.$in`]: selectedKeysValue,
};
} else {
delete filters[`af.${collectionFieldName}`];
}
const newAssociationFilterStore = {
...sharedFilterStore,
[collectionFieldName]: newFilter,
};
setSharedFilterStore(newAssociationFilterStore);
const paramFilter = getFilterParams(newAssociationFilterStore);
service.run({ ...service.params?.[0], pageSize: 200, page: 1, filter: paramFilter });
service.run({ ...service.params?.[0], pageSize: 200, page: 1, filter: mergeFilter(Object.values(filters)) }, { filters });
};
const handleSearchToggle = (e: MouseEvent) => {

16
packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
View File

@ -1,10 +1,9 @@
import { Field } from '@formily/core';
import { useField, useFieldSchema } from '@formily/react';
import flat from 'flat';
import { useContext } from 'react';
import { useTranslation } from 'react-i18next';
import { useBlockRequestContext } from '../../../block-provider';
import { concatFilter, SharedFilterContext } from '../../../block-provider/SharedFilterProvider';
import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
import { useCollection, useCollectionManager } from '../../../collection-manager';
export const useFilterOptions = (collectionName: string) => {
@ -99,7 +98,6 @@ export const useFilterActionProps = () => {
export const useFilterFieldProps = ({ options, service, params }) => {
const { t } = useTranslation();
const field = useField<Field>();
const { sharedFilterStore, setSharedFilterStore, getFilterParams } = useContext(SharedFilterContext);
return {
options,
onSubmit(values) {
@ -108,16 +106,10 @@ export const useFilterFieldProps = ({ options, service, params }) => {
// filter parameter for the filter action
const filter = removeNullCondition(values?.filter);
const newSharedFilterStore = {
...sharedFilterStore,
ActionBar: concatFilter(defaultFilter, filter),
};
const filters = service.params?.[1]?.filters || {};
filters[`default`] = mergeFilter([defaultFilter, filter]);
setSharedFilterStore(newSharedFilterStore);
const paramFilter = getFilterParams(newSharedFilterStore);
service.run({ ...service.params?.[0], page: 1, filter: paramFilter });
service.run({ ...service.params?.[0], page: 1, filter: mergeFilter(Object.values(filters)) }, { filters });
const items = filter?.$and || filter?.$or;
if (items?.length) {
field.title = t('{{count}} filter items', { count: items?.length || 0 });