feat: recursion field props recursion (#3966)

* feat: recursion field props recursion * feat: cn doc chenged
alibaba · Oct 20, 2023 · 72d533f · 72d533f
1 parent 83b7473
commit 72d533f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/packages/react/docs/api/components/RecursionField.md b/packages/react/docs/api/components/RecursionField.md
@@ -15,6 +15,7 @@ interface IRecursionFieldProps {
   schema: ISchema //Field schema
   name?: string //Path name
   basePath?: FormPathPattern //base path
+  propsRecursion?: boolean //Whether to recursiveliy pass mapProperties and filterProperties
   onlyRenderProperties?: boolean //Whether to only render properties
   onlyRenderSelf?: boolean //Whether to only render itself without rendering properties
   mapProperties?: (schema: Schema, name: string) => Schema //schema properties mapper, mainly used to rewrite the schema

diff --git a/packages/react/docs/api/components/RecursionField.zh-CN.md b/packages/react/docs/api/components/RecursionField.zh-CN.md
@@ -15,6 +15,7 @@ interface IRecursionFieldProps {
   schema: ISchema //字段schema
   name?: string //路径名称
   basePath?: FormPathPattern //基础路径
+  propsRecursion?: boolean //是否递归传递 mapProperties 和 filterProperties
   onlyRenderProperties?: boolean //是否只渲染properties
   onlyRenderSelf?: boolean //是否只渲染自身，不渲染properties
   mapProperties?: (schema: Schema, name: string) => Schema //schema properties映射器，主要用于改写schema

diff --git a/packages/react/src/components/RecursionField.tsx b/packages/react/src/components/RecursionField.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useMemo } from 'react'
-import { isFn, isValid } from '@formily/shared'
+import { isBool, isFn, isValid } from '@formily/shared'
 import { GeneralField } from '@formily/core'
 import { Schema } from '@formily/json-schema'
 import { SchemaContext } from '../shared'
@@ -49,6 +49,19 @@ export const RecursionField: ReactFC<IRecursionFieldProps> = (props) => {
               return null
             }
           }
+          if (isBool(props.propsRecursion) && props.propsRecursion) {
+            return (
+              <RecursionField
+                propsRecursion={true}
+                filterProperties={props.filterProperties}
+                mapProperties={props.mapProperties}
+                schema={schema}
+                key={`${index}-${name}`}
+                name={name}
+                basePath={base}
+              />
+            )
+          }
           return (
             <RecursionField
               schema={schema}

diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -99,6 +99,7 @@ export interface IRecursionFieldProps {
   schema: ISchema
   name?: SchemaKey
   basePath?: FormPathPattern
+  propsRecursion?: boolean
   onlyRenderProperties?: boolean
   onlyRenderSelf?: boolean
   mapProperties?: ISchemaMapper