From da2b003b83098d477fc1af3ab519b818caa32a28 Mon Sep 17 00:00:00 2001
From: duorameng <2997944583@qq.com>
Date: Wed, 13 May 2026 08:57:44 +0800
Subject: [PATCH] chore: refactor logs structure

---
 web/src/router/index.ts                       |  2 +-
 .../LoginLogs.vue => logs/MessageLogs.vue}    | 75 ++++++++++---------
 .../{loginlogs => logs}/tabs/LoginLogTab.vue  |  0
 web/src/views/logs/tabs/PushLogTab.vue        | 30 ++++++++
 .../tabs/SystemEventTab.vue                   |  0
 5 files changed, 71 insertions(+), 36 deletions(-)
 rename web/src/views/{loginlogs/LoginLogs.vue => logs/MessageLogs.vue} (72%)
 rename web/src/views/{loginlogs => logs}/tabs/LoginLogTab.vue (100%)
 create mode 100644 web/src/views/logs/tabs/PushLogTab.vue
 rename web/src/views/{loginlogs => logs}/tabs/SystemEventTab.vue (100%)

diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index bd60d76..604edc3 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -51,7 +51,7 @@ const router = createRouter({
         { path: 'languages', name: 'languages', component: () => import('@/views/languages/Languages.vue') },
         { path: 'agents', name: 'agents', component: () => import('@/views/agents/Agents.vue') },
         { path: 'history', name: 'history', component: () => import('@/views/history/History.vue') },
-        { path: 'logs', name: 'logs', component: () => import('@/views/loginlogs/LoginLogs.vue') },
+        { path: 'logs', name: 'logs', component: () => import('@/views/logs/MessageLogs.vue') },
         { path: 'terminal', name: 'terminal', component: () => import('@/views/terminal/Terminal.vue') },
         { path: 'notify', name: 'notify', component: () => import('@/views/notify/Notify.vue') },
         { path: 'settings', name: 'settings', component: () => import('@/views/settings/Settings.vue') }
diff --git a/web/src/views/loginlogs/LoginLogs.vue b/web/src/views/logs/MessageLogs.vue
similarity index 72%
rename from web/src/views/loginlogs/LoginLogs.vue
rename to web/src/views/logs/MessageLogs.vue
index 4b7d1b5..43b192e 100644
--- a/web/src/views/loginlogs/LoginLogs.vue
+++ b/web/src/views/logs/MessageLogs.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
+// 消息日志总览入口控制器
 import { ref, watch } from 'vue'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
-import { Button } from '@/components/ui/button'
+import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { Input } from '@/components/ui/input'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Search, RefreshCw, Trash2 } from 'lucide-vue-next'
 import LoginLogTab from './tabs/LoginLogTab.vue'
 import SystemEventTab from './tabs/SystemEventTab.vue'
-import PushLog from '@/views/notify/components/PushLog.vue'
+import PushLogTab from './tabs/PushLogTab.vue'
 import { LOG_LEVEL, LOG_STATUS } from '@/api'
 
 const activeTab = ref('system')
@@ -30,10 +30,20 @@ function handleSearch() {
   }, 300)
 }
 
