front_library
/
zy-react-library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: front_library:983ca0810659dec68b94082b7b5dee37a8fdab55
Branches Tags
front_library:master
..
compare: front_library:431e3cbc375bd46b806fae3226a39f3665c9d8c1
Branches Tags
front_library:master

No commits in common. "983ca0810659dec68b94082b7b5dee37a8fdab55" and "431e3cbc375bd46b806fae3226a39f3665c9d8c1" have entirely different histories.
983ca08106 ... 431e3cbc37

2 changed files with 51 additions and 50 deletions
Show Stats Expand all files Collapse all files

99
components/FormBuilder/FormItemsRenderer.js
View File

@ -21,13 +21,13 @@ const { RangePicker } = DatePicker;
* 表单项渲染器组件 * 表单项渲染器组件
*/ */
const FormItemsRenderer = ({ const FormItemsRenderer = ({
options, options,
labelCol, labelCol,
span = 12, span = 12,
collapse = false, collapse = false,
useAutoGenerateRequired = true, useAutoGenerateRequired = true,
initialValues, initialValues,
}) => { }) => {
const form = Form.useFormInstance(); const form = Form.useFormInstance();
// 获取表单值，优先使用 initialValues // 获取表单值，优先使用 initialValues
@ -297,39 +297,40 @@ const FormItemsRenderer = ({
return ( return (
option.customizeRender option.customizeRender
? (renderFormControl(option)) ? (renderFormControl(option))
: ( : (() => {
<Form.Item // 支持动态计算 hidden
key={option.name || index} const hidden = typeof option.hidden === "function"
noStyle ? option.hidden(getFormValues())
shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate} : (option.hidden ?? false);
dependencies={option.dependencies || option?.componentProps?.dependencies}
>
{() => {
// 支持动态计算 hidden
const hidden = typeof option.hidden === "function"
? option.hidden(getFormValues())
: (option.hidden ?? false);
if (hidden) if (hidden)
return null; return null;
return ( return (
<Col key={option.name || index} span={itemSpan} style={style}> <Col key={option.name || index} span={itemSpan} style={style}>
<Form.Item <Form.Item
name={option.name} noStyle
label={renderLabel(option)} shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate}
rules={getRules(option)} dependencies={option.dependencies || option?.componentProps?.dependencies}
labelCol={itemLabelCol} >
wrapperCol={itemWrapperCol} {() => {
{...getFormItemProps(option)} return (
> <Form.Item
{renderFormControl(option)} name={option.name}
</Form.Item> label={renderLabel(option)}
</Col> rules={getRules(option)}
); labelCol={itemLabelCol}
}} wrapperCol={itemWrapperCol}
</Form.Item> {...getFormItemProps(option)}
) >
{renderFormControl(option)}
</Form.Item>
);
}}
</Form.Item>
</Col>
);
})()
); );
} }
@ -348,17 +349,17 @@ const FormItemsRenderer = ({
option.customizeRender option.customizeRender
? (renderFormControl(option)) ? (renderFormControl(option))
: ( : (
<Form.Item <Form.Item
name={option.name} name={option.name}
label={renderLabel(option)} label={renderLabel(option)}
rules={getRules(option)} rules={getRules(option)}
labelCol={itemLabelCol} labelCol={itemLabelCol}
wrapperCol={itemWrapperCol} wrapperCol={itemWrapperCol}
{...getFormItemProps(option)} {...getFormItemProps(option)}
> >
{renderFormControl(option)} {renderFormControl(option)}
</Form.Item> </Form.Item>
) )
} }
</Col> </Col>
); );

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "zy-react-library", "name": "zy-react-library",
"private": false, "private": false,
"version": "1.0.27", "version": "1.0.26",
"type": "module", "type": "module",
"description": "", "description": "",
"author": "LiuJiaNan", "author": "LiuJiaNan",