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

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-07 14:26:18 +00:00
commit 4d67b95199
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/schema-initializer/utils.ts
View File

@ -121,7 +121,7 @@ export function useTableColumnInitializerFields() {
const isReadPretty = isSubTable ? form.readPretty : true; const isReadPretty = isSubTable ? form.readPretty : true;
return currentFields return currentFields
.filter((v) => v.collectionName === name) .filter((v) => !v.collectionName || v.collectionName === name)
.filter((field) => field?.interface && field?.interface !== 'subTable' && !field?.treeChildren) .filter((field) => field?.interface && field?.interface !== 'subTable' && !field?.treeChildren)
.map((field) => { .map((field) => {
const interfaceConfig = getInterface(field.interface); const interfaceConfig = getInterface(field.interface);
@ -380,7 +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((v) => !v.collectionName || 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);
@ -448,7 +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((v) => !v.collectionName || 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);