Merge branch 'next' into develop

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);
           }

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,
   };
 };