Compare commits

..

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

2 changed files with 51 additions and 50 deletions

View File

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

View File

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