Merge branch 'main' of github.com:engigu/baihu

web/src/views/history/History.vue

@@ -388,7 +388,7 @@ watch(() => route.query, (newQuery) => {
             <!-- 小屏行 -->
             <div class="flex sm:hidden items-center gap-2 px-3 py-2">
               <span class="w-14 shrink-0 text-muted-foreground text-xs">#{{ total - (currentPage - 1) * pageSize - index
-              }}</span>
+                }}</span>
               <span class="w-6 shrink-0 flex justify-center" :title="getTaskTypeTitle(log.task_type || 'task')">
                 <GitBranch v-if="log.task_type === TASK_TYPE.REPO" class="h-3.5 w-3.5 text-primary" />
                 <Terminal v-else class="h-3.5 w-3.5 text-primary" />
@@ -421,7 +421,7 @@ watch(() => route.query, (newQuery) => {
                 </div>
               </span>
               <span class="w-12 text-right shrink-0 text-muted-foreground text-xs">{{ formatDuration(log.duration)
-              }}</span>
+                }}</span>
               <span class="w-8 shrink-0 flex justify-center opacity-100">
                 <Button variant="ghost" size="icon"
                   class="h-6 w-6 text-muted-foreground hover:text-destructive shrink-0"
@@ -433,7 +433,7 @@ watch(() => route.query, (newQuery) => {
             <!-- 大屏行 -->
             <div class="hidden sm:flex items-center gap-4 px-4 py-2">
               <span class="w-16 shrink-0 text-muted-foreground text-sm">#{{ total - (currentPage - 1) * pageSize - index
-              }}</span>
+                }}</span>
               <span class="w-10 shrink-0 flex justify-center" :title="getTaskTypeTitle(log.task_type || 'task')">
                 <GitBranch v-if="log.task_type === TASK_TYPE.REPO" class="h-4 w-4 text-primary" />
                 <Terminal v-else class="h-4 w-4 text-primary" />
@@ -469,7 +469,7 @@ watch(() => route.query, (newQuery) => {
                 </div>
               </span>
               <span class="w-16 text-right shrink-0 text-muted-foreground text-xs">{{ formatDuration(log.duration)
-              }}</span>
+                }}</span>
               <span v-if="!selectedLog"
                 class="w-40 text-right shrink-0 text-muted-foreground text-xs hidden md:block">{{ log.start_time ||
                   log.created_at }}</span>
@@ -567,16 +567,15 @@ watch(() => route.query, (newQuery) => {
               <Maximize2 class="h-3.5 w-3.5" />
             </Button>
           </div>
-          <div
+          <div class="flex-1 overflow-hidden min-h-[160px] relative"
-            class="flex-1 overflow-hidden min-h-[160px]"
+            :class="resolvedTheme === 'dark' ? 'bg-zinc-950' : 'bg-zinc-100'" ref="sideLogContainer">
-            :class="resolvedTheme === 'dark' ? 'bg-zinc-950' : 'bg-zinc-100'"
+            <LogTerminal v-if="decompressedOutput" :content="decompressedOutput" :theme="resolvedTheme" />
-            ref="sideLogContainer"
+            <div v-else-if="!isWsLoading"
-          >
+              class="absolute inset-0 flex items-center justify-center text-zinc-500 font-mono text-xs italic">
-            <LogTerminal 
+              无日志输出
-              :content="decompressedOutput" 
+            </div>
-              :theme="resolvedTheme"
+            <div v-if="isWsLoading"
-            />
+              class="px-4 py-2 text-sm text-zinc-500 italic border-t border-zinc-200 dark:border-zinc-800 absolute bottom-0 left-0 w-full bg-inherit/80 backdrop-blur-sm">
-            <div v-if="isWsLoading" class="px-4 py-2 text-sm text-zinc-500 italic border-t border-zinc-200 dark:border-zinc-800">
               连接中...
             </div>
           </div>

web/src/views/history/LogViewer.vue

@@ -78,14 +78,14 @@ onUnmounted(() => {
             </Button>
           </div>
         </div>
-        <div class="flex-1 overflow-hidden" :class="resolvedTheme === 'dark' ? darkLogBackgroundClass : lightLogBackgroundClass">
+        <div class="flex-1 overflow-hidden relative"
-          <LogTerminal 
+          :class="resolvedTheme === 'dark' ? darkLogBackgroundClass : lightLogBackgroundClass">
-            :content="content" 
+          <LogTerminal v-if="content" :content="content" :theme="resolvedTheme" />
-            :theme="resolvedTheme"
+          <div v-else class="absolute inset-0 flex items-center justify-center text-zinc-500 font-mono text-sm italic">
-          />
+            无日志输出
+          </div>
         </div>
       </div>
     </div>
   </Teleport>
 </template>
-