From 724f828761f6b12d24d53ad358eb85cf0d06f5a8 Mon Sep 17 00:00:00 2001
From: BTMuli <bt-muli@outlook.com>
Date: Fri, 23 May 2025 12:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=94=B9=E4=B8=BA=E5=A4=96=E9=83=A8=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pageHome/ph-position-card.vue | 4 ++--
 src/components/pageWiki/twc-character.vue    | 4 ++--
 src/components/pageWiki/twc-weapon.vue       | 4 ++--
 src/components/viewPost/tp-gameCard.vue      | 4 ++--
 src/pages/WIKI/Character.vue                 | 4 ++--
 src/pages/WIKI/Weapon.vue                    | 4 ++--
 src/utils/TGClient.ts                        | 2 +-
 src/utils/TGWindow.ts                        | 9 ++++-----
 8 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/pageHome/ph-position-card.vue b/src/components/pageHome/ph-position-card.vue
index e277b21a..2241335c 100644
--- a/src/components/pageHome/ph-position-card.vue
+++ b/src/components/pageHome/ph-position-card.vue
@@ -36,7 +36,7 @@ import TMiImg from "@comp/app/t-mi-img.vue";
 import showSnackbar from "@comp/func/snackbar.js";
 import { openUrl } from "@tauri-apps/plugin-opener";
 import { parseLink } from "@utils/linkParser.js";
-import { createObc, createPost } from "@utils/TGWindow.js";
+import { toObcPage, createPost } from "@utils/TGWindow.js";
 import { stamp2LastTime, timestampToDate } from "@utils/toolFunc.js";
 import { computed, onMounted, onUnmounted, ref } from "vue";
 
