fix(schema-renderer): fix schema field lazy state (#999)

alibaba · Aug 16, 2020 · 8faab44 · 8faab44
1 parent 700be1d
commit 8faab44
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/packages/react-schema-renderer/src/components/SchemaField.tsx b/packages/react-schema-renderer/src/components/SchemaField.tsx
@@ -159,21 +159,22 @@ export const SchemaField: React.FunctionComponent<ISchemaFieldProps> = (
     )
   }
 
+  const renderProperties = () => {
+    return fieldSchema.mapProperties((schema: Schema, key: string) => {
+      const childPath = path.concat(key)
+      return (
+        <SchemaField
+          schema={schema}
+          key={childPath.toString()}
+          path={childPath}
+        />
+      )
+    })
+  }
+
   if (fieldSchema.isObject() && !schemaComponent) {
-    const properties = fieldSchema.mapProperties(
-      (schema: Schema, key: string) => {
-        const childPath = path.concat(key)
-        return (
-          <SchemaField
-            schema={schema}
-            key={childPath.toString()}
-            path={childPath}
-          />
-        )
-      }
-    )
     if (path.length == 0 || props.onlyRenderProperties) {
-      return <Fragment>{properties}</Fragment>
+      return <Fragment>{renderProperties()}</Fragment>
     }
     return renderFieldDelegate(props => {
       const renderComponent = () => {
@@ -186,7 +187,7 @@ export const SchemaField: React.FunctionComponent<ISchemaFieldProps> = (
         return React.createElement(
           formRegistry.formItemComponent,
           props,
-          properties
+          renderProperties()
         )
       }
       if (isFn(schemaRenderer)) {