From 237f41da68592ede236b722157c91f9d7b45db1b Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Fri, 26 Mar 2021 00:12:49 +0800
Subject: [PATCH] fix(form): ensure that the hidden fields of the form are
 verified properly, fix #413

---
 CHANGELOG.zh_CN.md                              | 1 +
 src/components/Form/src/components/FormItem.vue | 4 ++--
 src/design/ant/index.less                       | 2 +-
 src/views/demo/form/RuleForm.vue                | 8 ++++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 5589cfbe..3010ce5a 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -20,6 +20,7 @@
 - 确保 progress 进度条正确关闭
 - 修复表格勾选列配置失效问题
 - 确保一级菜单可以被隐藏
+- 确保表单隐藏字段校验正常
 
 ### 🎫 Chores
 
diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
index 6f40b601..3bf996c5 100644
--- a/src/components/Form/src/components/FormItem.vue
+++ b/src/components/Form/src/components/FormItem.vue
@@ -156,9 +156,9 @@
           if (!isShow) {
             rule.required = false;
           }
-          if (rule.required && component) {
+          if (component) {
             if (!Reflect.has(rule, 'type')) {
-              rule.type = 'string';
+              rule.type = component === 'InputNumber' ? 'number' : 'string';
             }
             const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel')
               ? rulesMessageJoinLabel
diff --git a/src/design/ant/index.less b/src/design/ant/index.less
index 22c2d298..ff3d5fb3 100644
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@@ -14,7 +14,7 @@
 }
 
 span.anticon:not(.app-iconify) {
-  vertical-align: 0.135em;
+  vertical-align: 0.125em !important;
 }
 
 .ant-back-top {
diff --git a/src/views/demo/form/RuleForm.vue b/src/views/demo/form/RuleForm.vue
index de60e572..efe02bb5 100644
--- a/src/views/demo/form/RuleForm.vue
+++ b/src/views/demo/form/RuleForm.vue
@@ -38,6 +38,14 @@
       },
       required: true,
     },
+    {
+      field: 'id',
+      label: 'id',
+      required: true,
+      defaultValue: 0,
+      component: 'InputNumber',
+      show: false,
+    },
     {
       field: 'field3',
       component: 'DatePicker',
-- 
GitLab