From 6714a94502866663942c242c45bbf6d09ac66739 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Fri, 2 Jun 2023 21:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E5=B0=86=20curAccount=20=E5=AD=98?=
 =?UTF-8?q?=E5=88=B0=20storage=20=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home.vue            | 13 ++++++++++++-
 src/pages/User/Abyss.vue      | 30 ++----------------------------
 src/pages/User/Characters.vue |  5 ++---
 src/store/modules/user.ts     | 17 +++++++++++++++++
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 73d77468..a34cb29f 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -5,7 +5,7 @@
 
 <script lang="ts" setup>
 // vue
-import { markRaw, onMounted, onUnmounted, onUpdated, ref } from "vue";
+import { markRaw, onBeforeMount, onMounted, onUnmounted, onUpdated, ref } from "vue";
 import TOLoading from "../components/overlay/to-loading.vue";
 import TPool from "../components/main/t-pool.vue";
 import TPosition from "../components/main/t-position.vue";
@@ -13,8 +13,10 @@ import TCalendar from "../components/main/t-calendar.vue";
 // store
 import { useHomeStore } from "../store/modules/home";
 import { useAppStore } from "../store/modules/app";
+import { useUserStore } from "../store/modules/user";
 // utils
 import { getBuildTime } from "../utils/TGBuild";
+import TGSqlite from "../plugins/Sqlite";
 
 // store
 const appStore = useAppStore();
@@ -43,6 +45,15 @@ function readLoading (): void {
   }
 }
 
