From 843f47346a4bc5121441d331692f287bdc4792c9 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 30 Apr 2024 13:39:25 +0800 Subject: [PATCH] Fix(Tool): Fix the bug that can not load when switch between two tools Fix the bug that can not load when switch between two tools. Optimize navigate when can not find tool. --- src/pages/System/Tools/Code.tsx | 6 ++---- src/pages/System/Tools/Execute.tsx | 6 ++---- src/pages/Tools/Edit.tsx | 6 ++---- src/pages/Tools/Source.tsx | 10 +++------- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/pages/System/Tools/Code.tsx b/src/pages/System/Tools/Code.tsx index 8a34820..a5d8e89 100644 --- a/src/pages/System/Tools/Code.tsx +++ b/src/pages/System/Tools/Code.tsx @@ -62,9 +62,7 @@ const Code = () => { break case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') - setTimeout(() => { - navigateToRepository(navigate) - }, 3000) + navigateToRepository(navigate) break default: void message.error('获取工具信息失败,请稍后重试') @@ -78,7 +76,7 @@ const Code = () => { useEffect(() => { getTool() - }, []) + }, [id]) return ( <> diff --git a/src/pages/System/Tools/Execute.tsx b/src/pages/System/Tools/Execute.tsx index 9e35825..41455f7 100644 --- a/src/pages/System/Tools/Execute.tsx +++ b/src/pages/System/Tools/Execute.tsx @@ -51,9 +51,7 @@ const Execute = () => { break case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') - setTimeout(() => { - navigateToTools(navigate) - }, 3000) + navigateToTools(navigate) break default: void message.error('获取工具信息失败,请稍后重试') @@ -67,7 +65,7 @@ const Execute = () => { useEffect(() => { getTool() - }, []) + }, [id]) return ( diff --git a/src/pages/Tools/Edit.tsx b/src/pages/Tools/Edit.tsx index 85dcc5f..aee142c 100644 --- a/src/pages/Tools/Edit.tsx +++ b/src/pages/Tools/Edit.tsx @@ -258,9 +258,7 @@ const Edit = () => { break case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') - setTimeout(() => { - navigateToRepository(navigate) - }, 3000) + navigateToRepository(navigate) break default: void message.error('获取工具信息失败,请稍后重试') @@ -327,7 +325,7 @@ const Edit = () => { return } getTool() - }, []) + }, [toolId, searchParams]) const drawerToolbar = ( diff --git a/src/pages/Tools/Source.tsx b/src/pages/Tools/Source.tsx index a229115..7c7244e 100644 --- a/src/pages/Tools/Source.tsx +++ b/src/pages/Tools/Source.tsx @@ -49,9 +49,7 @@ const Source = () => { break case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') - setTimeout(() => { - navigateToRepository(navigate) - }, 3000) + navigateToRepository(navigate) break default: void message.error('获取工具信息失败,请稍后重试') @@ -70,9 +68,7 @@ const Source = () => { return } if (username === '!' && !getLoginStatus()) { - setTimeout(() => { - navigateToRepository(navigate) - }, 3000) + navigateToRepository(navigate) return } if (username !== '!' && ver) { @@ -84,7 +80,7 @@ const Source = () => { return } getTool() - }, []) + }, [username, toolId, ver, searchParams]) return (