@@ -72,7 +72,7 @@ function handlePosition(): void {
 
 async function openPosition(): Promise<void> {
   if (props.pos.url === "" && props.pos.content_id !== 0) {
-    await createObc(props.pos.content_id, props.pos.title);
+    await toObcPage(props.pos.content_id);
     return;
   }
   const res = await parseLink(props.pos.url);
diff --git a/src/components/pageWiki/twc-character.vue b/src/components/pageWiki/twc-character.vue
index 58d886d4..729d6eae 100644
--- a/src/components/pageWiki/twc-character.vue
+++ b/src/components/pageWiki/twc-character.vue
@@ -107,7 +107,7 @@ import TItembox, { type TItemBoxData } from "@comp/app/t-itemBox.vue";
 import ToNameCard from "@comp/app/to-nameCard.vue";
 import TopNameCard from "@comp/app/top-nameCard.vue";
 import showSnackbar from "@comp/func/snackbar.js";
-import { createObc } from "@utils/TGWindow.js";
+import { toObcPage } from "@utils/TGWindow.js";
 import { parseHtmlText } from "@utils/toolFunc.js";
 import { computed, onMounted, ref, shallowRef, watch } from "vue";
 import { useRouter } from "vue-router";
@@ -165,7 +165,7 @@ async function toWiki(): Promise<void> {
     showSnackbar.warn(`角色 ${props.item.name} 暂无详情`);
     return;
   }
-  await createObc(props.item.contentId, props.item.name);
+  await toObcPage(props.item.contentId);
 }
 
 async function toBirth(date: string): Promise<void> {
diff --git a/src/components/pageWiki/twc-weapon.vue b/src/components/pageWiki/twc-weapon.vue
index 58af0857..832279c9 100644
--- a/src/components/pageWiki/twc-weapon.vue
+++ b/src/components/pageWiki/twc-weapon.vue
@@ -59,7 +59,7 @@
 <script lang="ts" setup>
 import TItemBox, { type TItemBoxData } from "@comp/app/t-itemBox.vue";
 import showSnackbar from "@comp/func/snackbar.js";
-import { createObc } from "@utils/TGWindow.js";
+import { toObcPage } from "@utils/TGWindow.js";
 import { parseHtmlText } from "@utils/toolFunc.js";
 import { computed, onMounted, ref, shallowRef, watch } from "vue";
 
@@ -108,7 +108,7 @@ async function toWiki(): Promise<void> {
     showSnackbar.warn(`武器 ${props.item.name} 暂无详情`);
     return;
   }
-  await createObc(props.item.contentId, props.item.name);
+  await toObcPage(props.item.contentId);
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/viewPost/tp-gameCard.vue b/src/components/viewPost/tp-gameCard.vue
index ab5ca35a..d8478b80 100644
--- a/src/components/viewPost/tp-gameCard.vue
+++ b/src/components/viewPost/tp-gameCard.vue
@@ -14,7 +14,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { openPath } from "@tauri-apps/plugin-opener";
+import { openUrl } from "@tauri-apps/plugin-opener";
 
 type TpGameCard = {
   insert: {
@@ -55,7 +55,7 @@ type TpGameCardProps = { data: TpGameCard };
 const props = defineProps<TpGameCardProps>();
 
 async function toGame(): Promise<void> {
-  await openPath(`https://www.miyoushe.com/ys/gameCenter/${props.data.insert.reception_card.id}`);
+  await openUrl(`https://www.miyoushe.com/ys/gameCenter/${props.data.insert.reception_card.id}`);
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/pages/WIKI/Character.vue b/src/pages/WIKI/Character.vue
index c98739c2..9a28aba6 100644
--- a/src/pages/WIKI/Character.vue
+++ b/src/pages/WIKI/Character.vue
@@ -28,7 +28,7 @@ import showSnackbar from "@comp/func/snackbar.js";
 import TwcCharacter from "@comp/pageWiki/twc-character.vue";
 import TwcListItem from "@comp/pageWiki/twc-list-item.vue";
 import TwoSelectC, { type SelectedCValue } from "@comp/pageWiki/two-select-c.vue";
-import { createObc } from "@utils/TGWindow.js";
+import { toObcPage } from "@utils/TGWindow.js";
 import { onBeforeMount, ref, shallowRef, watch } from "vue";
 import { useRoute } from "vue-router";
 
@@ -104,7 +104,7 @@ async function toOuter(item?: TGApp.App.Character.WikiBriefInfo): Promise<void>
     showSnackbar.cancel("已取消打开观测枢页面");
     return;
   }
-  await createObc(item.contentId, item.name);
+  await toObcPage(item.contentId);
 }
 </script>
 <style scoped>
diff --git a/src/pages/WIKI/Weapon.vue b/src/pages/WIKI/Weapon.vue
index f9086dd5..2f008948 100644
--- a/src/pages/WIKI/Weapon.vue
+++ b/src/pages/WIKI/Weapon.vue
@@ -28,7 +28,7 @@ import showSnackbar from "@comp/func/snackbar.js";
 import TwcListItem from "@comp/pageWiki/twc-list-item.vue";
 import TwcWeapon from "@comp/pageWiki/twc-weapon.vue";
 import TwoSelectW, { type SelectedWValue } from "@comp/pageWiki/two-select-w.vue";
-import { createObc } from "@utils/TGWindow.js";
+import { toObcPage } from "@utils/TGWindow.js";
 import { onBeforeMount, ref, shallowRef } from "vue";
 import { useRoute } from "vue-router";
 
@@ -89,7 +89,7 @@ async function toOuter(item?: TGApp.App.Weapon.WikiBriefInfo): Promise<void> {
     showSnackbar.cancel("已取消打开观测枢页面");
     return;
   }
-  await createObc(item.contentId, item.name);
+  await toObcPage(item.contentId);
 }
 </script>
 <style lang="css" scoped>
diff --git a/src/utils/TGClient.ts b/src/utils/TGClient.ts
index 5da2c3f0..be8454bb 100644
--- a/src/utils/TGClient.ts
+++ b/src/utils/TGClient.ts
@@ -345,7 +345,7 @@ class Client {
         break;
       }
       case "teyvat_open_webview":
-        window.open(arg.payload);
+        await openUrl(arg.payload);
         break;
       default:
         console.warn(`[customCallback] ${arg.method}`);
diff --git a/src/utils/TGWindow.ts b/src/utils/TGWindow.ts
index 28ae29fe..1bf537cb 100644
--- a/src/utils/TGWindow.ts
+++ b/src/utils/TGWindow.ts
@@ -9,6 +9,7 @@ import showSnackbar from "@comp/func/snackbar.js";
 import { core, webviewWindow, window as TauriWindow } from "@tauri-apps/api";
 import { PhysicalSize } from "@tauri-apps/api/dpi";
 import { currentMonitor, WindowOptions } from "@tauri-apps/api/window";
+import { openUrl } from "@tauri-apps/plugin-opener";
 import { type } from "@tauri-apps/plugin-os";
 
 import TGLogger from "./TGLogger.js";
@@ -73,15 +74,13 @@ export async function createPost(
 
 /**
  * @description 打开观测枢
- * @since Beta 0.6.2
- * @deprecated 该方法已弃用，使用 openPath 替代
+ * @since Beta 0.7.6
  * @param {string} contentId
- * @param {string} label
  * @returns {Promise<void>}
  */
-export async function createObc(contentId: number, label: string): Promise<void> {
+export async function toObcPage(contentId: number): Promise<void> {
   const obcUrl = `https://bbs.mihoyo.com/ys/obc/content/${contentId}/detail?bbs_presentation_style=no_header`;
-  await createTGWindow(obcUrl, "Sub_window", `Content_${contentId}_${label}`, 1200, 800, true);
+  await openUrl(obcUrl);
 }
 
 /**