fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 03:02:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(data-vi): allows to use foreign keys in query configuration of charts (#5869)

Browse Source
This commit is contained in:
YANG QIA 2024-12-12 15:56:00 +08:00 committed by GitHub
parent cd5b0dc4d8
commit de323cf6f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,11 +11,8 @@ import { ArrayField } from '@formily/core';
import { ISchema, Schema, useForm } from '@formily/react'; import { ISchema, Schema, useForm } from '@formily/react';
import { import {
CollectionFieldOptions, CollectionFieldOptions,
CollectionFieldOptions_deprecated,
CollectionManager,
DEFAULT_DATA_SOURCE_KEY, DEFAULT_DATA_SOURCE_KEY,
useACLRoleContext, useACLRoleContext,
useCollectionManager_deprecated,
useDataSourceManager, useDataSourceManager,
} from '@nocobase/client'; } from '@nocobase/client';
import { useContext, useMemo } from 'react'; import { useContext, useMemo } from 'react';
@ -243,7 +240,7 @@ export const useCollectionFieldsOptions = (dataSource: string, collectionName: s
const fields = collectionFields.filter((v) => !excludes.includes(v.interface)); const fields = collectionFields.filter((v) => !excludes.includes(v.interface));
const field2option = (field, depth, prefix?) => { const field2option = (field, depth, prefix?) => {
if (!field.interface || field.isForeignKey) { if (!field.interface) {
return; return;
} }
const fieldInterface = fim.getFieldInterface(field.interface); const fieldInterface = fim.getFieldInterface(field.interface);
@ -300,7 +297,7 @@ export const useCollectionFilterOptions = (dataSource: string, collection: strin
return useMemo(() => { return useMemo(() => {
const fields = cm.getCollectionFields(collection || _collection); const fields = cm.getCollectionFields(collection || _collection);
const field2option = (field, depth) => { const field2option = (field, depth) => {
if (!field.interface || field.isForeignKey) { if (!field.interface) {
return; return;
} }
const fieldInterface = fim.getFieldInterface(field.interface); const fieldInterface = fim.getFieldInterface(field.interface);