From f964d25bfacc939075868785ce1db47bee541bd6 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Mon, 28 Apr 2025 17:48:12 +0800
Subject: [PATCH] fix: field linkage rules in filter form block missing
 'current form' variable (#6794)

---
 .../core/client/src/schema-settings/LinkageRules/index.tsx   | 1 -
 .../schema-settings/VariableInput/hooks/useFormVariable.ts   | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core/client/src/schema-settings/LinkageRules/index.tsx b/packages/core/client/src/schema-settings/LinkageRules/index.tsx
index b2dbb2bb3e..530cb892ce 100644
--- a/packages/core/client/src/schema-settings/LinkageRules/index.tsx
+++ b/packages/core/client/src/schema-settings/LinkageRules/index.tsx
@@ -116,7 +116,6 @@ export const FormLinkageRules = withDynamicSchemaProps(
       returnScope ??
       ((options) =>
         options.filter((v) => {
-          console.log(category);
           if (category === LinkageRuleCategory.block) {
             return !['$nForm', '$nRecord'].includes(v.value);
           }
diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts
index ddf2f76f1f..56cde061fa 100644
--- a/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts
+++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts
@@ -78,7 +78,10 @@ export const useCurrentFormContext = ({ form: _form }: Pick<Props, 'form'> = {})
     currentFormCtx: formInstance?.values,
     /** 用来判断是否可以显示`当前表单`变量 */
     shouldDisplayCurrentForm:
-      name === 'form' && formInstance && !formInstance.readPretty && !isVariableParsedInOtherContext,
+      ['form', 'filter-form'].includes(name) &&
+      formInstance &&
+      !formInstance.readPretty &&
+      !isVariableParsedInOtherContext,
   };
 };