From 869965ff857b5c95fc8ed99a883915d7907a92da Mon Sep 17 00:00:00 2001
From: BTMuli <bt-muli@outlook.com>
Date: Mon, 22 Dec 2025 19:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20=E9=87=8D=E6=9E=84=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E8=B4=A6=E5=8F=B7=E5=88=87=E6=8D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E9=99=8D=E4=BD=8E=E4=BA=A4=E4=BA=92=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app/t-sidebar.vue   |  70 ++++++++--
 src/components/app/to-switchAc.vue | 199 -----------------------------
 2 files changed, 56 insertions(+), 213 deletions(-)
 delete mode 100644 src/components/app/to-switchAc.vue

diff --git a/src/components/app/t-sidebar.vue b/src/components/app/t-sidebar.vue
index c26c93ba..ea24df2c 100644
--- a/src/components/app/t-sidebar.vue
+++ b/src/components/app/t-sidebar.vue
@@ -247,15 +247,35 @@
           </v-list>
         </v-menu>
         <!-- 切换账号 -->
-        <v-list-item
+        <v-menu
           v-if="isLogin"
           :disabled="isTryLogin"
-          :title.attr="'切换账号'"
-          prepend-icon="mdi-account-switch"
-          @click="trySwitchAccount()"
+          :open-on-click="true"
+          location="end"
+          @update:model-value="(v) => (v ? loadAllGameAc() : {})"
         >
-          <v-list-item-title>切换账号</v-list-item-title>
-        </v-list-item>
+          <template #activator="{ props }">
+            <v-list-item :title.attr="'切换账号'" prepend-icon="mdi-account-switch" v-bind="props">
+              <v-list-item-title>切换账号</v-list-item-title>
+            </v-list-item>
+          </template>
+          <v-list :nav="true" class="side-list-menu">
+            <v-list-item
+              v-for="ac in allGameAc"
+              :key="ac.gameUid"
+              class="side-item-menu sub"
+              @click="trySwitchGameAccount(ac)"
+            >
+              <v-list-item-title>{{ ac.nickname }}</v-list-item-title>
+              <v-list-item-subtitle> {{ ac.gameUid }}({{ ac.regionName }})</v-list-item-subtitle>
+              <template #append>
+                <div v-if="ac.gameUid === account.gameUid" title="当前登录账号">
+                  <v-icon color="green">mdi-check</v-icon>
+                </div>
+              </template>
+            </v-list-item>
+          </v-list>
+        </v-menu>
         <!-- 主题切换 -->
         <v-list-item
           :prepend-icon="theme === 'default' ? 'mdi-weather-night' : 'mdi-weather-sunny'"
@@ -276,7 +296,6 @@
   </v-navigation-drawer>
   <vp-overlay-follow v-model="showFollow" />
   <ToGameLogin v-model="showLoginQr" :launcher="false" @success="tryGetTokens" />
-  <ToSwitchAc v-model="showAcSwitch" />
 </template>
 <script lang="ts" setup>
 import showDialog from "@comp/func/dialog.js";
@@ -299,19 +318,19 @@ import { Command } from "@tauri-apps/plugin-shell";
 import mhyClient from "@utils/TGClient.js";
 import TGLogger from "@utils/TGLogger.js";
 import { storeToRefs } from "pinia";
-import { computed, onMounted, onUnmounted, ref } from "vue";
-
-import ToSwitchAc from "./to-switchAc.vue";
+import { computed, onMounted, onUnmounted, ref, shallowRef } from "vue";
 
+const userStore = useUserStore();
 const { sidebar, theme, isLogin, recentNewsType, gameDir, isInAdmin } = storeToRefs(useAppStore());
-const { uid, briefInfo, cookie, account } = storeToRefs(useUserStore());
+const { uid, briefInfo, cookie, account } = storeToRefs(userStore);
 let themeListener: UnlistenFn | null = null;
 // @ts-expect-error The import.meta meta-property is not allowed in files which will build into CommonJS output.
 const isDevEnv = import.meta.env.MODE === "development";
 const showFollow = ref<boolean>();
 const showLoginQr = ref<boolean>(false);
-const showAcSwitch = ref<boolean>(false);
 const isTryLogin = ref<boolean>(false);
