From 9f8eaa5722c90010c8fd2708c4db7cabf4c08637 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 3 Sep 2023 09:15:42 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=AE=9E=E6=97=B6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=94=BE=E5=BF=AB=E6=8D=B7=E6=A0=8F&&=E7=BE=8E=E5=8C=96?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/ShortcutBar.vue      |  40 +++++++
 src/pages/setting.vue                       |  12 --
 src/views/setting/AccountSettingLogging.vue |  55 ---------
 src/views/system/LoggingView.vue            | 119 ++++++++++++++++++++
 4 files changed, 159 insertions(+), 67 deletions(-)
 delete mode 100644 src/views/setting/AccountSettingLogging.vue
 create mode 100644 src/views/system/LoggingView.vue

diff --git a/src/layouts/components/ShortcutBar.vue b/src/layouts/components/ShortcutBar.vue
index 6817dd6e..6b259fd2 100644
--- a/src/layouts/components/ShortcutBar.vue
+++ b/src/layouts/components/ShortcutBar.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import NameTestView from '@/views/system/NameTestView.vue'
 import NetTestView from '@/views/system/NetTestView.vue'
+import LoggingView from '@/views/system/LoggingView.vue'
 
 // App捷径
 const appsMenu = ref(false)
@@ -10,6 +11,9 @@ const nameTestDialog = ref(false)
 
 // 网络测试弹窗
 const netTestDialog = ref(false)
+
+// 实时日志弹窗
+const loggingDialog = ref(false)
 </script>
 
 <template>
@@ -86,6 +90,29 @@ const netTestDialog = ref(false)
             </VListItem>
           </VCol>
         </VRow>
+        <VRow class="ma-0 mt-n1 border-t">
+          <VCol
+            cols="6"
+            class="text-center cursor-pointer pa-0 shortcut-icon border-e"
+            @click="() => {}"
+          >
+            <VListItem
+              class="pa-4"
+              @click="loggingDialog = true"
+            >
+              <VAvatar
+                size="48"
+                variant="tonal"
+              >
+                <VIcon icon="mdi-file-document-outline" />
+              </VAvatar>
+              <h6 class="text-base font-weight-medium mt-2 mb-0">
+                日志
+              </h6>
+              <span class="text-sm">系统实时日志</span>
+            </VListItem>
+          </VCol>
+        </VRow>
       </div>
     </VCard>
   </VMenu>
@@ -113,4 +140,17 @@ const netTestDialog = ref(false)
       </VCardItem>
     </VCard>
   </VDialog>
+  <!-- 实时日志弹窗 -->
+  <VDialog
+    v-model="loggingDialog"
+    max-width="1280"
+    scrollable
+  >
+    <VCard title="实时日志">
+      <DialogCloseBtn @click="loggingDialog = false" />
+      <VCardText>
+        <LoggingView />
+      </VCardText>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/pages/setting.vue b/src/pages/setting.vue
index ce94eb10..2da3c55a 100644
--- a/src/pages/setting.vue
+++ b/src/pages/setting.vue
@@ -5,7 +5,6 @@ import AccountSettingNotification from '@/views/setting/AccountSettingNotificati
 import AccountSettingRule from '@/views/setting/AccountSettingRule.vue'
 import AccountSettingSite from '@/views/setting/AccountSettingSite.vue'
 import AccountSettingWords from '@/views/setting/AccountSettingWords.vue'
-import AccountSettingLogging from '@/views/setting/AccountSettingLogging.vue'
 import AccountSettingAbout from '@/views/setting/AccountSettingAbout.vue'
 
 const route = useRoute()
@@ -39,11 +38,6 @@ const tabs = [
     icon: 'mdi-file-word-box',
     tab: 'words',
   },
