Merge pull request #6 from formilyjs/fix-grid

fix: children not show in FormGrid
formilyjs · Jul 29, 2022 · 352ee55 · 352ee55
2 parents 2471be7 + 40abb2a
commit 352ee55
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/docs/demos/guide/form-grid/native.vue b/docs/demos/guide/form-grid/native.vue
@@ -145,7 +145,6 @@
 import { FormGrid } from '@formily/antdv-x3'
 
 const Cell = (props, { slots }) => {
-  console.log(props)
   return (
     <div
       style={{

diff --git a/packages/components/src/form-grid/index.ts b/packages/components/src/form-grid/index.ts
@@ -95,7 +95,7 @@ const FormGridInner = observer(
         type: Object as PropType<Grid<HTMLElement>>,
       },
     },
-    setup(props) {
+    setup(props, { slots }) {
       const layout = useFormLayout()
 
       const gridInstance = computed(() => {
@@ -126,31 +126,23 @@ const FormGridInner = observer(
         })
       })
 
-      return {
-        prefixCls,
-        root,
-        gridInstance,
-      }
-    },
-    render() {
-      const { prefixCls, gridInstance } = this
-      return h(
-        'div',
-        {
-          class: `${prefixCls}`,
-          style: {
-            gridTemplateColumns: gridInstance.templateColumns,
-            gap: gridInstance.gap,
+      return () => {
+        return h(
+          'div',
+          {
+            class: `${prefixCls}`,
+            style: {
+              gridTemplateColumns: gridInstance.value.templateColumns,
+              gap: gridInstance.value.gap,
+            },
+            ref: root,
           },
-          ref: 'root',
-        },
-        {
-          default: () => this.$slots.default,
-        }
-      )
+          slots
+        )
+      }
     },
   })
-) as any
+)
 
 const FormGridColumn = observer(
   // eslint-disable-next-line vue/one-component-per-file