ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: not showing unfilterable fields

Browse Source
This commit is contained in:
chenos 2022-04-22 13:41:23 +08:00
parent ae5686af0b
commit 5c6a39f2f4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx
View File

@ -1,8 +1,10 @@
import { ISchema, useField, useFieldSchema } from '@formily/react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { useDesignable } from '../..';
import { useCollection, useCollectionManager } from '../../../collection-manager';
import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
import { useCompile } from '../../hooks';
export const useFilterableFields = (collectionName: string) => {
const { getCollectionFields, getInterface } = useCollectionManager();
@ -25,16 +27,18 @@ export const FilterActionDesigner = (props) => {
const { dn } = useDesignable();
const { name } = useCollection();
const fields = useFilterableFields(name);
const compile = useCompile();
const { t } = useTranslation();
const nonfilterable = fieldSchema?.['x-component-props']?.nonfilterable || [];
return (
<GeneralSchemaDesigner {...props}>
<SchemaSettings.ItemGroup title={'可筛选字段'}>
<SchemaSettings.ItemGroup title={t('Filterable fields')}>
{fields.map((field) => {
const checked = !nonfilterable.includes(field.name);
return (
<SchemaSettings.SwitchItem
checked={checked}
title={field?.uiSchema?.title}
title={compile(field?.uiSchema?.title)}
onChange={(value) => {
fieldSchema['x-component-props'] = fieldSchema?.['x-component-props'] || {};
const nonfilterable = fieldSchema?.['x-component-props']?.nonfilterable || [];

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

@ -11,7 +11,7 @@ export const useFilterOptions = (collectionName: string) => {
const { getCollectionFields, getInterface } = useCollectionManager();
const fields = getCollectionFields(collectionName);
const field2option = (field, depth) => {
if (nonfilterable.length && depth !== 1 && nonfilterable.includes(field.name)) {
if (nonfilterable.length && depth === 1 && nonfilterable.includes(field.name)) {
return;
}
if (!field.interface) {