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

fix: filter collapse

Browse Source
This commit is contained in:
xilesun 2024-10-30 20:20:36 +08:00
parent d6ad4a4358
commit f73fa8a477
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemInitializer.tsx
View File

@ -25,7 +25,9 @@ const commonOptions: any = {
useChildren() { useChildren() {
const cm = useCollectionManager_deprecated(); const cm = useCollectionManager_deprecated();
const associatedFields = useAssociatedFields(); const associatedFields = useAssociatedFields();
const children = associatedFields.map((field) => ({ const children = associatedFields
.filter((field) => !['JSONDocObject', 'JSONDocArray'].includes(field.interface))
.map((field) => ({
name: field.key, name: field.key,
title: field.uiSchema?.title, title: field.uiSchema?.title,
Component: 'AssociationFilterDesignerDisplayField', Component: 'AssociationFilterDesignerDisplayField',

1
packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx
View File

@ -111,6 +111,7 @@ export const getPopupPathFromParams = (params: PopupParams) => {
puid, puid,
collection && 'collection', collection && 'collection',
collection, collection,
// filterbytk is possibly to be 0
filterbytk !== null && filterbytk !== undefined && 'filterbytk', filterbytk !== null && filterbytk !== undefined && 'filterbytk',
filterbytk, filterbytk,
sourceid && 'sourceid', sourceid && 'sourceid',