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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-31 02:40:23 +00:00
commit 1b49e542cf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/client/src/schema-settings/SchemaSettingsDefaultValue.tsx
View File

@ -85,6 +85,7 @@ export const SchemaSettingsDefaultValue = function DefaultValueConfigure(props:
const tableCtx = useTableBlockContext(); const tableCtx = useTableBlockContext();
const isAllowContextVariable = const isAllowContextVariable =
collectionField?.interface === 'm2m' || collectionField?.interface === 'm2m' ||
collectionField?.interface === 'mbm' ||
(parentCollectionField?.type === 'hasMany' && collectionField?.interface === 'm2o'); (parentCollectionField?.type === 'hasMany' && collectionField?.interface === 'm2o');
const returnScope = useCallback( const returnScope = useCallback(

4
packages/core/client/src/schema-settings/VariableInput/hooks/useContextAssociationFields.tsx
View File

@ -101,7 +101,9 @@ export const useContextAssociationFields = ({
const children = const children =
getChildren( getChildren(
getFilterOptions(collectionName).filter((v) => { getFilterOptions(collectionName).filter((v) => {
const isAssociationField = ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(v.type); const isAssociationField = ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany', 'belongsToArray'].includes(
v.type,
);
return isAssociationField; return isAssociationField;
}), }),
{ {