Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2024-12-07 13:41:11 +00:00
commit e5de6b0c89

View File

@ -380,6 +380,7 @@ export const useFormItemInitializerFields = (options?: any) => {
const action = fieldSchema?.['x-action']; const action = fieldSchema?.['x-action'];
return currentFields return currentFields
.filter((v) => v.collectionName === name)
?.filter((field) => field?.interface && !field?.treeChildren) ?.filter((field) => field?.interface && !field?.treeChildren)
?.map((field) => { ?.map((field) => {
const interfaceConfig = getInterface(field.interface); const interfaceConfig = getInterface(field.interface);
@ -447,6 +448,7 @@ export const useFilterFormItemInitializerFields = (options?: any) => {
const action = fieldSchema?.['x-action']; const action = fieldSchema?.['x-action'];
return currentFields return currentFields
.filter((v) => v.collectionName === name)
?.filter((field) => field?.interface && getInterface(field.interface)?.filterable) ?.filter((field) => field?.interface && getInterface(field.interface)?.filterable)
?.map((field) => { ?.map((field) => {
const interfaceConfig = getInterface(field.interface); const interfaceConfig = getInterface(field.interface);