+onBeforeMount(async () => {
+  // 获取当前用户
+  const user = await TGSqlite.getCurAccount();
+  // 存储当前用户
+  if (user) {
+    useUserStore().setCurAccount(user);
+  }
+});
+
 onMounted(async () => {
   loadingTitle.value = "正在加载首页";
   loading.value = true;
diff --git a/src/pages/User/Abyss.vue b/src/pages/User/Abyss.vue
index 4b3f2b73..6036af16 100644
--- a/src/pages/User/Abyss.vue
+++ b/src/pages/User/Abyss.vue
@@ -10,10 +10,6 @@
           <v-icon>mdi-refresh</v-icon>
           <span>刷新</span>
         </v-btn>
-        <!--        <v-btn class="ua-btn" @click="uploadData">-->
-        <!--          <v-icon>mdi-upload</v-icon>-->
-        <!--          <span>上传</span>-->
-        <!--        </v-btn>-->
       </div>
     </v-tabs>
     <v-window v-model="userTab" class="ua-window">
@@ -58,7 +54,7 @@
 </template>
 <script lang="ts" setup>
 // vue
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import ToLoading from "../../components/overlay/to-loading.vue";
 import TuaOverview from "../../components/userabyss/tua-overview.vue";
 import TuaDetail from "../../components/userabyss/tua-detail.vue";
@@ -82,7 +78,7 @@ const abyssCookie = ref({
   ltoken: "",
   ltuid: "",
 });
-const user = ref({} as TGApp.Sqlite.Account.Game);
+const user = computed(() => userStore.getCurAccount());
 
 const localAbyss = ref([] as TGApp.Sqlite.Abyss.SingleTable[]);
 const localAbyssID = ref([] as number[]);
@@ -90,10 +86,6 @@ const curAbyss = ref({} as TGApp.Sqlite.Abyss.SingleTable);
 
 onMounted(async () => {
   loadingTitle.value = "正在加载深渊数据";
-  const curUser = await TGSqlite.getCurAccount();
-  if (curUser) {
-    user.value = curUser;
-  }
   abyssCookie.value = {
     cookie_token: userStore.getCookieItem("cookie_token"),
     account_id: userStore.getCookieItem("account_id"),
@@ -138,24 +130,6 @@ async function getAbyssData (): Promise<void> {
 function toAbyss (id: number): void {
   curAbyss.value = localAbyss.value.find((item) => item.id === id)!;
 }
-
-// async function uploadData(){
-//   const latestAbyss = localAbyss.value[0];
-//   const uploadData:TGApp.Plugins.Hutao.AbyssRecordUpload = transAbyssToHutao(latestAbyss, user.value);
-// }
-//
-// function transAbyssToHutao(abyss:TGApp.Sqlite.Abyss.SingleTable, user:TGApp.Sqlite.Account.Game): TGApp.Plugins.Hutao.AbyssRecordUpload {
-//   let res = {
-//     uid: user.gameUid,
-//     identity: "tauri-genshin",
-//     spiralAbyss: {} as TGApp.Plugins.Hutao.AbyssRecord,
-//     avatars: [] as TGApp.Plugins.Hutao.AbyssAvatar[],
-//     reservedUserName: user.nickname,
-//   } as TGApp.Plugins.Hutao.AbyssRecordUpload;
-//   const damageRank:TGApp.Sqlite.Abyss.Character = JSON.parse(abyss.damageRank)[0];
-//   const takeDamageRank:TGApp.Sqlite.Abyss.Character = JSON.parse(abyss.takeDamageRank)[0];
-//   const floors:TGApp.Sqlite.Abyss.Floor[] = JSON.parse(abyss.floors);
-// }
 </script>
 <style lang="css" scoped>
 .ua-box {
diff --git a/src/pages/User/Characters.vue b/src/pages/User/Characters.vue
index cf0bb0ba..a0ac8907 100644
--- a/src/pages/User/Characters.vue
+++ b/src/pages/User/Characters.vue
@@ -25,7 +25,7 @@ import { useUserStore } from "../../store/modules/user";
 // request
 import TGRequest from "../../web/request/TGRequest";
 // utils
-import TGSqlite from "../../utils/TGSqlite";
+import TGSqlite from "../../plugins/Sqlite";
 
 // store
 const appStore = useAppStore();
@@ -38,7 +38,7 @@ const loadingTitle = ref("");
 // data
 const roleList = ref([] as TGApp.Game.Character.ListItem[]);
 const characterCookie = ref({} as TGApp.BBS.Constant.CookieGroup4);
-const user = ref({} as TGApp.Sqlite.Account.Game);
+const user = computed(() => userStore.getCurAccount());
 const filePath = computed(() => `${appStore.dataPath.userDataDir}/roleList.json`);
 
 onMounted(async () => {
@@ -60,7 +60,6 @@ async function refresh () {
   loadingTitle.value = "正在获取角色数据";
   loading.value = true;
   const res = await TGRequest.User.byLToken.getRoleList(characterCookie.value, user.value);
-  console.log(res);
   if (Array.isArray(res)) {
     loadingTitle.value = "正在保存角色数据";
     await fs.writeTextFile({
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 0729c32b..1d62fa18 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -18,6 +18,7 @@ export const useUserStore = defineStore(
       uid: "",
       desc: "",
     } as TGApp.App.Account.BriefInfo);
+    const account = ref({} as TGApp.Sqlite.Account.Game);
     const cookie = ref({} as Record<string, string>);
 
     function setBriefInfo (info: TGApp.App.Account.BriefInfo): void {
@@ -28,6 +29,14 @@ export const useUserStore = defineStore(
       return briefInfo.value;
     }
 
+    function setCurAccount (user: TGApp.Sqlite.Account.Game) {
+      account.value = user;
+    }
+
+    function getCurAccount (): TGApp.Sqlite.Account.Game {
+      return account.value;
+    }
+
     function getCookieItem (key: string): string {
       return cookie.value[key] || "";
     }
@@ -67,12 +76,16 @@ export const useUserStore = defineStore(
         cookie.value = ck;
       }
     }
+
     return {
       briefInfo,
       cookie,
+      account,
       getBriefInfo,
       setBriefInfo,
       getCookieItem,
+      setCurAccount,
+      getCurAccount,
       getCookieGroup1,
       getCookieGroup2,
       getCookieGroup3,
@@ -89,6 +102,10 @@ export const useUserStore = defineStore(
       key: "briefInfo",
       storage: window.localStorage,
       paths: ["briefInfo"],
+    }, {
+      key: "account",
+      storage: window.localStorage,
+      paths: ["account"],
     }],
   },
 );