♻️ 调整目录结构

src/pages/Archive/Birthday.vue

@@ -37,7 +37,7 @@
 import { onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 
-import ToArcBrith from "../../components/overlay/to-arcBrith.vue";
+import ToArcBrith from "../../components/pageArchive/to-arcBrith.vue";
 import { ArcBirDraw, ArcBirRole } from "../../data/index.js";
 import TGClient from "../../utils/TGClient.js";
 

src/pages/User/Abyss.vue

@@ -93,11 +93,7 @@
           </div>
           <TSubLine>详情</TSubLine>
           <div class="uaw-d-box">
-            <TuaDetail
-              v-for="floor in JSON.parse(item.floors) as TGApp.Sqlite.Abyss.Floor[]"
-              :key="floor.id"
-              :model-value="floor"
-            />
+            <TuaDetail v-for="floor in item.floors" :key="floor.id" :model-value="floor" />
           </div>
         </div>
       </v-window-item>
@@ -111,13 +107,13 @@
 <script lang="ts" setup>
 import { getVersion } from "@tauri-apps/api/app";
 import { storeToRefs } from "pinia";
-import { onMounted, ref, watch, computed } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import { useRouter } from "vue-router";
 
+import TSubLine from "../../components/app/t-subline.vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TSubLine from "../../components/main/t-subline.vue";
 import TuaDetail from "../../components/userAbyss/tua-detail.vue";
 import TuaOverview from "../../components/userAbyss/tua-overview.vue";
 import Hutao from "../../plugins/Hutao/index.js";
@@ -136,7 +132,7 @@ const userStore = storeToRefs(useUserStore());
 const userTab = ref<number>(0);
 const user = computed<TGApp.Sqlite.Account.Game>(() => userStore.account.value);
 
-const localAbyss = ref<TGApp.Sqlite.Abyss.SingleTable[]>([]);
+const localAbyss = ref<TGApp.Sqlite.Abyss.TableData[]>([]);
 const abyssRef = ref<HTMLElement>(<HTMLElement>{});
 const version = ref<string>();
 const router = useRouter();

src/pages/User/Characters.vue

@@ -107,9 +107,9 @@ import { onMounted, ref, watch, computed } from "vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
+import TwoSelectC, { SelectedCValue } from "../../components/pageWiki/two-select-c.vue";
 import TuaAvatarBox from "../../components/userAvatar/tua-avatar-box.vue";
 import TuaDetailOverlay from "../../components/userAvatar/tua-detail-overlay.vue";
-import TwoSelectC, { SelectedCValue } from "../../components/wiki/two-select-c.vue";
 import { AppCharacterData } from "../../data/index.js";
 import TSUserAvatar from "../../plugins/Sqlite/modules/userAvatar.js";
 import TSUserRecord from "../../plugins/Sqlite/modules/userRecord.js";

src/pages/User/Combat.vue

@@ -95,10 +95,10 @@ import { storeToRefs } from "pinia";
 import { onMounted, ref, watch, computed } from "vue";
 import { useRouter } from "vue-router";
 
+import TSubLine from "../../components/app/t-subline.vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TSubLine from "../../components/main/t-subline.vue";
 import TucAvatars from "../../components/userCombat/tuc-avatars.vue";
 import TucOverview from "../../components/userCombat/tuc-overview.vue";
 import TucRound from "../../components/userCombat/tuc-round.vue";

src/pages/User/Gacha.vue

@@ -57,10 +57,10 @@ import { onMounted, ref, watch, computed } from "vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import GroEcharts from "../../components/gachaRecord/gro-echarts.vue";
-import GroHistory from "../../components/gachaRecord/gro-history.vue";
-import GroOverview from "../../components/gachaRecord/gro-overview.vue";
-import GroTable from "../../components/gachaRecord/gro-table.vue";
+import GroEcharts from "../../components/userGacha/gro-echarts.vue";
+import GroHistory from "../../components/userGacha/gro-history.vue";
+import GroOverview from "../../components/userGacha/gro-overview.vue";
+import GroTable from "../../components/userGacha/gro-table.vue";
 import { AppCharacterData, AppWeaponData } from "../../data/index.js";
 import TSUserGacha from "../../plugins/Sqlite/modules/userGacha.js";
 import { useUserStore } from "../../store/modules/user.js";

src/pages/User/Record.vue

@@ -59,10 +59,10 @@ import { getVersion } from "@tauri-apps/api/app";
 import { storeToRefs } from "pinia";
 import { computed, onMounted, ref, watch } from "vue";
 
+import TSubLine from "../../components/app/t-subline.vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TSubLine from "../../components/main/t-subline.vue";
 import TurAvatarGrid from "../../components/userRecord/tur-avatar-grid.vue";
 import TurHomeGrid from "../../components/userRecord/tur-home-grid.vue";
 import TurOverviewGrid from "../../components/userRecord/tur-overview-grid.vue";

src/pages/WIKI/Character.vue

@@ -28,9 +28,9 @@ import { useRoute } from "vue-router";
 
 import showDialog from "../../components/func/dialog.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TwcCharacter from "../../components/wiki/twc-character.vue";
-import TwcListItem from "../../components/wiki/twc-list-item.vue";
-import TwoSelectC, { SelectedCValue } from "../../components/wiki/two-select-c.vue";
+import TwcCharacter from "../../components/pageWiki/twc-character.vue";
+import TwcListItem from "../../components/pageWiki/twc-list-item.vue";
+import TwoSelectC, { SelectedCValue } from "../../components/pageWiki/two-select-c.vue";
 import { AppCharacterData } from "../../data/index.js";
 import { createObc } from "../../utils/TGWindow.js";
 

src/pages/WIKI/Material.vue

@@ -73,7 +73,7 @@
 import { onMounted, ref, watch } from "vue";
 
 import showSnackbar from "../../components/func/snackbar.js";
-import TwoMaterial from "../../components/wiki/two-material.vue";
+import TwoMaterial from "../../components/pageWiki/two-material.vue";
 import { WikiMaterialData } from "../../data/index.js";
 
 const curMaterial = ref<TGApp.App.Material.WikiItem>(<TGApp.App.Material.WikiItem>{});

src/pages/WIKI/Namecard.vue

@@ -34,9 +34,9 @@
 <script lang="ts" setup>
 import { onMounted, ref } from "vue";
 
+import ToNamecard from "../../components/app/to-namecard.vue";
+import TopNamecard from "../../components/app/top-namecard.vue";
 import showSnackbar from "../../components/func/snackbar.js";
-import ToNamecard from "../../components/overlay/to-namecard.vue";
-import TopNamecard from "../../components/overlay/top-namecard.vue";
 import { AppNameCardsData } from "../../data/index.js";
 
 const curNameCard = ref<TGApp.App.NameCard.Item>();

src/pages/WIKI/Weapon.vue

@@ -31,9 +31,9 @@ import { useRoute } from "vue-router";
 
 import showDialog from "../../components/func/dialog.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TwcListItem from "../../components/wiki/twc-list-item.vue";
-import TwcWeapon from "../../components/wiki/twc-weapon.vue";
-import TwoSelectW, { SelectedWValue } from "../../components/wiki/two-select-w.vue";
+import TwcListItem from "../../components/pageWiki/twc-list-item.vue";
+import TwcWeapon from "../../components/pageWiki/twc-weapon.vue";
+import TwoSelectW, { SelectedWValue } from "../../components/pageWiki/two-select-w.vue";
 import { AppWeaponData } from "../../data/index.js";
 import { createObc } from "../../utils/TGWindow.js";
 

src/pages/common/PageAchi.vue

@@ -5,59 +5,59 @@
       <div class="achi-search">
         <v-text-field
           v-model="search"
-          append-icon="mdi-magnify"
-          label="搜索"
           :hide-details="true"
           :single-line="true"
+          append-icon="mdi-magnify"
+          label="搜索"
           @keydown.enter="isSearch = true"
         />
       </div>
     </template>
     <template #extension>
-      <v-btn prepend-icon="mdi-import" class="top-btn" @click="importJson()">导入</v-btn>
-      <v-btn prepend-icon="mdi-export" class="top-btn" @click="exportJson()">导出</v-btn>
+      <v-btn class="top-btn" prepend-icon="mdi-import" @click="importJson()">导入</v-btn>
+      <v-btn class="top-btn" prepend-icon="mdi-export" @click="exportJson()">导出</v-btn>
       <div class="uid-select">
         <v-select
-          variant="outlined"
           v-model="uidCur"
-          :items="uidList"
           :hide-details="true"
+          :items="uidList"
           label="存档UID"
+          variant="outlined"
         />
       </div>
-      <v-btn prepend-icon="mdi-plus" class="top-btn" @click="createUid()">新建存档</v-btn>
-      <v-btn prepend-icon="mdi-delete" class="top-btn" @click="deleteUid()">删除存档</v-btn>
+      <v-btn class="top-btn" prepend-icon="mdi-plus" @click="createUid()">新建存档</v-btn>
+      <v-btn class="top-btn" prepend-icon="mdi-delete" @click="deleteUid()">删除存档</v-btn>
       <v-spacer />
     </template>
   </v-app-bar>
   <div class="wrap">
-    <v-virtual-scroll class="left-wrap" :items="seriesList" item-height="60">
+    <v-virtual-scroll :items="seriesList" class="left-wrap" item-height="60">
       <template #default="{ item }">
         <TuaSeries
-          @click="selectSeries(item)"
           v-model:cur="selectedSeries"
-          :uid="uidCur"
           :series="item"
+          :uid="uidCur"
+          @click="selectSeries(item)"
         />
         <div style="height: 10px" />
       </template>
     </v-virtual-scroll>
     <TuaAchiList
-      :uid="uidCur"
-      :hideFin="hideFin"
-      v-model:series="selectedSeries"
-      v-model:search="search"
       v-model:isSearch="isSearch"
+      v-model:search="search"
+      v-model:series="selectedSeries"
+      :hideFin="hideFin"
+      :uid="uidCur"
     />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { path } from "@tauri-apps/api";
-import { UnlistenFn, listen } from "@tauri-apps/api/event";
+import { listen, UnlistenFn } from "@tauri-apps/api/event";
 import { open, save } from "@tauri-apps/plugin-dialog";
 import { writeTextFile } from "@tauri-apps/plugin-fs";
-import { onMounted, ref, watch, computed, onUnmounted } from "vue";
+import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 import showDialog from "../../components/func/dialog.js";

src/pages/common/PageAnno.vue

@@ -41,7 +41,7 @@
   <v-window v-model="tab">
     <v-window-item v-for="(value, index) in tabValues" :key="index" :value="value">
       <div class="anno-grid">
-        <TAnnoCard
+        <TaCard
           v-for="item in annoCards[value]"
           :key="item.id"
           :model-value="item"
@@ -59,7 +59,7 @@ import { useRouter } from "vue-router";
 
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TAnnoCard from "../../components/main/t-annocard.vue";
+import TaCard from "../../components/pageAnno/ta-card.vue";
 import { useAppStore } from "../../store/modules/app.js";
 import TGLogger from "../../utils/TGLogger.js";
 import Hk4eApi, { AnnoLang, AnnoServer } from "../../web/request/hk4eReq.js";

src/pages/common/PageConfig.vue

@@ -114,14 +114,14 @@ import { platform } from "@tauri-apps/plugin-os";
 import { exit } from "@tauri-apps/plugin-process";
 import { onMounted, ref } from "vue";
 
-import TcAppBadge from "../../components/config/tc-appBadge.vue";
-import TcDataDir from "../../components/config/tc-dataDir.vue";
-import TcGameBadge from "../../components/config/tc-gameBadge.vue";
-import TcInfo from "../../components/config/tc-info.vue";
-import TcUserBadge from "../../components/config/tc-userBadge.vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
+import TcAppBadge from "../../components/pageConfig/tc-appBadge.vue";
+import TcDataDir from "../../components/pageConfig/tc-dataDir.vue";
+import TcGameBadge from "../../components/pageConfig/tc-gameBadge.vue";
+import TcInfo from "../../components/pageConfig/tc-info.vue";
+import TcUserBadge from "../../components/pageConfig/tc-userBadge.vue";
 import TGSqlite from "../../plugins/Sqlite/index.js";
 import { useAppStore } from "../../store/modules/app.js";
 import { useHomeStore } from "../../store/modules/home.js";

src/pages/common/PageHome.vue

@@ -34,12 +34,12 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, shallowRef, toRaw } from "vue";
 
