enhance: (List) adjust the disabled logic so that every field compone…

…nt can be disabled
wakeGISer · Oct 20, 2021 · d665d6d · d665d6d
1 parent 94b0b7d
commit d665d6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/components/form/form-item.less b/src/components/form/form-item.less
@@ -16,11 +16,6 @@
       color: var(--adm-color-danger);
       user-select: none;
     }
-
-    &-disable {
-      color: #666;
-      opacity: 0.4;
-    }
   }
 
   &-footer {

diff --git a/src/components/form/form-item.tsx b/src/components/form/form-item.tsx
@@ -81,15 +81,11 @@ const FormItemLayout: React.FC<FormItemLayoutProps> = props => {
   const hasFeedback = props.hasFeedback || context.hasFeedback
   const layout = props.layout || context.layout
 
-  const formItemLabelClass = classNames(`${classPrefix}-label`, {
-    [`${classPrefix}-label-disable`]: disabled,
-  })
-
   const feedback =
     hasFeedback && meta && meta.errors.length > 0 ? meta.errors[0] : null
 
   const labelElement = label ? (
-    <label className={formItemLabelClass} htmlFor={htmlFor}>
+    <label className={`${classPrefix}-label`} htmlFor={htmlFor}>
       {label}
       {required && <span className={`${classPrefix}-label-required`}>*</span>}
       {help && <span className={`${classPrefix}-label-help`}>{help}</span>}
@@ -109,6 +105,7 @@ const FormItemLayout: React.FC<FormItemLayoutProps> = props => {
       className={classNames(classPrefix, className, {
         [`${classPrefix}-hidden`]: hidden,
       })}
+      disabled={disabled}
       onClick={props.disabled ? undefined : props.onClick}
     >
       {children}
@@ -267,10 +264,6 @@ export const FormItem: FC<FormItemProps> = props => {
             childProps.id = fieldId
           }
 
-          if (disabled) {
-            childProps.disabled = disabled
-          }
-
           // We should keep user origin event handler
           const triggers = new Set<string>([
             ...toArray(trigger),