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

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-28 09:49:09 +00:00
commit 822d004ab0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,6 @@ export const FormLinkageRules = withDynamicSchemaProps(
returnScope ?? returnScope ??
((options) => ((options) =>
options.filter((v) => { options.filter((v) => {
console.log(category);
if (category === LinkageRuleCategory.block) { if (category === LinkageRuleCategory.block) {
return !['$nForm', '$nRecord'].includes(v.value); return !['$nForm', '$nRecord'].includes(v.value);
} }

5
packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts
View File

@ -78,7 +78,10 @@ export const useCurrentFormContext = ({ form: _form }: Pick<Props, 'form'> = {})
currentFormCtx: formInstance?.values, currentFormCtx: formInstance?.values,
/** 用来判断是否可以显示`当前表单`变量 */ /** 用来判断是否可以显示`当前表单`变量 */
shouldDisplayCurrentForm: shouldDisplayCurrentForm:
name === 'form' && formInstance && !formInstance.readPretty && !isVariableParsedInOtherContext, ['form', 'filter-form'].includes(name) &&
formInstance &&
!formInstance.readPretty &&
!isVariableParsedInOtherContext,
}; };
}; };