diff --git a/src/Common/Request.ts b/src/Common/Request.ts
index 6542ba72d..7288481c3 100644
--- a/src/Common/Request.ts
+++ b/src/Common/Request.ts
@@ -3,7 +3,7 @@ import { ShowLinesToaster } from "../UI/Components/Toaster";
 import { TopPanelStore } from "../UI/Store/TopPanelStore";
 import { ChangeZoneUrls, BuyCadUrl, ImgsUrl } from "./HostUrl";
 import { ReportError } from "./ErrorMonitoring";
-import { StoreageKeys } from "./StoreageKeys";
+import { userConfigStore } from "../UI/Store/UserConfigStore";
 
 export enum DirectoryId
 {
@@ -68,10 +68,10 @@ export async function Post(url: string, body?: BodyInit, isShowErrMsg = true): P
                     timeout: 8888
                 }, "44444");
             case RequestStatus.NoLogin:
-                localStorage.setItem(StoreageKeys.IsLogin, "");
                 store.isLogin = false;
                 store.m_FileManageOpen = false;
                 store.openMain = true;
+                userConfigStore.ClearUserData();
                 break;
             case RequestStatus.NoBuy:
             case RequestStatus.NoBuy1:
diff --git a/src/UI/Components/Modal/ModalStyle/Modal.less b/src/UI/Components/Modal/ModalStyle/Modal.less
index feed5e640..441474706 100644
--- a/src/UI/Components/Modal/ModalStyle/Modal.less
+++ b/src/UI/Components/Modal/ModalStyle/Modal.less
@@ -202,10 +202,6 @@
         &>div {
             min-height: unset;
             height: 100%;
-
-            &>div {
-                height: 100%;
-            }
         }
     }
 }
diff --git a/src/UI/Components/Panel.tsx b/src/UI/Components/Panel.tsx
index 71a78532b..48c4c64d7 100644
--- a/src/UI/Components/Panel.tsx
+++ b/src/UI/Components/Panel.tsx
@@ -4,7 +4,6 @@ import * as React from 'react';
 import { app } from '../../ApplicationServices/Application';
 import { SignUrl } from '../../Common/HostUrl';
 import { Post, RequestStatus } from '../../Common/Request';
-import { StoreageKeys } from "../../Common/StoreageKeys";
 import { FileServer } from '../../DatabaseServices/FileServer';
 import { commandMachine } from '../../Editor/CommandMachine';
 import { CommandState } from '../../Editor/CommandState';
@@ -14,10 +13,8 @@ import { TopPanelStore } from '../Store/TopPanelStore';
 import { SettingPanel } from './SettingPanel/SettingPanel';
 import SoucePanel from './SourceManage/SoucePanel';
 import { AppToaster } from './Toaster';
-import { RemoveCustonCommand } from '../../Editor/CommandRegister';
 import { CommandNames } from '../../Common/CommandNames';
-import { appCache } from '../../Common/AppCache';
-import { templateTagCommand } from '../../Add-on/Template/TemplateTagCommand';
+import { userConfigStore } from '../Store/UserConfigStore';
 
 interface TopPanelState
 {
@@ -77,11 +74,7 @@ export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}>
         let data = await Post(SignUrl.loginOut);
         if (data.err_code === RequestStatus.Ok)
         {
-            RemoveCustonCommand();
-            localStorage.removeItem(StoreageKeys.IsLogin);
-            templateTagCommand.ClearTagList();
-            appCache.clear();
-            app.WebSocket.Close();
+            userConfigStore.ClearUserData();
         }
     };
     render()
diff --git a/src/UI/Store/UserConfigStore.ts b/src/UI/Store/UserConfigStore.ts
index e7bdf9a80..ba028cd49 100644
--- a/src/UI/Store/UserConfigStore.ts
+++ b/src/UI/Store/UserConfigStore.ts
@@ -26,7 +26,7 @@ import { FileServer } from "../../DatabaseServices/FileServer";
 import { CommandServer } from "../../DatabaseServices/CommandServer";
 import { TemplateTagCommand, templateTagCommand } from "../../Add-on/Template/TemplateTagCommand";
 import { GetIndexDBID } from "../../Common/Utils";
-import { RegistCustomCommand } from "../../Editor/CommandRegister";
+import { RegistCustomCommand, RemoveCustonCommand } from "../../Editor/CommandRegister";
 import { updateBoardInfoStore } from "./UpdateBoardInfoStore";
 
 type BehindConfigType = { option: BehindBoardOption, processData: BoardProcessOption, grooveData: IGrooveOption; };
@@ -479,6 +479,15 @@ export class UserConfigStore extends Singleton
             });
         }
     }
+    ClearUserData()
+    {
+        RemoveCustonCommand();
+        localStorage.removeItem(StoreageKeys.IsLogin);
+        templateTagCommand.ClearTagList();
+        appCache.clear();
+        app.Editor.ModalManage.DestoryAll();
+        app.WebSocket.Close();
+    }
 }
 
 export const userConfigStore = UserConfigStore.GetInstance() as UserConfigStore;