-  {
-    title: '日志',
-    icon: 'mdi-text-box',
-    tab: 'logging',
-  },
   {
     title: '关于',
     icon: 'mdi-information',
@@ -96,12 +90,6 @@ const tabs = [
           <AccountSettingWords />
         </transition>
       </VWindowItem>
-      <!-- Logging -->
-      <VWindowItem value="logging">
-        <transition name="fade-slide" appear>
-          <AccountSettingLogging />
-        </transition>
-      </VWindowItem>
       <!-- About -->
       <VWindowItem value="about">
         <transition name="fade-slide" appear>
diff --git a/src/views/setting/AccountSettingLogging.vue b/src/views/setting/AccountSettingLogging.vue
deleted file mode 100644
index 9fb02d72..00000000
--- a/src/views/setting/AccountSettingLogging.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<script lang="ts" setup>
-import store from '@/store'
-
-// 日志列表
-const logs = ref<string[]>([])
-
-// SSE持续获取日志
-function startSSELogging() {
-  const token = store.state.auth.token
-  if (token) {
-    const eventSource = new EventSource(
-      `${import.meta.env.VITE_API_BASE_URL}system/logging?token=${token}`,
-    )
-
-    eventSource.addEventListener('message', (event) => {
-      const message = event.data
-      if (message)
-        logs.value.push(message)
-    })
-
-    onBeforeUnmount(() => {
-      eventSource.close()
-    })
-  }
-}
-
-onMounted(() => {
-  startSSELogging()
-})
-</script>
-
-<template>
-  <VRow>
-    <VCol cols="12">
-      <VCard title="实时日志">
-        <VCardText>
-          <div
-            v-if="logs.length === 0"
-            class="mt-5 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-          >
-            <VProgressCircular
-              size="48"
-              indeterminate
-              color="primary"
-            />
-            <span class="mt-3">正在刷新 ...</span>
-          </div>
-          <div v-for="(log, i) in logs" :key="i">
-            {{ log }}
-          </div>
-        </VCardText>
-      </VCard>
-    </VCol>
-  </VRow>
-</template>
diff --git a/src/views/system/LoggingView.vue b/src/views/system/LoggingView.vue
new file mode 100644
index 00000000..75d52d71
--- /dev/null
+++ b/src/views/system/LoggingView.vue
@@ -0,0 +1,119 @@
+<script lang="ts" setup>
+import store from '@/store'
+
+// 日志列表
+const logs = ref<string[]>([])
+
+// SSE持续获取日志
+function startSSELogging() {
+  const token = store.state.auth.token
+  if (token) {
+    const eventSource = new EventSource(
+      `${import.meta.env.VITE_API_BASE_URL}system/logging?token=${token}`,
+    )
+
+    eventSource.addEventListener('message', (event) => {
+      const message = event.data
+      if (message)
+        logs.value.push(message)
+    })
+
+    onBeforeUnmount(() => {
+      eventSource.close()
+    })
+  }
+}
+
+// 从日志中提取日志详情
+function extractLogDetailsFromLogs(logs: string[]): { level: string; time: string; program: string; content: string }[] {
+  const logDetails: { level: string; time: string; program: string; content: string }[] = []
+
+  const logPattern = /^【(.*?)】.*\s(.*?)\s-\s(.*?)\s-\s(.*)$/
+
+  for (const log of logs) {
+    const matches = RegExp(logPattern).exec(log)
+    if (matches && matches.length === 5) {
+      const [_, level, time, program, content] = matches
+      logDetails.push({ level, time, program, content })
+    }
+  }
+
+  return logDetails
+}
+
+// 计算日志颜色
+function getLogColor(level: string): string {
+  switch (level) {
+    case 'DEBUG':
+      return 'primary'
+    case 'INFO':
+      return 'secondary'
+    case 'WARNING':
+      return 'warning'
+    case 'ERROR':
+      return 'error'
+    default:
+      return 'secondary'
+  }
+}
+
+// 拆分日志数据计算属性
+const extractLogDetails = computed(() => {
+  return extractLogDetailsFromLogs(logs.value)
+})
+
+onMounted(() => {
+  startSSELogging()
+})
+</script>
+
+<template>
+  <div
+    v-if="logs.length === 0"
+    class="mt-5 w-full text-centerflex flex-col items-center"
+  >
+    <VProgressCircular
+      size="48"
+      indeterminate
+      color="primary"
+    />
+    <span class="mt-3">正在刷新 ...</span>
+  </div>
+  <VTable
+    class="table-rounded"
+    hide-default-footer
+    disable-sort
+  >
+    <tbody>
+      <tr v-for="(log, i) in extractLogDetails" :key="i" class="text-sm">
+        <td
+          class="text-sm"
+        >
+          <VChip
+            size="small"
+            :color="getLogColor(log.level)"
+            variant="elevated"
+            v-text="log.level"
+          />
+        </td>
+        <!-- name -->
+        <td
+          class="text-sm"
+        >
+          {{ log.time }}
+        </td>
+        <td
+          class="text-sm"
+        >
+          <h6 class="text-sm font-weight-medium">
+            {{ log.program }}
+          </h6>
+        </td>
+        <td
+          class="text-sm"
+          v-text="log.content"
+        />
+      </tr>
+    </tbody>
+  </VTable>
+</template>