From 43a45b7c996c84f19d00cb9754277b943daf9a10 Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: 星期日, 07 三月 2021 23:37:57 +0800
Subject: [PATCH] fix(form): ensure that the Form component does not verify hidden form items
---
src/components/Form/src/components/FormItem.tsx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/components/Form/src/components/FormItem.tsx b/src/components/Form/src/components/FormItem.tsx
index e2b6223..a2416a8 100644
--- a/src/components/Form/src/components/FormItem.tsx
+++ b/src/components/Form/src/components/FormItem.tsx
@@ -97,7 +97,7 @@
return disabled;
});
- function getShow() {
+ function getShow(): { isShow: boolean; isIfShow: boolean } {
const { show, ifShow } = props.schema;
const { showAdvancedButton } = props.formProps;
const itemIsAdvanced = showAdvancedButton
@@ -151,6 +151,10 @@
const { rulesMessageJoinLabel: globalRulesMessageJoinLabel } = props.formProps;
if (requiredRuleIndex !== -1) {
const rule = rules[requiredRuleIndex];
+ const { isShow } = getShow();
+ if (!isShow) {
+ rule.required = false;
+ }
if (rule.required && component) {
if (!Reflect.has(rule, 'type')) {
rule.type = 'string';
--
Gitblit v1.8.0