From f8607d0b38a391409bdcdb0d7f7330b41b3ec4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Thu, 7 May 2026 11:29:45 +0800 Subject: [PATCH] dev --- backend/openapi | 2 +- frontendNew/src/api/info/type.ts | 3 + frontendNew/src/components/AppSidebar.vue | 18 +- frontendNew/src/components/LoadingOverlay.vue | 13 + frontendNew/src/components/NavUser.vue | 34 ++- frontendNew/src/directives/loading.ts | 116 ++++++++ frontendNew/src/main.ts | 2 + .../src/pages/Dcalc/DnfHelper/list.vue | 12 +- frontendNew/src/stores/dnfhelper.ts | 4 +- frontendNew/src/style.css | 252 ++++++++++-------- 10 files changed, 326 insertions(+), 130 deletions(-) create mode 100644 frontendNew/src/components/LoadingOverlay.vue create mode 100644 frontendNew/src/directives/loading.ts diff --git a/backend/openapi b/backend/openapi index 2ec8a104..66588694 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit 2ec8a1040d7ae12ea59e1a8a6d3aa2932337ff26 +Subproject commit 66588694714211ba6df1258ffec579e4419c23a7 diff --git a/frontendNew/src/api/info/type.ts b/frontendNew/src/api/info/type.ts index 75361853..d1320f74 100644 --- a/frontendNew/src/api/info/type.ts +++ b/frontendNew/src/api/info/type.ts @@ -219,9 +219,12 @@ export interface Attribute { export interface IHelperInfo { id: string; avatar: string; + name: string; roleList: { roleId: string; roleName: string; + roleJob: string; avatarLink: string; + fame: number; }[]; } diff --git a/frontendNew/src/components/AppSidebar.vue b/frontendNew/src/components/AppSidebar.vue index 921834a0..ff1570ee 100644 --- a/frontendNew/src/components/AppSidebar.vue +++ b/frontendNew/src/components/AppSidebar.vue @@ -31,6 +31,7 @@ import { SidebarMenuItem, SidebarTrigger, } from "@/components/ui/sidebar"; +import { useDnfHelperStore } from "@/stores/dnfhelper"; const props = withDefaults(defineProps(), { collapsible: "icon", @@ -43,12 +44,17 @@ const toggleDarkMode = () => { document.documentElement.classList.toggle("dark", isDark.value); }; +const dnfHelperStore = useDnfHelperStore(); + +const userInfo = computed(() => { + return { + name: dnfHelperStore.helperInfo?.name ?? "尚未绑定助手ID", + id: dnfHelperStore.helperInfo?.id ?? "", + avatar: dnfHelperStore.helperInfo?.avatar ?? "", + }; +}); + const data = { - user: { - name: "尚未绑定助手ID", - email: "m@example.com", - avatar: "/avatars/shadcn.jpg", - }, navMain: [ { title: "计算器", @@ -198,7 +204,7 @@ const data = { - + diff --git a/frontendNew/src/components/LoadingOverlay.vue b/frontendNew/src/components/LoadingOverlay.vue new file mode 100644 index 00000000..315260f5 --- /dev/null +++ b/frontendNew/src/components/LoadingOverlay.vue @@ -0,0 +1,13 @@ + + + diff --git a/frontendNew/src/components/NavUser.vue b/frontendNew/src/components/NavUser.vue index 1452a30b..14a98a94 100644 --- a/frontendNew/src/components/NavUser.vue +++ b/frontendNew/src/components/NavUser.vue @@ -1,5 +1,5 @@