+const allGameAc = shallowRef<Array<TGApp.Sqlite.Account.Game>>([]);
+
 const rail = computed<boolean>({
   get: () => sidebar.value.collapse,
   set: (v) => (sidebar.value.collapse = v),
@@ -341,8 +360,31 @@ onUnmounted(() => {
   }
 });
 
-async function trySwitchAccount(): Promise<void> {
-  showAcSwitch.value = true;
+async function loadAllGameAc(): Promise<void> {
+  allGameAc.value = [];
+  let res: Array<TGApp.Sqlite.Account.Game> = [];
+  const uidList = await TSUserAccount.account.getAllUid();
+  for (const r of uidList) {
+    const gameAcs = await TSUserAccount.game.getAccount(r);
+    res = res.concat(gameAcs);
+  }
+  res = res.filter((i) => i.gameBiz === "hk4e_cn");
+  allGameAc.value = res;
+}
+
+async function trySwitchGameAccount(ac: TGApp.Sqlite.Account.Game): Promise<void> {
+  const acM = await TSUserAccount.account.getAccount(ac.uid);
+  if (!acM) {
+    showSnackbar.warn(`未找到米社用户${ac.uid}的用户信息`);
+    return;
+  }
+  uid.value = ac.uid;
+  briefInfo.value = acM.brief;
+  cookie.value = acM.cookie;
+  const res = await userStore.switchGameAccount(ac.gameUid);
+  if (!res) return;
+  showSnackbar.success(`成功切换到用户${uid.value}的游戏UID${ac.gameUid}`);
+  await TGLogger.Info(`[ToSwitchAc] 切换到用户${uid.value}的游戏UID${ac.gameUid}成功`);
 }
 
 async function switchTheme(): Promise<void> {
diff --git a/src/components/app/to-switchAc.vue b/src/components/app/to-switchAc.vue
deleted file mode 100644
index 28a239c9..00000000
--- a/src/components/app/to-switchAc.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<!-- 切换账号浮窗 -->
-<template>
-  <TOverlay v-model="visible">
-    <div class="to-sac-box">
-      <div class="tsb-title">账号管理</div>
-      <v-list v-model:opened="openList" class="tsb-list" variant="text">
-        <v-list-group v-for="item in ac" :key="item.user.uid" :title.attr="'点击展开/收起'">
-          <template v-slot:activator="{ props }">
-            <v-list-item v-bind="props">
-              <template #title>{{ item.user.brief.nickname }}[{{ item.user.uid }}]</template>
-              <template #subtitle>{{ item.user.brief.desc }}</template>
-              <template #prepend>
-                <img :src="item.user.brief.avatar" alt="userIcon" class="tsb-avatar" />
-              </template>
-              <template #append>
-                <v-checkbox-btn
-                  :model-value="item.user.uid === curUid"
-                  readonly
-                  @click="trySelect(item.user)"
-                />
-              </template>
-            </v-list-item>
-          </template>
-          <v-list-item
-            v-for="(game, idx) in item.gameAc"
-            :key="idx"
-            :value="game.gameUid"
-            class="tsb-list-game"
-            density="compact"
-            @click="trySelect(item.user, game)"
-          >
-            <template #title>{{ game.nickname }}</template>
-            <template #subtitle>{{ game.gameUid }}({{ game.regionName }})</template>
-            <template #append>
-              <!-- select -->
-              <v-checkbox-btn :model-value="game.gameUid === curGameUid" readonly />
-            </template>
-          </v-list-item>
-        </v-list-group>
-      </v-list>
-      <v-btn class="tsb-confirm" @click="tryConfirm()">确认</v-btn>
-    </div>
-  </TOverlay>
-</template>
-<script lang="ts" setup>
-import TOverlay from "@comp/app/t-overlay.vue";
-import showSnackbar from "@comp/func/snackbar.js";
-import TSUserAccount from "@Sqlm/userAccount.js";
-import useUserStore from "@store/user.js";
-import TGLogger from "@utils/TGLogger.js";
-import { storeToRefs } from "pinia";
-import { ref, shallowRef, watch } from "vue";
-
-type TsaAcItem = { user: TGApp.App.Account.User; gameAc: Array<TGApp.Sqlite.Account.Game> };
-
-const userStore = useUserStore();
-const { uid, account, briefInfo, cookie } = storeToRefs(userStore);
-
-const visible = defineModel<boolean>();
-const ac = shallowRef<Array<TsaAcItem>>([]);
-const openList = ref<Array<string>>([]);
-const curUid = ref<string>();
-const curGameUid = ref<string>();
-
-watch(
-  () => visible.value,
-  async (value) => {
-    if (value) {
-      await loadAccounts();
-    }
-  },
-);
-
-async function loadAccounts(): Promise<void> {
-  const uidList = await TSUserAccount.account.getAllAccount();
-  const tmp: Array<TsaAcItem> = [];
-  for (const item of uidList) {
-    let accounts = await TSUserAccount.game.getAccount(item.uid);
-    accounts = accounts.filter((a) => a.gameBiz === "hk4e_cn");
-    tmp.push({ user: item, gameAc: accounts });
-  }
-  ac.value = tmp;
-  curUid.value = uid.value ?? "";
-  curGameUid.value = account.value.gameUid;
-  openList.value = [];
-}
-
-function trySelect(user: TGApp.App.Account.User, game?: TGApp.Sqlite.Account.Game): void {
-  if (game) {
-    curUid.value = user.uid;
-    curGameUid.value = game.gameUid;
-  } else if (curUid.value !== user.uid) {
-    curUid.value = user.uid;
-    const firstGame = ac.value.find((u) => u.user.uid === user.uid)?.gameAc?.[0];
-    curGameUid.value = firstGame ? firstGame.gameUid : "";
-  }
-}
-
-async function tryConfirm(): Promise<void> {
-  if (!curUid.value) {
-    showSnackbar.warn("请选择要切换的账号");
-    return;
-  }
-  if (curUid.value === uid.value && curGameUid.value === account.value.gameUid) {
-    showSnackbar.warn("无需切换当前账号");
-    return;
-  }
-  console.log(curUid.value, curGameUid.value);
-  const acFind = ac.value.find((u) => u.user.uid === curUid.value);
-  if (!acFind) {
-    showSnackbar.error("未找到对应用户信息，请重试");
-    return;
-  }
-  const game = acFind.gameAc.find((g) => g.gameUid === curGameUid.value);
-  uid.value = acFind.user.uid;
-  briefInfo.value = acFind.user.brief;
-  cookie.value = acFind.user.cookie;
-  if (!game) {
-    showSnackbar.error("未找到对应游戏账号信息，请重试");
-    return;
-  } else {
-    const res = await userStore.switchGameAccount(game.gameUid);
-    if (!res) return;
-    showSnackbar.success(`成功切换到用户${uid.value}的游戏UID${game.gameUid}`);
-    await TGLogger.Info(`[ToSwitchAc] 切换到用户${uid.value}的游戏UID${game.gameUid}成功`);
-    visible.value = false;
-  }
-}
-</script>
-<style lang="scss" scoped>
-.to-sac-box {
-  display: flex;
-  width: 400px;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 8px;
-  border-radius: 4px;
-  background: var(--app-page-bg);
-  row-gap: 12px;
-}
-
-.tsb-title {
-  color: var(--common-text-title);
-  font-family: var(--font-title);
-  font-size: 18px;
-}
-
-.tsb-list {
-  position: relative;
-  display: flex;
-  width: 100%;
-  height: fit-content;
-  max-height: 400px;
-  flex: 1;
-  flex-direction: column;
-  background: var(--box-bg-1);
-  overflow-y: auto;
-}
-
-.tsb-list-item {
-  display: flex;
-  flex-direction: column;
-  border-bottom: 1px solid var(--border-color);
-}
-
-.tsb-avatar {
-  width: 32px;
-  height: 32px;
-  margin-right: 4px;
-}
-
-.tsb-list-user {
-  padding: 12px 16px;
-  cursor: pointer;
-
-  &:hover {
-    background-color: var(--hover-bg);
-  }
-}
-
-.tsb-list-user.active {
-  background-color: var(--active-bg);
-  font-weight: bold;
-}
-
-.tsb-list-game {
-  cursor: pointer;
-}
-
-.tsb-confirm {
-  height: 40px;
-  border-radius: 3px;
-  margin-left: auto;
-  background: var(--tgc-btn-1);
-  color: var(--btn-text);
-  font-family: var(--font-title);
-}
-</style>