Skip to content

fix: 修正 src/pages/install/App.tsx closeWindow 代码 #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyfung1031 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: 修正 src/pages/install/App.tsx closeWindow 代码 #1435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c80462
fix: 修正 closeWindow 代码
cyfung1031 May 10, 2026
7eccfa9
Update App.tsx
cyfung1031 May 10, 2026
3897561
Update App.tsx
cyfung1031 May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions src/pages/install/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

type Permission = PermissionItem[];

let closingWindow = false;
const closeWindow = (doBackwards: boolean) => {
if (doBackwards) {
history.go(-1);
Expand Down Expand Up @@ -314,7 +315,9 @@
};

useEffect(() => {
closingWindow = false; // reset
!loaded && initAsync();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchParams, loaded]);

const [watchFile, setWatchFile] = useState(false);
Expand Down Expand Up @@ -455,6 +458,7 @@
};

const handleInstall = async (options: { closeAfterInstall?: boolean; noMoreUpdates?: boolean } = {}) => {
if (closingWindow) return;
if (!upsertScript) {
Message.error(t("script_info_load_failed")!);
return;
Expand Down Expand Up @@ -498,22 +502,31 @@
}

if (shouldClose) {
setTimeout(() => {
closeWindow(doBackwards);
}, 500);
if (!closingWindow) {
closingWindow = true;
setTimeout(() => {
closeWindow(doBackwards);
}, 500);
}
}
} catch (e) {
const errorMessage = scriptInfo?.userSubscribe ? t("subscribe_failed") : t("install_failed");
Message.error(`${errorMessage}: ${e}`);
}
};

const handleClose = (options?: { noMoreUpdates: boolean }) => {
const handleClose = async (options?: { noMoreUpdates: boolean }) => {
if (closingWindow) return;
const { noMoreUpdates = false } = options || {};
if (noMoreUpdates && scriptInfo && !scriptInfo.userSubscribe) {
scriptClient.setCheckUpdateUrl(scriptInfo.uuid, false);
await scriptClient.setCheckUpdateUrl(scriptInfo.uuid, false);
}
if (!closingWindow) {
closingWindow = true;
setTimeout(() => {
closeWindow(doBackwards);
}, 50);
}
closeWindow(doBackwards);
};

const {
Expand Down Expand Up @@ -630,7 +643,7 @@
return () => {
unmountFileTrack(handle);
};
}, [memoWatchFile]);

Check warning on line 646 in src/pages/install/App.tsx

View workflow job for this annotation

GitHub Actions / Run tests 

React Hook useEffect has missing dependencies: 'localFileHandle', 'scriptInfo?.uuid', 'setupWatchFile', and 'watchFile'. Either include them or remove the dependency array

// 检查是否有 uuid 或 file
const searchParamUrl = searchParams.get("url");
Expand Down
Loading