fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(data-vi): enum field options are empty in the filter block (#6706)

Browse Source 
* fix(data-vi): enum field options are empty in the filter block

* fix: specific props
This commit is contained in:
YANG QIA 2025-04-18 19:20:46 +08:00 committed by GitHub
parent 5931e2914e
commit 97f4a6ccff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,11 +135,10 @@ export const useChartFilter = () => {
'x-decorator': 'ChartFilterFormItem', 'x-decorator': 'ChartFilterFormItem',
'x-data-source': dataSource, 'x-data-source': dataSource,
'x-collection-field': `${fieldName}.${field.name}`, 'x-collection-field': `${fieldName}.${field.name}`,
...defaultOperator?.schema,
'x-component-props': { 'x-component-props': {
utc: false, utc: false,
underFilter: true, underFilter: true,
...field.uiSchema?.['x-component-props'], component: defaultOperator?.schema?.['x-component'],
'filter-operator': defaultOperator, 'filter-operator': defaultOperator,
'data-source': dataSource, 'data-source': dataSource,
'collection-field': `${fieldName}.${field.name}`, 'collection-field': `${fieldName}.${field.name}`,
@ -195,14 +194,15 @@ export const useChartFilter = () => {
'x-settings': 'chart:filterForm:item', 'x-settings': 'chart:filterForm:item',
'x-toolbar': 'ChartFilterItemToolbar', 'x-toolbar': 'ChartFilterItemToolbar',
'x-decorator': 'ChartFilterFormItem', 'x-decorator': 'ChartFilterFormItem',
'x-component': 'CollectionField',
'x-data-source': dataSource, 'x-data-source': dataSource,
'x-collection-field': `${fieldName}.${child.name}`, 'x-collection-field': `${fieldName}.${child.name}`,
...child.schema, ...child.schema,
title, title,
...defaultOperator?.schema,
'x-component-props': { 'x-component-props': {
utc: false, utc: false,
underFilter: true, underFilter: true,
component: defaultOperator?.schema?.['x-component'],
'filter-operator': defaultOperator, 'filter-operator': defaultOperator,
'data-source': dataSource, 'data-source': dataSource,
'collection-field': `${fieldName}.${child.name}`, 'collection-field': `${fieldName}.${child.name}`,

7
packages/plugins/@nocobase/plugin-data-visualization/src/client/settings/chartFilterItem.tsx
View File

@ -56,6 +56,7 @@ function useFieldComponentName(): string {
const map = { const map = {
// AssociationField 的 mode 默认值是 Select // AssociationField 的 mode 默认值是 Select
AssociationField: 'Select', AssociationField: 'Select',
'DatePicker.FilterWithPicker': 'DatePicker',
}; };
const fieldComponentName = const fieldComponentName =
fieldSchema?.['x-component-props']?.['mode'] || fieldSchema?.['x-component-props']?.['mode'] ||
@ -163,15 +164,15 @@ const EditOperator = () => {
const setOperatorComponent = (operator: any, component: any, props = {}) => { const setOperatorComponent = (operator: any, component: any, props = {}) => {
const componentProps = field.componentProps || {}; const componentProps = field.componentProps || {};
field.component = component;
field.componentProps = { field.componentProps = {
...componentProps, ...componentProps,
component,
'filter-operator': operator, 'filter-operator': operator,
...props, ...props,
}; };
fieldSchema['x-component'] = component;
fieldSchema['x-component-props'] = { fieldSchema['x-component-props'] = {
...fieldSchema['x-component-props'], ...fieldSchema['x-component-props'],
component,
'filter-operator': operator, 'filter-operator': operator,
...props, ...props,
}; };
@ -179,9 +180,9 @@ const EditOperator = () => {
dn.emit('patch', { dn.emit('patch', {
schema: { schema: {
'x-uid': fieldSchema['x-uid'], 'x-uid': fieldSchema['x-uid'],
'x-component': component,
'x-component-props': { 'x-component-props': {
...fieldSchema['x-component-props'], ...fieldSchema['x-component-props'],
component,
'filter-operator': operator, 'filter-operator': operator,
...props, ...props,
}, },