Commit f8cb45b3 authored by 杨子龙's avatar 杨子龙

- 增加自定义组件传入

parent 3bf8eda9
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import React, { useMemo, useContext, forwardRef, useImperativeHandle, useState, useEffect } from 'react' import React, { useMemo, useContext, forwardRef, useImperativeHandle, useState, useEffect } from 'react'
import FormRender, { useForm } from 'form-render' import FormRender, { useForm } from 'form-render'
import { ConfigProvider, Spin } from 'antd' import { ConfigProvider, Spin } from 'antd'
import widgets from '../widgets' import baseWidgets from '../widgets'
import { isObject, getFieldInfo } from '../../utils' import { isObject, getFieldInfo } from '../../utils'
import { getWatch } from './watch' import { getWatch } from './watch'
import styles from '../../main.less' import styles from '../../main.less'
...@@ -28,7 +28,7 @@ const XRender = (props, ref) => { ...@@ -28,7 +28,7 @@ const XRender = (props, ref) => {
} }
)) ))
const { schemaValues, disabledFields, disabled, codes, env, firstCall } = props const { schemaValues, disabledFields, disabled, codes, env, firstCall , widgets = {} } = props
window.pandaXform = { window.pandaXform = {
codes, codes,
env, env,
...@@ -184,6 +184,13 @@ const XRender = (props, ref) => { ...@@ -184,6 +184,13 @@ const XRender = (props, ref) => {
window.tableLocal = [] window.tableLocal = []
}, []) }, [])
const widgetsObj = {
...baseWidgets,
...widgets
}
console.log(widgets);
return ( return (
<div className={styles.formRender}> <div className={styles.formRender}>
<FormRender <FormRender
...@@ -194,7 +201,7 @@ const XRender = (props, ref) => { ...@@ -194,7 +201,7 @@ const XRender = (props, ref) => {
mapping={{ mapping={{
object: 'Header', object: 'Header',
}} }}
widgets={widgets} widgets={widgetsObj}
watch={watch} watch={watch}
onMount={onMount} onMount={onMount}
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment