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

feat(data-vi): data scope for chart filter fields (#3894)

Browse Source 
* feat(data-vi): data scope for chart filter fields

* fix: filter foreign keys
This commit is contained in:
YANG QIA 2024-04-01 20:25:34 +08:00 committed by GitHub
parent 80caec7050
commit aeb87a8e28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx
View File

@ -14,6 +14,10 @@ import {
SchemaSettingsSelectItem,
CollectionFieldOptions_deprecated,
DEFAULT_DATA_SOURCE_KEY,
useIsAssociationField,
SchemaSettingsDataScope,
removeNullCondition,
useFormBlockContext,
} from '@nocobase/client';
import { useChartsTranslation } from '../locale';
import { Schema, useField, useFieldSchema } from '@formily/react';
@ -299,6 +303,37 @@ const EditTitleField = () => {
) : null;
};
const EditDataScope: React.FC = () => {
const { dn } = useDesignable();
const field = useField<Field>();
const fieldSchema = useFieldSchema();
const dataSource = fieldSchema['x-data-source'] || DEFAULT_DATA_SOURCE_KEY;
const { form } = useFormBlockContext();
const { cm } = useChartDataSource(dataSource);
const collectionField = cm.getCollectionField(fieldSchema['x-collection-field']);
if (!collectionField) {
return null;
}
return (
<SchemaSettingsDataScope
form={form}
defaultFilter={fieldSchema?.['x-component-props']?.service?.params?.filter || {}}
collectionName={collectionField.target}
onSubmit={({ filter }) => {
filter = removeNullCondition(filter);
_.set(field.componentProps, 'service.params.filter', filter);
fieldSchema['x-component-props'] = field.componentProps;
dn.emit('patch', {
schema: {
['x-uid']: fieldSchema['x-uid'],
'x-component-props': field.componentProps,
},
});
}}
/>
);
};
export const ChartFilterItemDesigner: React.FC = () => {
const { getCollectionJoinField } = useCollectionManager_deprecated();
const { getField } = useCollection_deprecated();
@ -310,6 +345,7 @@ export const ChartFilterItemDesigner: React.FC = () => {
const isCustom = fieldName.startsWith('custom.');
const hasProps = getPropsSchemaByComponent(fieldSchema['x-component']);
const originalTitle = useCollectionJoinFieldTitle(dataSource, fieldName);
const isAssociationField = useIsAssociationField();
return (
<GeneralSchemaDesigner disableInitializer>
{!isCustom && (
@ -328,6 +364,7 @@ export const ChartFilterItemDesigner: React.FC = () => {
{!isCustom && <EditOperator />}
<EditTitleField />
<EditDefaultValue />
{isAssociationField && <EditDataScope />}
{collectionField ? <SchemaSettingsDivider /> : null}
<SchemaSettingsRemove
key="remove"

2
packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts
View File

@ -221,7 +221,7 @@ export const useChartFilter = () => {
name: string,
fieldName: string,
): SchemaInitializerItemType => {
if (!field.interface) {
if (!field.interface || field.isForeignKey) {
return;
}
const fieldInterface = fim.getFieldInterface(field.interface);