fix(next): fix FormItem styles (#1916)

alibaba · Jul 31, 2021 · 9850f76 · 9850f76
1 parent f5fa145
commit 9850f76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;
+              }
+            }
+          }
         }
       }
     }