+import TGameNav from "../../components/app/t-gamenav.vue";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TCalendar from "../../components/home/t-calendar.vue";
-import TPool from "../../components/home/t-pool.vue";
-import TPosition from "../../components/home/t-position.vue";
-import TGameNav from "../../components/main/t-gamenav.vue";
+import PhCompCalendar from "../../components/pageHome/ph-comp-calendar.vue";
+import PhCompPool from "../../components/pageHome/ph-comp-pool.vue";
+import PhCompPosition from "../../components/pageHome/ph-comp-position.vue";
 import { useAppStore } from "../../store/modules/app.js";
 import { useHomeStore } from "../../store/modules/home.js";
 import TGLogger from "../../utils/TGLogger.js";
@@ -70,13 +70,13 @@ onMounted(async () => {
   for (const item of showHome.value) {
     switch (item) {
       case "限时祈愿":
-        temp.push(TPool);
+        temp.push(PhCompPool);
         break;
       case "近期活动":
-        temp.push(TPosition);
+        temp.push(PhCompPosition);
         break;
       case "素材日历":
-        temp.push(TCalendar);
+        temp.push(PhCompCalendar);
         break;
       default:
         break;
@@ -102,11 +102,11 @@ async function submitHome(): Promise<void> {
 
 function getName(name: string): string {
   switch (name) {
-    case "t-pool":
+    case "ph-comp-pool":
       return "限时祈愿";
-    case "t-position":
+    case "ph-comp-position":
       return "近期活动";
-    case "t-calendar":
+    case "ph-comp-calendar":
       return "素材日历";
     default:
       return "";

src/pages/common/PostCollect.vue

@@ -99,11 +99,11 @@ import { UnlistenFn } from "@tauri-apps/api/event";
 import { storeToRefs } from "pinia";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 
+import TPostCard from "../../components/app/t-postcard.vue";
 import showDialog from "../../components/func/dialog.js";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TPostCard from "../../components/main/t-postcard.vue";
-import ToCollectPost from "../../components/overlay/to-collectPost.vue";
+import ToCollectPost from "../../components/pageCollect/to-collectPost.vue";
 import TSUserCollection from "../../plugins/Sqlite/modules/userCollect.js";
 import { useUserStore } from "../../store/modules/user.js";
 import TGLogger from "../../utils/TGLogger.js";

src/pages/common/PostForum.vue

@@ -64,17 +64,17 @@
       已加载：{{ posts.length }}，加载更多
     </v-btn>
   </div>
-  <ToPostSearch :gid="curGid.toString()" v-model="showSearch" :keyword="search" />
+  <VpOverlaySearch :gid="curGid.toString()" v-model="showSearch" :keyword="search" />
 </template>
 <script setup lang="ts">
 import { onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 
+import TGameNav from "../../components/app/t-gamenav.vue";
+import TPostCard from "../../components/app/t-postcard.vue";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TGameNav from "../../components/main/t-gamenav.vue";
-import TPostCard from "../../components/main/t-postcard.vue";
-import ToPostSearch from "../../components/post/to-postSearch.vue";
+import VpOverlaySearch from "../../components/viewPost/vp-overlay-search.vue";
 import Mys from "../../plugins/Mys/index.js";
 import TGLogger from "../../utils/TGLogger.js";
 import { createPost } from "../../utils/TGWindow.js";

src/pages/common/PostNews.vue

@@ -53,18 +53,18 @@
     </v-window-item>
   </v-window>
   <ToChannel v-model="showList" :gid="gid" />
-  <ToPostSearch :gid="gid" v-model="showSearch" :keyword="search" />
+  <VpOverlaySearch :gid="gid" v-model="showSearch" :keyword="search" />
 </template>
 
 <script lang="ts" setup>
 import { computed, nextTick, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
+import TPostCard from "../../components/app/t-postcard.vue";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TPostCard from "../../components/main/t-postcard.vue";
-import ToChannel from "../../components/overlay/to-channel.vue";
-import ToPostSearch from "../../components/post/to-postSearch.vue";
+import ToChannel from "../../components/pageNews/to-channel.vue";
+import VpOverlaySearch from "../../components/viewPost/vp-overlay-search.vue";
 import Mys from "../../plugins/Mys/index.js";
 import { useAppStore } from "../../store/modules/app.js";
 import TGLogger from "../../utils/TGLogger.js";

src/pages/common/PostTopic.vue

@@ -58,17 +58,17 @@
       已加载：{{ posts.length }}，加载更多
     </v-btn>
   </div>
-  <ToPostSearch :gid="curGid.toString()" v-model="showSearch" :keyword="search" />
+  <VpOverlaySearch :gid="curGid.toString()" v-model="showSearch" :keyword="search" />
 </template>
 <script lang="ts" setup>
 import { computed, onMounted, ref, toRaw, watch } from "vue";
 import { useRoute } from "vue-router";
 
+import TGameNav from "../../components/app/t-gamenav.vue";
+import TPostCard from "../../components/app/t-postcard.vue";
 import showLoading from "../../components/func/loading.js";
 import showSnackbar from "../../components/func/snackbar.js";
-import TGameNav from "../../components/main/t-gamenav.vue";
-import TPostCard from "../../components/main/t-postcard.vue";
-import ToPostSearch from "../../components/post/to-postSearch.vue";
+import VpOverlaySearch from "../../components/viewPost/vp-overlay-search.vue";
 import Mys from "../../plugins/Mys/index.js";
 import { createPost } from "../../utils/TGWindow.js";