fix ant-design#9907 (ant-design#9908)

* fix ant-design#9907 * update snapshot
synsuman · Apr 4, 2018 · a402fdd · a402fdd
1 parent d718340
commit a402fdd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap
@@ -20,7 +20,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-0"
               title="Field 0"
             >
@@ -61,7 +61,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-1"
               title="Field 1"
             >
@@ -102,7 +102,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-2"
               title="Field 2"
             >
@@ -143,7 +143,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-3"
               title="Field 3"
             >
@@ -184,7 +184,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-4"
               title="Field 4"
             >
@@ -225,7 +225,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-5"
               title="Field 5"
             >
@@ -266,7 +266,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-6"
               title="Field 6"
             >
@@ -307,7 +307,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-7"
               title="Field 7"
             >
@@ -348,7 +348,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-8"
               title="Field 8"
             >
@@ -389,7 +389,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
             class="ant-form-item-label"
           >
             <label
-              class=""
+              class="ant-form-item-required"
               for="field-9"
               title="Field 9"
             >

diff --git a/components/form/demo/advanced-search.md b/components/form/demo/advanced-search.md
@@ -52,7 +52,12 @@ class AdvancedSearchForm extends React.Component {
       children.push(
         <Col span={8} key={i} style={{ display: i < count ? 'block' : 'none' }}>
           <FormItem label={`Field ${i}`}>
-            {getFieldDecorator(`field-${i}`)(
+            {getFieldDecorator(`field-${i}`, {
+              rules: [{
+                required: true,
+                message: 'Input something!',
+              }],
+            })(
               <Input placeholder="placeholder" />
             )}
           </FormItem>

diff --git a/components/form/style/index.less b/components/form/style/index.less
@@ -554,7 +554,11 @@ form {
 
 .@{ant-prefix}-advanced-search-form {
   .@{form-prefix-cls}-item {
-    margin-bottom: 24px;
+    margin-bottom: @form-item-margin-bottom;
+
+    &-with-help {
+      margin-bottom: @form-item-margin-bottom - @font-size-base * @line-height-base - @form-help-margin-top;
+    }
   }
 }