fix: 修复导航页报错，以及异常捕获优化

ocsjs · Mar 9, 2025 · 322ffd4 · 322ffd4
1 parent 4c62b1f
commit 322ffd4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/packages/web/src/main.ts b/packages/web/src/main.ts
@@ -26,14 +26,18 @@ window.addEventListener('error', function (e) {
 window.addEventListener('unhandledrejection', function (e) {
 	e.promise.catch((e) => {
 		console.error(e);
-		if (errorFilter(e)) {
-			return;
+		try {
+			if (errorFilter(String(e))) {
+				return;
+			}
+			remote.logger.call('error', '未捕获的异步错误', e);
+			notify('未捕获的异步错误', e, 'render-error', {
+				type: 'error',
+				copy: true
+			});
+		} catch (e) {
+			console.error(e);
 		}
-		remote.logger.call('error', '未捕获的异步错误', e);
-		notify('未捕获的异步错误', e, 'render-error', {
-			type: 'error',
-			copy: true
-		});
 	});
 });
 

diff --git a/packages/web/src/pages/bookmarks.vue b/packages/web/src/pages/bookmarks.vue
@@ -147,10 +147,10 @@ onMounted(async () => {
 		const nameEl = document.querySelector('#browser-name');
 		const tagsEl = document.querySelector('#browser-tags');
 		const notesEl = document.querySelector('#browser-notes');
-		console.log(document.querySelector('#data-slot')?.textContent);
-		const { name, tags, notes } = JSON.parse(document.querySelector('#data-slot')?.textContent || '{}');
-
-		if (nameEl && tagsEl && notesEl) {
+		const dataTextContent = document.querySelector('#data-slot')?.textContent || '';
+		console.log('data-slot', dataTextContent);
+		if (nameEl && tagsEl && notesEl && dataTextContent) {
+			const { name = '', tags = [], notes = '' } = JSON.parse(dataTextContent || '{}');
 			nameEl.innerHTML = name || '未知名称';
 			tagsEl.innerHTML = tags.map(
 				(t) => `<span style="background-color: ${t.color};" class="browser-tag">${t.name}</span>`