mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-09 15:39:24 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
4d67b95199
@ -121,7 +121,7 @@ export function useTableColumnInitializerFields() {
|
||||
const isReadPretty = isSubTable ? form.readPretty : true;
|
||||
|
||||
return currentFields
|
||||
.filter((v) => v.collectionName === name)
|
||||
.filter((v) => !v.collectionName || v.collectionName === name)
|
||||
.filter((field) => field?.interface && field?.interface !== 'subTable' && !field?.treeChildren)
|
||||
.map((field) => {
|
||||
const interfaceConfig = getInterface(field.interface);
|
||||
@ -380,7 +380,7 @@ export const useFormItemInitializerFields = (options?: any) => {
|
||||
const action = fieldSchema?.['x-action'];
|
||||
|
||||
return currentFields
|
||||
.filter((v) => v.collectionName === name)
|
||||
.filter((v) => !v.collectionName || v.collectionName === name)
|
||||
?.filter((field) => field?.interface && !field?.treeChildren)
|
||||
?.map((field) => {
|
||||
const interfaceConfig = getInterface(field.interface);
|
||||
@ -448,7 +448,7 @@ export const useFilterFormItemInitializerFields = (options?: any) => {
|
||||
const action = fieldSchema?.['x-action'];
|
||||
|
||||
return currentFields
|
||||
.filter((v) => v.collectionName === name)
|
||||
.filter((v) => !v.collectionName || v.collectionName === name)
|
||||
?.filter((field) => field?.interface && getInterface(field.interface)?.filterable)
|
||||
?.map((field) => {
|
||||
const interfaceConfig = getInterface(field.interface);
|
||||
|
Loading…
x
Reference in New Issue
Block a user