From d83080b6284b0e4bf31c33fc756175ed28c80068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B1=BC=E5=BC=80=E5=8F=91?= <git@xiaoyu.com>
Date: Wed, 10 Jun 2026 07:46:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=86=E7=A0=81=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E9=AB=98=E5=BA=A6=EF=BC=8C=E9=81=BF=E5=85=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA/=E9=9A=90=E8=97=8F=E6=97=B6=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- SetPasswordModal: errorStyle 从 minHeight 改为固定 height，错误文本条件渲染改为占位渲染
- ResetPasswordModal: 同上
---
 tauri-app/src/components/Modal/ResetPasswordModal.tsx | 8 +++++---
 tauri-app/src/components/Modal/SetPasswordModal.tsx   | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tauri-app/src/components/Modal/ResetPasswordModal.tsx b/tauri-app/src/components/Modal/ResetPasswordModal.tsx
index 0330a7b..b7a9c5a 100644
--- a/tauri-app/src/components/Modal/ResetPasswordModal.tsx
+++ b/tauri-app/src/components/Modal/ResetPasswordModal.tsx
@@ -112,7 +112,9 @@ export default function ResetPasswordModal({ open, onClose }: ResetPasswordModal
     fontSize: '12px',
     color: '#e74c3c',
     marginTop: '4px',
-    minHeight: '18px',
+    height: '18px',
+    lineHeight: '18px',
+    overflow: 'hidden',
   };
 
   const pwdMismatch = confirmPassword.length > 0 && !pwdMatch;
@@ -243,7 +245,7 @@ export default function ResetPasswordModal({ open, onClose }: ResetPasswordModal
                 )}
               </button>
             </div>
-            {pwdTooShort && <div style={errorStyle}>密码至少需要6位</div>}
+            <div style={errorStyle}>{pwdTooShort ? '密码至少需要6位' : ''}</div>
           </div>
 
           {/* 确认密码 */}
@@ -286,7 +288,7 @@ export default function ResetPasswordModal({ open, onClose }: ResetPasswordModal
                 )}
               </button>
             </div>
-            {pwdMismatch && <div style={errorStyle}>两次输入的密码不一致</div>}
+            <div style={errorStyle}>{pwdMismatch ? '两次输入的密码不一致' : ''}</div>
           </div>
         </div>
 
diff --git a/tauri-app/src/components/Modal/SetPasswordModal.tsx b/tauri-app/src/components/Modal/SetPasswordModal.tsx
index 3d4acb9..178fdd9 100644
--- a/tauri-app/src/components/Modal/SetPasswordModal.tsx
+++ b/tauri-app/src/components/Modal/SetPasswordModal.tsx
@@ -107,7 +107,9 @@ export default function SetPasswordModal({
     fontSize: '12px',
     color: '#e74c3c',
     marginTop: '4px',
-    minHeight: '18px',
+    height: '18px',
+    lineHeight: '18px',
+    overflow: 'hidden',
   };
 
   const pwdMismatch = confirmPassword.length > 0 && newPassword !== confirmPassword;
@@ -233,7 +235,7 @@ export default function SetPasswordModal({
                 )}
               </button>
             </div>
-            {pwdTooShort && <div style={errorStyle}>密码至少需要6位</div>}
+            <div style={errorStyle}>{pwdTooShort ? '密码至少需要6位' : ''}</div>
           </div>
 
           <div style={fieldStyle}>
@@ -276,7 +278,7 @@ export default function SetPasswordModal({
                 )}
               </button>
             </div>
-            {pwdMismatch && <div style={errorStyle}>两次输入的密码不一致</div>}
+            <div style={errorStyle}>{pwdMismatch ? '两次输入的密码不一致' : ''}</div>
           </div>
         </div>