From 9850f766d3a496af46f81e9a2c3559f7d9eb4b92 Mon Sep 17 00:00:00 2001
From: Janry <zhili.wzl@alibaba-inc.com>
Date: Sat, 31 Jul 2021 15:44:51 +0800
Subject: [PATCH] fix(next): fix FormItem styles (#1916)

---
 packages/next/src/__builtins__/mapStatus.ts |  1 +
 packages/next/src/form-item/index.tsx       |  2 +-
 packages/next/src/form-item/main.scss       | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/next/src/__builtins__/mapStatus.ts b/packages/next/src/__builtins__/mapStatus.ts
index 846619dbc68..d88bb416146 100644
--- a/packages/next/src/__builtins__/mapStatus.ts
+++ b/packages/next/src/__builtins__/mapStatus.ts
@@ -6,6 +6,7 @@ export const mapStatus = (props: any, field: GeneralField) => {
     if (field['loading'] || field?.['validating']) return 'loading'
     if (field['invalid']) return 'error'
     if (field['warnings']?.length) return 'warning'
+    return field.decoratorProps?.feedbackStatus
   }
   return {
     ...props,
diff --git a/packages/next/src/form-item/index.tsx b/packages/next/src/form-item/index.tsx
index fd2977cf0ab..c34336af6b1 100644
--- a/packages/next/src/form-item/index.tsx
+++ b/packages/next/src/form-item/index.tsx
@@ -327,7 +327,7 @@ export const BaseItem: React.FC<IFormItemProps> = (props) => {
               [`${prefix}-focus`]: active,
             })}
           >
-            <FormLayoutShallowContext.Provider value={undefined}>
+            <FormLayoutShallowContext.Provider value={{ size }}>
               {formatChildren}
             </FormLayoutShallowContext.Provider>
             {feedbackIcon && (
diff --git a/packages/next/src/form-item/main.scss b/packages/next/src/form-item/main.scss
index 0af3c2be9d2..74fa7e04889 100644
--- a/packages/next/src/form-item/main.scss
+++ b/packages/next/src/form-item/main.scss
@@ -141,6 +141,20 @@
           border: none !important;
           box-shadow: none !important;
           outline: none;
+
+          .#{$css-prefix}input-control {
+            margin-right: 0;
+            padding-right: 0;
+            .#{$css-prefix}icon {
+              display: none;
+            }
+
+            .#{$css-prefix}input-hint-wrap {
+              .#{$css-prefix}icon {
+                display: block;
+              }
+            }
+          }
         }
       }
     }