fix: 修复软件关闭前数据无法正常保存的BUG

Author: enncy

packages/web/src/pages/index.vue

@@ -150,7 +150,7 @@ const state = reactive({
 });
 
 // 监听软件关闭
-onUnmounted(() => closeAllBrowser(false));
+onUnmounted(() => closeAllBrowser());
 
 onMounted(async () => {
 	try {
@@ -270,8 +270,22 @@ onMounted(async () => {
 	}
 });
 
-ipcRenderer.on('close', () => {
-	saveStoreToLocal(store);
+/**
+ * 全局唯一关闭处理地方
+ */
+ipcRenderer.on('close', async () => {
+	console.log('关闭浏览器中...');
+	const res = await closeAllBrowser();
+	if (res === false) {
+		console.log('有浏览器拒绝关闭，取消退出');
+		return;
+	}
+	console.log('保存数据中...');
+	const m = Modal.info({ content: '正在保存数据...', closable: false, maskClosable: false, footer: false });
+	await saveStoreToLocal(store);
+	m.close();
+	console.log('数据已保存');
+	remote.app.call('exit', 0);
 });
 
 function clickMenu(route: RouteRecordRaw & { meta: { title: string } }) {

packages/web/src/utils/browser.ts

@@ -180,42 +180,45 @@ export async function forceClearBrowserCache(title: string, userDataDirsFolder:
 	modal.close();
 }
 
-export async function closeAllBrowser(quit: boolean) {
+/**
+ * @returns 是否同意关闭软件
+ */
+export async function closeAllBrowser() {
 	if (processes.length) {
-		Modal.warning({
-			content: '还有浏览器正在运行，您确定关闭软件吗？',
-			title: '警告',
-			maskClosable: true,
-			closable: true,
-			alignCenter: true,
-			hideCancel: false,
-			onOk: async () => {
-				const m = Modal.info({ content: '正在关闭所有浏览器...', closable: false, maskClosable: false, footer: false });
-
-				const close = () => {
-					if (quit) {
-						remote.app.call('exit');
+		return new Promise<boolean>((resolve, reject) => {
+			Modal.warning({
+				content: '还有浏览器正在运行，您确定关闭软件吗？',
+				title: '警告',
+				maskClosable: true,
+				closable: true,
+				alignCenter: true,
+				hideCancel: false,
+				onOk: async () => {
+					const m = Modal.info({
+						content: '正在关闭所有浏览器...',
+						closable: false,
+						maskClosable: false,
+						footer: false
+					});
+
+					// 最久5秒后关闭
+					const timeout = setTimeout(close, 5000);
+					try {
+						for (const process of processes) {
+							await process.close();
+							await sleep(100);
+						}
+					} catch (err) {
+						Message.error(String(err));
 					}
+					clearTimeout(timeout);
 					m.close();
-				};
-
-				// 最久5秒后关闭
-				const timeout = setTimeout(close, 5000);
-				try {
-					for (const process of processes) {
-						await process.close();
-						await sleep(100);
-					}
-				} catch (err) {
-					Message.error(String(err));
+					resolve(true);
+				},
+				onCancel() {
+					resolve(false);
 				}
-				clearTimeout(timeout);
-				close();
-			}
+			});
 		});
-	} else {
-		if (quit) {
-			remote.app.call('exit');
-		}
 	}
 }

packages/web/src/utils/ipc.ts

@@ -1,16 +1,13 @@
 import { UpdateInformationResource } from '@ocs-desktop/common';
 import { store } from '../store';
 import { electron } from '../utils/node';
-import { closeAllBrowser } from './browser';
 import { notify } from './notify';
 import { Modal } from '@arco-design/web-vue';
 import { h } from 'vue';
 import { remote } from './remote';
 const { ipcRenderer } = electron;
 
 export function activeIpcRenderListener() {
-	ipcRenderer.on('close', () => closeAllBrowser(true));
-
 	/** 如果正在更新的话，获取更新进度 */
 	ipcRenderer.on('update-download', (e, rate, totalLength, chunkLength) => {
 		notify(