-function handleRefresh() {
-  if (activeTab.value === 'system') systemTabRef.value?.fetchLogs()
-  else if (activeTab.value === 'push') pushLogRef.value?.fetchLogs()
-  else if (activeTab.value === 'login') loginTabRef.value?.loadLogs()
+const isRefreshing = ref(false)
+
+async function handleRefresh() {
+  if (isRefreshing.value) return
+  isRefreshing.value = true
+  try {
+    if (activeTab.value === 'system') await systemTabRef.value?.fetchLogs()
+    else if (activeTab.value === 'push') await pushLogRef.value?.fetchLogs()
+    else if (activeTab.value === 'login') await loginTabRef.value?.loadLogs()
+  } finally {
+    setTimeout(() => {
+      isRefreshing.value = false
+    }, 400)
+  }
 }
 
 function handleClear() {
@@ -49,7 +59,7 @@ watch(activeTab, () => {
 </script>
 
 <template>
-  <Tabs v-model="activeTab" class="space-y-6 h-full flex flex-col">
+  <div class="space-y-6 h-full flex flex-col">
     <div class="flex flex-col lg:flex-row lg:items-center justify-between gap-4 shrink-0 px-1">
       <div class="flex flex-col shrink-0">
         <h2 class="text-xl sm:text-2xl font-bold tracking-tight">消息日志</h2>
@@ -123,28 +133,23 @@ watch(activeTab, () => {
 
         <!-- 操作区域 -->
         <div :class="[activeTab === 'login' ? 'flex-1 sm:flex-none' : 'w-full lg:w-auto', 'flex items-center gap-2']">
-          <Button variant="outline" size="icon" class="h-9 w-9 shrink-0 shadow-sm" @click="handleRefresh" title="刷新">
-            <RefreshCw class="h-4 w-4" />
-          </Button>
+          <button type="button" class="inline-flex items-center justify-center h-9 w-9 rounded-md border border-border bg-background hover:bg-accent hover:text-accent-foreground shrink-0 shadow-sm transition-all cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed" :disabled="isRefreshing" @click="handleRefresh">
+            <RefreshCw class="h-4 w-4 block transition-transform" :class="{ 'animate-spin': isRefreshing }" />
+          </button>
 
-          <Button v-if="activeTab !== 'login'" variant="outline" 
-            class="flex-1 lg:flex-none lg:px-3 h-9 shadow-sm text-destructive border-destructive/20 hover:bg-destructive/10" 
-            @click="handleClear" title="清空记录">
-            <Trash2 class="h-4 w-4 lg:mr-2" /> <span class="ml-2 lg:inline" :class="activeTab !== 'login' ? '' : 'hidden'">清空记录</span>
-          </Button>
+          <button v-if="activeTab !== 'login'" type="button" class="inline-flex items-center justify-center h-9 px-3 rounded-md border border-destructive/20 bg-background text-destructive hover:bg-destructive/10 shrink-0 shadow-sm transition-colors gap-1.5 cursor-pointer" @click="handleClear">
+            <Trash2 class="h-4 w-4 block" />
+            <span class="text-sm font-medium" :class="activeTab !== 'login' ? '' : 'hidden'">清空记录</span>
+          </button>
 
           <!-- 桌面端标签切换 -->
-          <TabsList class="h-9 p-1 bg-muted/30 border shrink-0 hidden lg:flex">
-            <TabsTrigger value="system" class="px-4 h-7 text-sm">
-              系统事件
-            </TabsTrigger>
-            <TabsTrigger value="push" class="px-4 h-7 text-sm">
-              推送日志
-            </TabsTrigger>
-            <TabsTrigger value="login" class="px-4 h-7 text-sm">
-              登录日志
-            </TabsTrigger>
-          </TabsList>
+          <Tabs v-model="activeTab" class="w-auto">
+            <TabsList class="h-9 p-1 bg-muted/30 border shrink-0 hidden lg:flex">
+              <TabsTrigger value="system" class="px-4 h-7 text-sm">系统事件</TabsTrigger>
+              <TabsTrigger value="push" class="px-4 h-7 text-sm">推送日志</TabsTrigger>
+              <TabsTrigger value="login" class="px-4 h-7 text-sm">登录日志</TabsTrigger>
+            </TabsList>
+          </Tabs>
 
           <!-- 移动端标签切换 (简易版) -->
           <div class="lg:hidden flex-1 shrink-0 min-w-0">
@@ -164,17 +169,17 @@ watch(activeTab, () => {
     </div>
 
     <div class="flex-1 min-h-0">
-      <TabsContent value="system" class="mt-0">
+      <div v-show="activeTab === 'system'" class="h-full">
         <SystemEventTab ref="systemTabRef" :filters="filters.system" />
-      </TabsContent>
+      </div>
 
-      <TabsContent value="push" class="mt-0">
-        <PushLog ref="pushLogRef" :filters="filters.push" />
-      </TabsContent>
+      <div v-show="activeTab === 'push'" class="h-full">
+        <PushLogTab ref="pushLogRef" :filters="filters.push" />
+      </div>
 
-      <TabsContent value="login" class="mt-0">
+      <div v-show="activeTab === 'login'" class="h-full">
         <LoginLogTab ref="loginTabRef" :username="filters.login.username" />
-      </TabsContent>
+      </div>
     </div>
-  </Tabs>
+  </div>
 </template>
diff --git a/web/src/views/loginlogs/tabs/LoginLogTab.vue b/web/src/views/logs/tabs/LoginLogTab.vue
similarity index 100%
rename from web/src/views/loginlogs/tabs/LoginLogTab.vue
rename to web/src/views/logs/tabs/LoginLogTab.vue
diff --git a/web/src/views/logs/tabs/PushLogTab.vue b/web/src/views/logs/tabs/PushLogTab.vue
new file mode 100644
index 0000000..87f9727
--- /dev/null
+++ b/web/src/views/logs/tabs/PushLogTab.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import PushLog from '@/views/notify/components/PushLog.vue'
+
+defineOptions({ name: 'PushLogTabWrapper' })
+
+// 显式声明必填的非可选属性，完全对齐 PushLog 子组件强类型要求
+defineProps<{
+  filters: {
+    keyword: string
+    status: string
+    [key: string]: any
+  }
+}>()
+
+const pushLogRef = ref()
+
+// 暴露标准代理接口给父级控制器 MessageLogs.vue 统一调用
+defineExpose({
+  fetchLogs: () => pushLogRef.value?.fetchLogs(),
+  showClearConfirm: {
+    get() { return pushLogRef.value?.showClearConfirm },
+    set(v: boolean) { if (pushLogRef.value) pushLogRef.value.showClearConfirm = v }
+  }
+})
+</script>
+
+<template>
+  <PushLog ref="pushLogRef" :filters="filters" v-bind="$attrs" />
+</template>
diff --git a/web/src/views/loginlogs/tabs/SystemEventTab.vue b/web/src/views/logs/tabs/SystemEventTab.vue
similarity index 100%
rename from web/src/views/loginlogs/tabs/SystemEventTab.vue
rename to web/src/views/logs/tabs/SystemEventTab.vue