fix(@uform/atnd/next): fix #97

alibaba · Jun 15, 2019 · 68ed3a3 · 68ed3a3
1 parent ded188e
commit 68ed3a3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/packages/antd/src/form.js b/packages/antd/src/form.js
@@ -453,7 +453,16 @@ const isTableColItem = (path, getSchema) => {
 
 registerFieldMiddleware(Field => {
   return props => {
-    const { name, errors, editable, path, required, schema, getSchema } = props
+    const {
+      name,
+      errors,
+      editable,
+      path,
+      required,
+      schema,
+      schemaPath,
+      getSchema
+    } = props
     if (path.length === 0) return React.createElement(Field, props) // 根节点是不需要包FormItem的
     return React.createElement(
       FormConsumer,
@@ -479,7 +488,7 @@ registerFieldMiddleware(Field => {
             label: schema.title,
             noMinHeight: schema.type === 'object' && !schema['x-component'],
             isTableColItem: isTableColItem(
-              path.slice(0, path.length - 2),
+              schemaPath.slice(0, schemaPath.length - 2),
               getSchema
             ),
             type: schema['x-component'] || schema['type'],

diff --git a/packages/next/src/form.js b/packages/next/src/form.js
@@ -356,7 +356,16 @@ const isTableColItem = (path, getSchema) => {
 
 registerFieldMiddleware(Field => {
   return props => {
-    const { name, editable, errors, path, schema, getSchema, required } = props
+    const {
+      name,
+      editable,
+      errors,
+      path,
+      schemaPath,
+      schema,
+      getSchema,
+      required
+    } = props
     if (path.length === 0) return React.createElement(Field, props) // 根节点是不需要包FormItem的
     return React.createElement(
       FormConsumer,
@@ -382,7 +391,7 @@ registerFieldMiddleware(Field => {
             label: schema.title,
             noMinHeight: schema.type === 'object' && !schema['x-component'],
             isTableColItem: isTableColItem(
-              path.slice(0, path.length - 2),
+              schemaPath.slice(0, schemaPath.length - 2),
               getSchema
             ),
             type: schema['x-component'] || schema['type'],