fix(form): PassWord getPercent support status

jaulz · Nov 15, 2023 · 7c1bf34 · 7c1bf34
1 parent 5abe403
commit 7c1bf34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/form/src/components/LoginForm/demos/login-form.tsx b/packages/form/src/components/LoginForm/demos/login-form.tsx
@@ -88,7 +88,7 @@ export default () => {
                     }
                     return 'poor';
                   },
-                  getPercent: (value) => {
+                  getPercent: (status, value) => {
                     if (value && value.length > 12) {
                       return 100;
                     }

diff --git a/packages/form/src/components/Text/index.tsx b/packages/form/src/components/Text/index.tsx
@@ -43,7 +43,7 @@ const passwordProgressMap = {
 export type PasssWordStrengthProps = {
   getStatus?: (value?: string) => PasswordStatus;
   statusRender?: (status: PasswordStatus, value?: string) => React.ReactNode;
-  getPercent?: (value?: string) => number;
+  getPercent?: (status: PasswordStatus, value?: string) => number;
   popoverProps?: PopoverProps;
   strengthText?: React.ReactNode;
 };
@@ -73,7 +73,7 @@ const PasssWordStrength: React.FC<
               style={{
                 width: '100%',
               }}
-              percent={props.getPercent?.(value) || 0}
+              percent={props.getPercent?.(status, value) || 0}
               showInfo={false}
             />
           ) : null;
@@ -95,13 +95,15 @@ const PasssWordStrength: React.FC<
               >
                 {props?.statusRender?.(status, value)}
                 {getPasswordProgressDom()}
-                <div
-                  style={{
-                    marginTop: 10,
-                  }}
-                >
-                  <span>{props.strengthText}</span>
-                </div>
+                {props.strengthText ? (
+                  <div
+                    style={{
+                      marginTop: 10,
+                    }}
+                  >
+                    <span>{props.strengthText}</span>
+                  </div>
+                ) : null}
               </div>
             }
             overlayStyle={{