合并主分支

处理合并冲突

src/components/auth/AccountModal.test.tsx

@@ -166,7 +166,14 @@ test('direct account entry does not render the settings shell as another dialog'
   renderAccountModal({ entryMode: 'account' });
 
   const accountDialog = screen.getByRole('dialog', { name: '账号信息' });
+  const accountBody = accountDialog.firstElementChild as HTMLElement | null;
+  const accountWrapper = accountBody?.firstElementChild as HTMLElement | null;
   expect(accountDialog).toBeTruthy();
+  expect(accountDialog.style.background).toBe('none');
+  expect(accountDialog.style.borderWidth).toBe('0px');
+  expect(accountDialog.className).toContain('!overflow-visible');
+  expect(accountBody?.className).toContain('!overflow-visible');
+  expect(accountWrapper?.className).toContain('overflow-visible');
   expect(screen.queryByRole('dialog', { name: '设置与账号安全' })).toBeNull();
   expect(screen.queryByText('设置与账号安全')).toBeNull();
   expect(

src/components/auth/AccountModal.tsx

@@ -518,18 +518,26 @@ export function AccountModal({
       authCardClassName={isDirectAccountMode ? '' : undefined}
       panelClassName={
         isDirectAccountMode
-          ? 'relative !max-w-3xl !rounded-none !bg-transparent !shadow-none'
+          ? 'relative !max-w-3xl !overflow-visible !rounded-none !bg-transparent !shadow-none'
           : 'relative !h-[min(100%,calc(100vh-2rem))] !max-w-5xl !rounded-[28px] !p-5 sm:!p-6'
       }
-      bodyClassName="!flex !min-h-0 !flex-1 !overflow-hidden !p-0"
+      bodyClassName={`!flex !min-h-0 !flex-1 !p-0 ${
+        isDirectAccountMode ? '!overflow-visible' : '!overflow-hidden'
+      }`}
       panelStyle={{
         maxHeight: ACCOUNT_MODAL_MAX_HEIGHT,
+        ...(isDirectAccountMode
+          ? {
+              background: 'none',
+              borderWidth: 0,
+            }
+          : {}),
       }}
     >
       <div
         className={
           isDirectAccountMode
-            ? 'relative flex max-h-full w-full max-w-3xl min-h-0 flex-col overflow-hidden'
+            ? 'relative flex max-h-full w-full max-w-3xl min-h-0 flex-col overflow-visible'
             : 'relative flex h-full w-full min-h-0 flex-col overflow-hidden'
         }
         style={{ maxHeight: ACCOUNT_MODAL_MAX_HEIGHT }}