test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-12-01 03:38:32 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix(app): filter merge

Browse Source
This commit is contained in:
chenos 2021-01-01 17:35:28 +08:00
parent 89650750b1
commit 97136c62ba
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/app/src/components/views/SimpleTable.tsx
View File

@ -32,6 +32,7 @@ export function SimpleTable(props: SimpleTableProps) {
selectedRowKeys: srk,
} = props;
const { rowKey = 'id', name: viewName, actionDefaultParams = {}, fields = [], rowViewName, actions = [], paginated = true, defaultPerPage = 10 } = schema;
const { filter: defaultFilter = {} } = actionDefaultParams;
const { sourceKey = 'id' } = activeTab.field||{};
const drawerRef = useRef<any>();
const [filterCount, setFilterCount] = useState(0);
@ -43,9 +44,15 @@ export function SimpleTable(props: SimpleTableProps) {
page: paginated ? current : 1,
perPage: paginated ? pageSize : -1,
sorter,
filter,
// filter,
viewName,
...actionDefaultParams,
filter: {
and: [
defaultFilter,
filter,
].filter(obj => obj && Object.keys(obj).length)
}
})
.then(({data = [], meta = {}}) => {
return {

10
packages/app/src/components/views/Table.tsx
View File

@ -34,6 +34,8 @@ export function Table(props: TableProps) {
// const { data, mutate } = useRequest(() => api.resource(name).list({
// associatedKey,
// }));
const { filter: defaultFilter = {} } = actionDefaultParams;
const [filterCount, setFilterCount] = useState(0);
const name = associatedName ? `${associatedName}.${resourceName}` : resourceName;
const { data, loading, pagination, mutate, refresh, run, params } = useRequest((params = {}, ...args) => {
@ -44,9 +46,15 @@ export function Table(props: TableProps) {
page: paginated ? current : 1,
perPage: paginated ? pageSize : -1,
sorter,
filter,
// filter,
viewName,
...actionDefaultParams,
filter: {
and: [
defaultFilter,
filter,
].filter(obj => obj && Object.keys(obj).length)
}
// ...args2,
})
.then(({data = [], meta = {}}) => {